diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts index 3c6e0d5..e61a826 100644 --- a/frontend/src/app/services/auth.service.ts +++ b/frontend/src/app/services/auth.service.ts @@ -7,6 +7,7 @@ import {JwtHelperService} from '@auth0/angular-jwt'; import {JwtClaims} from '@custom-types/jwt_interface' import {LoginDialogComponent} from '@shared-components/login/login.component'; import {MatDialog} from '@angular/material/dialog'; +import {Router} from '@angular/router'; @Injectable({ providedIn: 'root' @@ -24,7 +25,8 @@ export class AuthService { constructor( private loginService: LoginService, - private snackBar: MatSnackBar + private snackBar: MatSnackBar, + private router: Router ) { // Check if user is already logged in on service initialization this.checkAuthStatus(); @@ -76,11 +78,14 @@ export class AuthService { const jwt = this.getJwt(); if (!jwt) { console.log("No JWT found"); + const currentUrl = this.router.url; const dialogRef = this.dialog.open(LoginDialogComponent, { width: '400px', }) dialogRef.afterClosed().subscribe(result => { - console.log(result); + if (result) { + this.router.navigateByUrl(currentUrl).then(); + } }); return false; }