diff --git a/backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java b/backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java
index e3efcbb..99e5d44 100644
--- a/backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java
+++ b/backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java
@@ -47,6 +47,9 @@ public class EsiaConfig {
@Value("${sign.verify.url}")
private String signVerifyUrl;
+ @Value("${esia.issuer.url}")
+ private String esiaIssuerUrl;
+
public String getEsiaScopes() {
String[] scopeItems = esiaScopes.split(",");
return String.join(" ", Arrays.stream(scopeItems).map(String::trim).toArray(String[]::new));
@@ -93,4 +96,8 @@ public class EsiaConfig {
public String getSignVerifyUrl() {
return signVerifyUrl;
}
+
+ public String getEsiaIssuerUrl() {
+ return esiaIssuerUrl;
+ }
}
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 0676cb1..aed86a4 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
@@ -433,8 +433,8 @@ public ResponseEntity> getEsiaTokensByCode(String esiaAuthCode, String error,
if (!esiaAccessToken.getClient_id().equals(esiaConfig.getClientId())) {
return "Token invalid. Token clientId: " + esiaAccessToken.getClient_id() + " invalid";
}
- if (!esiaAccessToken.getIss().equals(esiaConfig.getEsiaBaseUri())) {
- return "Token invalid. The token publisher does not comply with the standard accepted in the ESIA";
+ if (!esiaAccessToken.getIss().equals(esiaConfig.getEsiaIssuerUrl())) {
+ return "Token invalid. Token issuer:" + esiaAccessToken.getIss() + " invalid";
}
LocalDateTime iatTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(esiaAccessToken.getIat()),
ZoneId.systemDefault()
diff --git a/config/micord.env b/config/micord.env
index 2f8075f..82d45e7 100644
--- a/config/micord.env
+++ b/config/micord.env
@@ -9,6 +9,7 @@ DB_APP_NAME=ervu_lkrp_fl
ESIA_SCOPES=snils, fullname, birthdate, id_doc
ESIA_BASE_URI=https://esia-portal1.test.gosuslugi.ru/
+ESIA_BASE_URI=https://esia-portal1.test.gosuslugi.ru/
ESIA_CLIENT_ID=MNSV89
ESIA_CLIENT_CERT_HASH=04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD
ESIA_REDIRECT_URL=https://lkrp-dev.micord.ru/fl/
diff --git a/config/standalone/dev/standalone.xml b/config/standalone/dev/standalone.xml
index 4b1cd70..8de5044 100644
--- a/config/standalone/dev/standalone.xml
+++ b/config/standalone/dev/standalone.xml
@@ -56,6 +56,7 @@
+