Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-9164

This commit is contained in:
Eduard Tihomirov 2025-05-15 10:10:27 +03:00
commit 2267640ded
5 changed files with 27 additions and 20 deletions

View file

@ -290,6 +290,13 @@ body.webbpm.ervu_lkrp_fl {
max-width: 85px;
overflow: hidden;
}
.webbpm.ervu_lkrp_fl .overlay-container {
width: calc(100% - 30px);
}
.webbpm.ervu_lkrp_fl #toast-container .toast-error {
width: 100%;
min-width: auto;
}
}
/*----------------- Login ---------------- */
@ -379,8 +386,8 @@ body.webbpm.ervu_lkrp_fl {
.webbpm.ervu_lkrp_fl .loader {
font-size: 15px;
left: calc(50% - 50px);
top: calc(50% - 50px);
left: calc(50% - 0.4em);
top: calc(50% - 0.4em);
width: 0.8em;
height: 0.8em;
border-radius: 50%;

View file

@ -48,7 +48,6 @@ export abstract class AuthGuard implements CanActivate {
return false;
}
if (code && state) {
this.progressIndicationService.showProgressBar();
const params = new HttpParams().set('code', code).set('state', state);
this.httpClient.get("esia/auth",
{
@ -62,7 +61,6 @@ export abstract class AuthGuard implements CanActivate {
.toPromise()
.then(
() => {
this.progressIndicationService.hideProgressBar();
window.open(url.origin + url.pathname, "_self");
})
.catch(reason => {
@ -70,8 +68,7 @@ export abstract class AuthGuard implements CanActivate {
json.messages.forEach((errorMessage) => {
this.messageService.error(errorMessage, json);
})
})
.finally(() => this.progressIndicationService.hideProgressBar());
});
return false;
}
else {