micord/ervu-lkrp-fl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Халтобин Евгений 2024-10-11 09:16:12 +03:00
commit 47644e4876
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/ts/modules/security/guard/auth.guard.ts
View file

@ -3,6 +3,7 @@ import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from "
import {Observable} from "rxjs"; import {Observable} from "rxjs";
import {HttpClient, HttpParams} from "@angular/common/http"; import {HttpClient, HttpParams} from "@angular/common/http";
import {CookieService} from "ngx-cookie"; import {CookieService} from "ngx-cookie";
import {MessagesService} from "@webbpm/base-package";
@Injectable({providedIn:'root'}) @Injectable({providedIn:'root'})
export abstract class AuthGuard implements CanActivate { export abstract class AuthGuard implements CanActivate {
@ -10,7 +11,8 @@ export abstract class AuthGuard implements CanActivate {
protected constructor( protected constructor(
protected router: Router, protected router: Router,
private httpClient: HttpClient, private httpClient: HttpClient,
private cookieService: CookieService private cookieService: CookieService,
private messageService: MessagesService
) { ) {
} }
@ -28,7 +30,9 @@ export abstract class AuthGuard implements CanActivate {
return true; return true;
} }
else if (error) { else if (error) {
throw new Error(error + ', error description =' + errorDescription); let errorMessage = error + ', error description =' + errorDescription;
this.messageService.error(errorMessage)
throw new Error(errorMessage);
} }
else if (code) { else if (code) {
const params = new HttpParams().set('code', code); const params = new HttpParams().set('code', code);