From fd2659eee508093e0195d4bdfdcd5e927faa9098 Mon Sep 17 00:00:00 2001 From: tanshu Date: Mon, 28 Jun 2021 08:41:58 +0530 Subject: [PATCH] Added device location to home screen. --- barker/barker/routers/login.py | 2 ++ bookie/src/app/auth/auth.service.ts | 8 +++++++- bookie/src/app/home/home.component.html | 5 ++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/barker/barker/routers/login.py b/barker/barker/routers/login.py index 170af2b..e9ed74a 100644 --- a/barker/barker/routers/login.py +++ b/barker/barker/routers/login.py @@ -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( diff --git a/bookie/src/app/auth/auth.service.ts b/bookie/src/app/auth/auth.service.ts index deabf6a..7bbe248 100644 --- a/bookie/src/app/auth/auth.service.ts +++ b/bookie/src/app/auth/auth.service.ts @@ -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 { diff --git a/bookie/src/app/home/home.component.html b/bookie/src/app/home/home.component.html index 6dfc175..9392473 100644 --- a/bookie/src/app/home/home.component.html +++ b/bookie/src/app/home/home.component.html @@ -270,5 +270,8 @@