From 3a4c90d12fff47e09cd20f359f82764391d50747 Mon Sep 17 00:00:00 2001 From: Daniel Ponte Date: Sun, 9 Feb 2025 10:03:52 -0500 Subject: [PATCH] Fix authGuard --- client/stillbox/src/app/auth.guard.ts | 2 +- client/stillbox/src/app/login/auth.service.ts | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client/stillbox/src/app/auth.guard.ts b/client/stillbox/src/app/auth.guard.ts index b9b91c0..d2383ce 100644 --- a/client/stillbox/src/app/auth.guard.ts +++ b/client/stillbox/src/app/auth.guard.ts @@ -5,7 +5,7 @@ import { inject } from '@angular/core'; export const AuthGuard: CanActivateFn = (route, state) => { const router: Router = inject(Router); const authSvc: AuthService = inject(AuthService); - if (localStorage.getItem('jwt') == null) { + if (authSvc.token() === null) { let success = false; authSvc.refresh().subscribe({ next: (event) => { diff --git a/client/stillbox/src/app/login/auth.service.ts b/client/stillbox/src/app/login/auth.service.ts index 46fc5df..474c3ff 100644 --- a/client/stillbox/src/app/login/auth.service.ts +++ b/client/stillbox/src/app/login/auth.service.ts @@ -75,7 +75,10 @@ export class AuthService { } _clearState() { - this._state.set({}); + this._state.set({ + is_auth: false, + token: null, + }); } logout() {