From fc5edba37c9a7167204ef86d8ffb180da26db1ad Mon Sep 17 00:00:00 2001 From: Eduard Tihomirov Date: Thu, 27 Feb 2025 11:06:04 +0300 Subject: [PATCH 1/7] return SUPPORT-8822 --- .../esia/service/EsiaAuthService.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java b/backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java index 076100e..052ba6d 100644 --- a/backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java +++ b/backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java @@ -43,7 +43,9 @@ import ru.micord.ervu.security.esia.model.EsiaHeader; import ru.micord.ervu.security.esia.model.EsiaTokenResponse; import ru.micord.ervu.security.esia.model.FormUrlencoded; import ru.micord.ervu.security.esia.model.PersonModel; +import ru.micord.ervu.security.esia.model.SignResponse; import ru.micord.ervu.security.esia.EsiaAuthInfoStore; +import ru.micord.ervu.security.esia.model.SignResponse; import ru.micord.ervu.security.esia.config.EsiaConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; @@ -103,7 +105,6 @@ public class EsiaAuthService { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss xx"); ZonedDateTime dt = ZonedDateTime.now(); String timestamp = dt.format(formatter); - String state = UUID.randomUUID().toString(); String prnsUUID = UUID.randomUUID().toString(); String redirectUrl = esiaConfig.getRedirectUrl(); String redirectUrlEncoded = redirectUrl.replaceAll(":", "%3A") @@ -114,10 +115,12 @@ public class EsiaAuthService { parameters.put("client_id", clientId); parameters.put("scope", scope); parameters.put("timestamp", timestamp); - parameters.put("state", state); + parameters.put("state", "%s"); parameters.put("redirect_uri", esiaConfig.getRedirectUrl()); - String clientSecret = signMap(parameters); + SignResponse signResponse = signMap(parameters); + String state = signResponse.getState(); + String clientSecret = signResponse.getSignature(); EsiaAuthInfoStore.addState(prnsUUID, state, esiaConfig.getEsiaStateCookieLifeTime()); ResponseCookie prnsCookie = securityHelper.createCookie(PRNS_UUID, prnsUUID, "/") .maxAge(esiaConfig.getEsiaStateCookieLifeTime()) @@ -185,7 +188,6 @@ public class EsiaAuthService { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss xx"); ZonedDateTime dt = ZonedDateTime.now(); String timestamp = dt.format(formatter); - String newState = UUID.randomUUID().toString(); String redirectUrl = esiaConfig.getRedirectUrl(); String scope = esiaConfig.getEsiaScopes(); @@ -193,13 +195,14 @@ public class EsiaAuthService { parameters.put("client_id", clientId); parameters.put("scope", scope); parameters.put("timestamp", timestamp); - parameters.put("state", newState); + parameters.put("state", "%s"); parameters.put("redirect_uri", redirectUrl); parameters.put("code", esiaAuthCode); - long startTime = System.currentTimeMillis(); - String clientSecret = signMap(parameters); + SignResponse signResponse = signMap(parameters); signSecret = System.currentTimeMillis() - startTime; + String newState = signResponse.getState(); + String clientSecret = signResponse.getSignature(); String authUrl = esiaConfig.getEsiaBaseUri() + esiaConfig.getEsiaTokenUrl(); String postBody = new FormUrlencoded() .setParameter("client_id", clientId) @@ -289,18 +292,19 @@ public class EsiaAuthService { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss xx"); ZonedDateTime dt = ZonedDateTime.now(); String timestamp = dt.format(formatter); - String state = UUID.randomUUID().toString(); String redirectUrl = esiaConfig.getRedirectUrl(); Map parameters = new LinkedHashMap(); parameters.put("client_id", clientId); parameters.put("scope", esiaConfig.getEsiaScopes()); parameters.put("timestamp", timestamp); - parameters.put("state", state); + parameters.put("state", "%s"); parameters.put("redirect_uri", esiaConfig.getRedirectUrl()); parameters.put("refresh_token", refreshToken); - String clientSecret = signMap(parameters); + SignResponse signResponse = signMap(parameters); + String state = signResponse.getState(); + String clientSecret = signResponse.getSignature(); String authUrl = esiaConfig.getEsiaBaseUri() + esiaConfig.getEsiaTokenUrl(); String postBody = new FormUrlencoded() .setParameter("client_id", clientId) @@ -350,7 +354,7 @@ public class EsiaAuthService { } } - private String signMap(Map paramsToSign) { + private SignResponse signMap(Map paramsToSign) { try { StringBuilder toSign = new StringBuilder(); for (String s : paramsToSign.values()) { @@ -369,7 +373,7 @@ public class EsiaAuthService { .build() .send(request, HttpResponse.BodyHandlers.ofString()); errorHandler(response); - return response.body(); + return objectMapper.readValue(response.body(), SignResponse.class); } catch (Exception e) { From 84be36304d3b89a8897eb4b7bce64e96b3ea7f8c Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 12 May 2025 17:08:46 +0300 Subject: [PATCH 2/7] SUPPORT-9168 progress bar --- frontend/src/resources/css/inbox-lkrp.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/resources/css/inbox-lkrp.css b/frontend/src/resources/css/inbox-lkrp.css index 4dbd3a6..d05d331 100644 --- a/frontend/src/resources/css/inbox-lkrp.css +++ b/frontend/src/resources/css/inbox-lkrp.css @@ -379,8 +379,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%; From c5b5f1f1e88656465103d12fd6aca33aab09fca2 Mon Sep 17 00:00:00 2001 From: Eduard Tihomirov Date: Tue, 13 May 2025 16:56:18 +0300 Subject: [PATCH 3/7] fix --- frontend/src/ts/modules/security/guard/auth.guard.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/src/ts/modules/security/guard/auth.guard.ts b/frontend/src/ts/modules/security/guard/auth.guard.ts index 427904d..13d4224 100644 --- a/frontend/src/ts/modules/security/guard/auth.guard.ts +++ b/frontend/src/ts/modules/security/guard/auth.guard.ts @@ -45,7 +45,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", { @@ -59,7 +58,6 @@ export abstract class AuthGuard implements CanActivate { .toPromise() .then( () => { - this.progressIndicationService.hideProgressBar(); window.open(url.origin + url.pathname, "_self"); }) .catch(reason => { @@ -67,8 +65,7 @@ export abstract class AuthGuard implements CanActivate { json.messages.forEach((errorMessage) => { this.messageService.error(errorMessage, json); }) - }) - .finally(() => this.progressIndicationService.hideProgressBar()); + }); return false; } else { From 8f2b6e54e81d441b974af5687b7116a5143fd75b Mon Sep 17 00:00:00 2001 From: Zaripov Emil Date: Wed, 14 May 2025 14:17:08 +0300 Subject: [PATCH 4/7] update link --- .../main/resources/business-model/LK RP FL/screen-form-fl.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page b/resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page index 4c726a2..0109cb6 100644 --- a/resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page +++ b/resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page @@ -4842,7 +4842,7 @@ initialValue - "Если в выписке есть ошибки, подайте \u003ca href\u003d\"https://www.gosuslugi.ru/600595/1/form/\" target\u003d\"_blank\"\u003eзаявление на исправление на Госуслугах\u003c/a\u003e" + "Если в выписке есть ошибки, подайте \u003ca href\u003d\"https://www.gosuslugi.ru/600284/1/form/\" target\u003d\"_blank\"\u003eзаявление на исправление на Госуслугах\u003c/a\u003e" From a8ea851c334c7a12f9d6f54f5b36054e75626f78 Mon Sep 17 00:00:00 2001 From: Zaripov Emil Date: Wed, 14 May 2025 15:23:56 +0300 Subject: [PATCH 5/7] fix --- .../src/main/resources/business-model/LK RP FL/mydata.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/src/main/resources/business-model/LK RP FL/mydata.page b/resources/src/main/resources/business-model/LK RP FL/mydata.page index d3f5460..e410a0f 100644 --- a/resources/src/main/resources/business-model/LK RP FL/mydata.page +++ b/resources/src/main/resources/business-model/LK RP FL/mydata.page @@ -1069,7 +1069,7 @@ url - "https://www.gosuslugi.ru/" + "https://www.gosuslugi.ru/600284/1/form/\" From 29b894f4186ca07390594725dcdc53e667c30a17 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Wed, 14 May 2025 16:24:09 +0300 Subject: [PATCH 6/7] SUPPORT-9172 --- frontend/src/resources/css/inbox-lkrp.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/src/resources/css/inbox-lkrp.css b/frontend/src/resources/css/inbox-lkrp.css index d05d331..803a966 100644 --- a/frontend/src/resources/css/inbox-lkrp.css +++ b/frontend/src/resources/css/inbox-lkrp.css @@ -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 ---------------- */ From bf2b13f970c9e383d98b537d74dfaa3b51760dd6 Mon Sep 17 00:00:00 2001 From: Zaripov Emil Date: Wed, 14 May 2025 17:35:10 +0300 Subject: [PATCH 7/7] fix --- .../src/main/resources/business-model/LK RP FL/mydata.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/src/main/resources/business-model/LK RP FL/mydata.page b/resources/src/main/resources/business-model/LK RP FL/mydata.page index e410a0f..2e50004 100644 --- a/resources/src/main/resources/business-model/LK RP FL/mydata.page +++ b/resources/src/main/resources/business-model/LK RP FL/mydata.page @@ -1069,7 +1069,7 @@ url - "https://www.gosuslugi.ru/600284/1/form/\" + "https://www.gosuslugi.ru/600284/1/form/"