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

SUPPORT-8725:set camelCase naming

Browse source
This commit is contained in:
adel.kalimullin 2024-12-11 12:46:41 +03:00
parent 76ae8c8cde
commit a9468f783f
4 changed files with 63 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

22
backend/src/main/java/ru/micord/ervu/security/esia/model/EsiaAccessToken.java
View file

@ -25,9 +25,9 @@ public class EsiaAccessToken implements Serializable {
private String sid;
@JsonProperty("urn:esia:sbj_id")
private String sbj_id;
private String client_id;
private String sbjId;
@JsonProperty("client_id")
private String clientId;
private Long iat;
@ -71,20 +71,20 @@ public class EsiaAccessToken implements Serializable {
this.sid = sid;
}
public String getSbj_id() {
return sbj_id;
public String getSbjId() {
return sbjId;
}
public void setSbj_id(String sbj_id) {
this.sbj_id = sbj_id;
public void setSbjId(String sbjId) {
this.sbjId = sbjId;
}
public String getClient_id() {
return client_id;
public String getClientId() {
return clientId;
}
public void setClient_id(String client_id) {
this.client_id = client_id;
public void setClientId(String clientId) {
this.clientId = clientId;
}
public Long getIat() {

71
backend/src/main/java/ru/micord/ervu/security/esia/model/EsiaTokenResponse.java
View file

@ -3,6 +3,7 @@ package ru.micord.ervu.security.esia.model;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* @author Eduard Tihomirov
@ -12,44 +13,46 @@ public class EsiaTokenResponse implements Serializable {
private static final long serialVersionUID = 7655328287602576975L;
private String id_token;
private String access_token;
private String refresh_token;
@JsonProperty("id_token")
private String tokenId;
@JsonProperty("access_token")
private String accessToken;
@JsonProperty("refresh_token")
private String refreshToken;
private String state;
private String token_type;
private Long expires_in;
@JsonProperty("token_type")
private String tokenType;
@JsonProperty("expires_in")
private Long expiresIn;
private String error;
private String error_description;
@JsonProperty("error_description")
private String errorDescription;
public String getId_token() {
return id_token;
public String getTokenId() {
return tokenId;
}
public void setId_token(String id_token) {
this.id_token = id_token;
public void setTokenId(String tokenId) {
this.tokenId = tokenId;
}
public String getAccess_token() {
return access_token;
public String getAccessToken() {
return accessToken;
}
public void setAccess_token(String access_token) {
this.access_token = access_token;
public void setAccessToken(String accessToken) {
this.accessToken = accessToken;
}
public String getRefresh_token() {
return refresh_token;
public String getRefreshToken() {
return refreshToken;
}
public void setRefresh_token(String refresh_token) {
this.refresh_token = refresh_token;
public void setRefreshToken(String refreshToken) {
this.refreshToken = refreshToken;
}
public String getState() {
@ -60,20 +63,20 @@ public class EsiaTokenResponse implements Serializable {
this.state = state;
}
public String getToken_type() {
return token_type;
public String getTokenType() {
return tokenType;
}
public void setToken_type(String token_type) {
this.token_type = token_type;
public void setTokenType(String tokenType) {
this.tokenType = tokenType;
}
public Long getExpires_in() {
return expires_in;
public Long getExpiresIn() {
return expiresIn;
}
public void setExpires_in(Long expires_in) {
this.expires_in = expires_in;
public void setExpiresIn(Long expiresIn) {
this.expiresIn = expiresIn;
}
public String getError() {
@ -84,11 +87,11 @@ public class EsiaTokenResponse implements Serializable {
this.error = error;
}
public String getError_description() {
return error_description;
public String getErrorDescription() {
return errorDescription;
}
public void setError_description(String error_description) {
this.error_description = error_description;
public void setErrorDescription(String errorDescription) {
this.errorDescription = errorDescription;
}
}

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

@ -10,9 +10,6 @@ import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.LinkedHashMap;
@ -32,7 +29,6 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.context.SecurityContext;
import ru.micord.ervu.kafka.model.Document;
import ru.micord.ervu.kafka.model.ErrorData;
import ru.micord.ervu.kafka.model.Person;
import ru.micord.ervu.kafka.model.Response;
import ru.micord.ervu.kafka.service.ReplyingKafkaService;
@ -218,21 +214,21 @@ public ResponseEntity<?> getEsiaTokensByCode(String esiaAuthCode, String error,
}
if (tokenResponse.getError() != null) {
throw new RuntimeException(tokenResponse.getError_description());
throw new RuntimeException(tokenResponse.getErrorDescription());
}
String accessToken = tokenResponse.getAccess_token();
String accessToken = tokenResponse.getAccessToken();
String verifyResult = verifyToken(accessToken);
if (verifyResult != null) {
throw new RuntimeException(verifyResult);
}
String refreshToken = tokenResponse.getRefresh_token();
String refreshToken = tokenResponse.getRefreshToken();
EsiaAccessToken esiaAccessToken = personalDataService.readToken(accessToken);
String prnOid = esiaAccessToken.getSbj_id();
Long expiresIn = tokenResponse.getExpires_in();
String prnOid = esiaAccessToken.getSbjId();
Long expiresIn = tokenResponse.getExpiresIn();
TokensStore.addAccessToken(prnOid, accessToken, expiresIn);
TokensStore.addRefreshToken(prnOid, refreshToken, expiresIn);
Response ervuIdResponse = getErvuIdResponse(accessToken);
createTokenAndAddCookie(response, esiaAccessToken.getSbj_id(), ervuIdResponse.getErvuId(), expiresIn);
createTokenAndAddCookie(response, esiaAccessToken.getSbjId(), ervuIdResponse.getErvuId(), expiresIn);
if (ervuIdResponse.getErrorData() != null) {
return new ResponseEntity<>(
"Доступ запрещен. " + ervuIdResponse.getErrorData().getName(),
@ -297,21 +293,21 @@ public ResponseEntity<?> getEsiaTokensByCode(String esiaAuthCode, String error,
String responseString = postResp.body();
EsiaTokenResponse tokenResponse = objectMapper.readValue(responseString, EsiaTokenResponse.class);
if (tokenResponse != null && tokenResponse.getError() != null) {
throw new RuntimeException(tokenResponse.getError_description());
throw new RuntimeException(tokenResponse.getErrorDescription());
}
String accessToken = tokenResponse.getAccess_token();
String accessToken = tokenResponse.getAccessToken();
String verifyResult = verifyToken(accessToken);
if (verifyResult != null) {
throw new RuntimeException(verifyResult);
}
String newRefreshToken = tokenResponse.getRefresh_token();
String newRefreshToken = tokenResponse.getRefreshToken();
EsiaAccessToken esiaAccessToken = personalDataService.readToken(accessToken);
String prnOid = esiaAccessToken.getSbj_id();
Long expiresIn = tokenResponse.getExpires_in();
String prnOid = esiaAccessToken.getSbjId();
Long expiresIn = tokenResponse.getExpiresIn();
TokensStore.addAccessToken(prnOid, accessToken, expiresIn);
TokensStore.addRefreshToken(prnOid, newRefreshToken, expiresIn);
Response ervuIdResponse = getErvuIdResponse(accessToken);
createTokenAndAddCookie(response, esiaAccessToken.getSbj_id(), ervuIdResponse.getErvuId(), expiresIn);
createTokenAndAddCookie(response, esiaAccessToken.getSbjId(), ervuIdResponse.getErvuId(), expiresIn);
}
catch (Exception e) {
throw new RuntimeException(e);
@ -430,8 +426,8 @@ public ResponseEntity<?> getEsiaTokensByCode(String esiaAuthCode, String error,
if (!esiaHeader.getTyp().equals("JWT")) {
return "Token invalid. Token type: " + esiaHeader.getTyp() + " invalid";
}
if (!esiaAccessToken.getClient_id().equals(esiaConfig.getClientId())) {
return "Token invalid. Token clientId: " + esiaAccessToken.getClient_id() + " invalid";
if (!esiaAccessToken.getClientId().equals(esiaConfig.getClientId())) {
return "Token invalid. Token clientId: " + esiaAccessToken.getClientId() + " invalid";
}
if (!esiaAccessToken.getIss().equals(esiaConfig.getEsiaIssuerUrl())) {
return "Token invalid. Token issuer:" + esiaAccessToken.getIss() + " invalid";

2
backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaPersonalDataService.java
View file

@ -33,7 +33,7 @@ public class EsiaPersonalDataService implements PersonalDataService {
public PersonModel getPersonModel(String accessToken) {
try {
EsiaAccessToken esiaAccessToken = readToken(accessToken);
String prnsId = esiaAccessToken.getSbj_id();
String prnsId = esiaAccessToken.getSbjId();
PersonModel personModel = getPersonData(prnsId, accessToken);
personModel.setPassportModel(
getPassportModel(prnsId, accessToken, personModel.getrIdDoc()));