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

Merge branch 'feature/SUPPORT-8474_id_ervu' into feature/SUPPORT-8411_fixed

Browse source
This commit is contained in:
gulnaz 2024-09-13 11:17:02 +03:00
commit 14f9bf2233
2 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java
View file

@ -41,6 +41,15 @@ public class EsiaConfig {
@Value("${esia.connection-timeout:30}")
private long connectionTimeout;
@Value("${esia.logout-url:idp/ext/Logout}")
private String esiaLogoutUrl;
@Value("${esia.code-url:aas/oauth2/v3/te}")
private String esiaCodeUrl;
@Value("${esia.token-url:aas/oauth2/v3/te}")
private String esiaTokenUrl;
public String getEsiaOrgScopes() {
String[] scopeItems = esiaOrgScopes.split(",");
return String.join(" ", Arrays.stream(scopeItems).map(item -> orgScopeUrl + item.trim()).toArray(String[]::new));
@ -76,4 +85,16 @@ public class EsiaConfig {
public long getConnectionTimeout() {
return connectionTimeout;
}
public String getEsiaLogoutUrl() {
return esiaLogoutUrl;
}
public String getEsiaCodeUrl() {
return esiaCodeUrl;
}
public String getEsiaTokenUrl() {
return esiaTokenUrl;
}
}

8
backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
View file

@ -103,7 +103,7 @@ public class EsiaAuthService {
String responseType = "code";
String authUrl = esiaConfig.getEsiaBaseUri() + "aas/oauth2/v2/ac";
String authUrl = esiaConfig.getEsiaBaseUri() + esiaConfig.getEsiaCodeUrl();
URL url = new URL(authUrl);
Map<String, String> params = mapOf("scope", scope,
@ -175,7 +175,7 @@ public class EsiaAuthService {
parameters.put("code", esiaAuthCode);
String clientSecret = signMap(parameters);
String authUrl = esiaConfig.getEsiaBaseUri() + "aas/oauth2/v3/te";
String authUrl = esiaConfig.getEsiaBaseUri() + esiaConfig.getEsiaTokenUrl();
String postBody = new FormUrlencoded()
.setParameter("client_id", clientId)
.setParameter("code", esiaAuthCode)
@ -278,7 +278,7 @@ public class EsiaAuthService {
parameters.put("refresh_token", refreshToken);
String clientSecret = signMap(parameters);
String authUrl = esiaConfig.getEsiaBaseUri() + "aas/oauth2/v3/te";
String authUrl = esiaConfig.getEsiaBaseUri() + esiaConfig.getEsiaTokenUrl();
String postBody = new FormUrlencoded()
.setParameter("client_id", clientId)
.setParameter("refresh_token", refreshToken)
@ -389,7 +389,7 @@ public class EsiaAuthService {
response.addCookie(cookie);
}
}
String logoutUrl = esiaConfig.getEsiaBaseUri() + "idp/ext/Logout";
String logoutUrl = esiaConfig.getEsiaBaseUri() + esiaConfig.getEsiaLogoutUrl();
String redirectUrl = esiaConfig.getRedirectUrl();
URL url = new URL(logoutUrl);
Map<String, String> params = mapOf(