From e6be3efd9b62f63bd8dcd96b0e3178379eb8f022 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Fri, 23 Apr 2021 17:14:21 -0700 Subject: [PATCH] let user go to home without session token --- src/app/_guards/auth.guard.ts | 11 ++++++----- src/app/_services/auth.service.ts | 7 ++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/app/_guards/auth.guard.ts b/src/app/_guards/auth.guard.ts index 2aed323..9c2f3f0 100644 --- a/src/app/_guards/auth.guard.ts +++ b/src/app/_guards/auth.guard.ts @@ -12,12 +12,13 @@ export class AuthGuard implements CanActivate { canActivate( route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { - if (sessionStorage.getItem(btoa('CICADA_SESSION_TOKEN'))) { - return true; - } + //if (sessionStorage.getItem(btoa('CICADA_SESSION_TOKEN'))) { + // return true; + //} - this.router.navigate(['/auth']); - return false; + //this.router.navigate(['/auth']); + //return false; + return true; } } diff --git a/src/app/_services/auth.service.ts b/src/app/_services/auth.service.ts index 5086ba5..a186748 100644 --- a/src/app/_services/auth.service.ts +++ b/src/app/_services/auth.service.ts @@ -96,19 +96,20 @@ export class AuthService { login(): boolean { if (this.sessionToken !== undefined) { try { - this.getWithToken(); + //this.getWithToken(); return true; } catch (e) { this.loggingService.sendErrorLevelMessage('Login token failed', this, {error: e}); } } else { try { - this.getChallenge(); + // this.getChallenge(); + return true } catch (e) { this.loggingService.sendErrorLevelMessage('Login challenge failed', this, {error: e}); } } - return false; + //return false; }