tanshu/barker
1
0
Fork 0
Code Issues 1 Pull Requests Releases 4 Activity

Added device location to home screen.

Browse Source
This commit is contained in:
Amritanshu Agrawal 2021-06-28 08:41:58 +05:30
parent db5f2731be
commit fd2659eee5
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
barker/barker/routers/login.py
View File

@ -54,6 +54,7 @@ async def login_for_access_token(
db.commit()
response.set_cookie(key="device_id", value=str(device.id), max_age=10 * 365 * 24 * 60 * 60)
response.set_cookie(key="device", value=device.name, max_age=10 * 365 * 24 * 60 * 60)
response.set_cookie(key="section", value=device.section.name, max_age=10 * 365 * 24 * 60 * 60)
if not allowed:
not_allowed_response = JSONResponse(
status_code=status.HTTP_401_UNAUTHORIZED,
@ -62,6 +63,7 @@ async def login_for_access_token(
)
not_allowed_response.set_cookie(key="device_id", value=str(device.id), max_age=10 * 365 * 24 * 60 * 60)
not_allowed_response.set_cookie(key="device", value=device.name, max_age=10 * 365 * 24 * 60 * 60)
not_allowed_response.set_cookie(key="section", value=device.section.name, max_age=10 * 365 * 24 * 60 * 60)
return not_allowed_response
access_token_expires = timedelta(minutes=settings.JWT_TOKEN_EXPIRE_MINUTES)
access_token = create_access_token(

8
bookie/src/app/auth/auth.service.ts
View File

@ -5,6 +5,7 @@ import { map } from 'rxjs/operators';
import { environment } from '../../environments/environment';
import { Device } from '../core/device';
import { Section } from '../core/section';
import { User } from '../core/user';
import { CookieService } from '../shared/cookie.service';
@ -23,7 +24,12 @@ export class AuthService {
this.currentUser = this.currentUserSubject.asObservable();
const deviceId = this.cs.getCookie('device_id');
const device = this.cs.getCookie('device');
this.device = new Device({ id: deviceId, name: device });
const section = this.cs.getCookie('section');
this.device = new Device({
id: deviceId,
name: device,
section: new Section({ name: section }),
});
}
static parseJwt(token: string): User {

5
bookie/src/app/home/home.component.html
View File

@ -270,5 +270,8 @@
</mat-card>
</div>
<footer class="footer">
<p>Backend: v{{ auth.user?.ver }} / Frontend: v{{ version }} on {{ auth.device.name }}</p>
<p>
Backend: v{{ auth.user?.ver }} / Frontend: v{{ version }} on {{ auth.device.name }} @
{{ auth.device.section.name }}
</p>
</footer>