mz/DiunaBI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back to path after login

Browse Source
This commit is contained in:
Michał Zieliński
2023-11-07 00:05:53 +01:00
parent 1142177f15
commit 550854ae95
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Frontend/src/app/auth/auth.guard.ts
View File

@@ -7,14 +7,20 @@ import { AuthService } from './auth.service';
providedIn: 'root' providedIn: 'root'
}) })
export class AuthGuard { export class AuthGuard {
loginUrl: string | null = null;
constructor( constructor(
private auth$: AuthService, private auth$: AuthService,
private router$: Router private router$: Router,
) {} ) {}
canActivate(): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree { canActivate(): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
if (this.auth$.user && this.auth$.user.googleCredentials) { if (this.auth$.user && this.auth$.user.googleCredentials) {
if (this.loginUrl) {
this.router$.navigate([this.loginUrl]);
this.loginUrl = null;
}
return true; return true;
} else { } else {
this.loginUrl = window.location.pathname;
this.router$.navigate(['']); this.router$.navigate(['']);
return false; return false;
} }