grassrootseconomics/cic-staff-client
8
0
Fork 0
Code Issues 26 Pull Requests Projects Releases Wiki Activity

let user go to home without session token

Browse Source
This commit is contained in:
Blair Vanderlugt 2021-04-23 17:14:21 -07:00
parent 2ae44a781a
commit e6be3efd9b
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/_guards/auth.guard.ts
View File

@ -12,12 +12,13 @@ export class AuthGuard implements CanActivate {
canActivate( canActivate(
route: ActivatedRouteSnapshot, route: ActivatedRouteSnapshot,
state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree { state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
if (sessionStorage.getItem(btoa('CICADA_SESSION_TOKEN'))) { //if (sessionStorage.getItem(btoa('CICADA_SESSION_TOKEN'))) {
// return true;
//}
//this.router.navigate(['/auth']);
//return false;
return true; return true;
} }
this.router.navigate(['/auth']);
return false;
}
} }

7
src/app/_services/auth.service.ts
View File

@ -96,19 +96,20 @@ export class AuthService {
login(): boolean { login(): boolean {
if (this.sessionToken !== undefined) { if (this.sessionToken !== undefined) {
try { try {
this.getWithToken(); //this.getWithToken();
return true; return true;
} catch (e) { } catch (e) {
this.loggingService.sendErrorLevelMessage('Login token failed', this, {error: e}); this.loggingService.sendErrorLevelMessage('Login token failed', this, {error: e});
} }
} else { } else {
try { try {
this.getChallenge(); // this.getChallenge();
return true
} catch (e) { } catch (e) {
this.loggingService.sendErrorLevelMessage('Login challenge failed', this, {error: e}); this.loggingService.sendErrorLevelMessage('Login challenge failed', this, {error: e});
} }
} }
return false; //return false;
} }