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

SUPPORT-8897: Fix

Browse source
This commit is contained in:
Eduard Tihomirov 2025-02-19 11:49:08 +03:00
parent 34c8108ee6
commit 5d18105459
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

0
backend/src/main/resources/i18n/exception_handler_messages.properties → backend/src/main/resources/i18n/project_exception_handler_messages.properties
View file

0
backend/src/main/resources/i18n/exception_handler_messages_en_US.properties → backend/src/main/resources/i18n/project_exception_handler_messages_en_US.properties
View file

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

@ -2,7 +2,7 @@ import {Injectable} from "@angular/core";
import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from "@angular/router"; import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from "@angular/router";
import {Observable} from "rxjs"; import {Observable} from "rxjs";
import {HttpClient, HttpParams} from "@angular/common/http"; import {HttpClient, HttpParams} from "@angular/common/http";
import {MessagesService} from "@webbpm/base-package"; import {MessagesService, ErrorMessageService} from "@webbpm/base-package";
import {AuthenticationService} from "../authentication.service"; import {AuthenticationService} from "../authentication.service";
import {EsiaErrorDetail} from "../EsiaErrorDetail"; import {EsiaErrorDetail} from "../EsiaErrorDetail";
@ -13,7 +13,8 @@ export abstract class AuthGuard implements CanActivate {
protected router: Router, protected router: Router,
private httpClient: HttpClient, private httpClient: HttpClient,
private authenticationService: AuthenticationService, private authenticationService: AuthenticationService,
private messageService: MessagesService private messageService: MessagesService,
private errorMessageService: ErrorMessageService
) { ) {
} }
@ -48,7 +49,7 @@ export abstract class AuthGuard implements CanActivate {
? reason.error.messages ? reason.error.messages
: reason.error.replaceAll('\\', ''); : reason.error.replaceAll('\\', '');
if (error) { if (error) {
errorMessage = 'Система временно недоступна. Пожалуйста, повторите попытку позже.'; errorMessage = this.errorMessageService.getErrorMessage();
let errorCode = this.extractCode(errorDescription); let errorCode = this.extractCode(errorDescription);
if (errorCode) { if (errorCode) {
errorMessage = EsiaErrorDetail.getDescription(errorCode); errorMessage = EsiaErrorDetail.getDescription(errorCode);