diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.ts index 6d13671..b0671a7 100644 --- a/frontend/src/app/app.routes.ts +++ b/frontend/src/app/app.routes.ts @@ -118,18 +118,27 @@ export const routes: Routes = [ path: 'forms', loadComponent: () => import('./pages/forms/forms.component').then(m => m.FormsComponent) }, + { + path: 'appeal/:code', + redirectTo: 'forms/appeal/:code', + pathMatch: 'full' + }, { path: 'appeal', redirectTo: 'forms/appeal', pathMatch: 'full' }, + { + path: 'forms/appeal/:code', + loadComponent: () => import('./pages/forms/appeal/appeal.component').then(m => m.AppealComponent), + canActivate: [AuthGuard], + data: {requiredAuthorizations: ['SCOPE_user']} + }, { path: 'forms/appeal', loadComponent: () => import('./pages/forms/appeal/appeal.component').then(m => m.AppealComponent), canActivate: [AuthGuard], - data: { - requiredAuthorizations: ['SCOPE_user'] - } + data: {requiredAuthorizations: ['SCOPE_user']} }, { path: 'forms/sent', diff --git a/frontend/src/app/guards/auth.guard.ts b/frontend/src/app/guards/auth.guard.ts index 4fb9fe7..22b0c59 100644 --- a/frontend/src/app/guards/auth.guard.ts +++ b/frontend/src/app/guards/auth.guard.ts @@ -1,9 +1,10 @@ import {Injectable} from '@angular/core'; import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree} from '@angular/router'; -import {map, Observable} from 'rxjs'; +import {from, isObservable, map, Observable, of, switchMap} from 'rxjs'; import {AuthService} from '@services/auth.service'; import {MatDialog} from '@angular/material/dialog'; import {LoginDialogComponent} from '@shared-components/login/login.component'; +import {catchError} from 'rxjs/operators'; @Injectable({ providedIn: 'root' @@ -21,6 +22,20 @@ export class AuthGuard implements CanActivate { route: ActivatedRouteSnapshot, state: RouterStateSnapshot ): Observable | Promise | boolean | UrlTree { + const code = route.paramMap.get('code'); + if (code) { + return this.authService.login(code).pipe( + switchMap(() => { + const result = this.canActivateInternal(route, state); + return isObservable(result) ? result : result instanceof Promise ? from(result) : of(result); + }), + catchError(() => of(this.router.createUrlTree(['/']))) + ); + } + return this.canActivateInternal(route, state); + } + + private canActivateInternal(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { if (!this.authService.isAuthenticated$()) { this.router.createUrlTree(['/']); const dialogRef = this.dialog.open(LoginDialogComponent, {