From fd6507217bd9fb224316311b6525b4721eae058a Mon Sep 17 00:00:00 2001 From: Eduard Tihomirov Date: Wed, 27 Nov 2024 12:16:40 +0300 Subject: [PATCH] SUPPORT-8593: Fix --- .../esia/controller/EsiaController.java | 6 ++++-- .../esia/service/EsiaAuthService.java | 21 ++++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/ru/micord/ervu/security/esia/controller/EsiaController.java b/backend/src/main/java/ru/micord/ervu/security/esia/controller/EsiaController.java index dac63e2..a0d3282 100644 --- a/backend/src/main/java/ru/micord/ervu/security/esia/controller/EsiaController.java +++ b/backend/src/main/java/ru/micord/ervu/security/esia/controller/EsiaController.java @@ -38,8 +38,10 @@ public class EsiaController { return esiaAuthService.generateAuthCodeUrl(); } - @GetMapping(value = "/esia/auth", params = "code") - public ResponseEntity esiaAuth(@RequestParam("code") String code, @RequestParam("error") String error, HttpServletRequest request, HttpServletResponse response) { + @GetMapping(value = "/esia/auth") + public ResponseEntity esiaAuth(@RequestParam(value = "code", required = false) String code, + @RequestParam(value = "error", required = false) String error, HttpServletRequest request, + HttpServletResponse response) { return esiaAuthService.getEsiaTokensByCode(code, error, request, response); } 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 8a9bb4d..3a39129 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 @@ -436,16 +436,17 @@ public ResponseEntity getEsiaTokensByCode(String esiaAuthCode, String error, if (!esiaAccessToken.getIss().equals(esiaConfig.getEsiaIssuerUrl())) { return "Token invalid. Token issuer:" + esiaAccessToken.getIss() + " invalid"; } - LocalDateTime iatTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(esiaAccessToken.getIat()), - ZoneId.systemDefault() - ); - LocalDateTime expTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(esiaAccessToken.getExp()), - ZoneId.systemDefault() - ); - LocalDateTime currentTime = LocalDateTime.now(); - if (!currentTime.isAfter(iatTime) || !expTime.isAfter(iatTime)) { - return "Token invalid. Token expired"; - } + //TODO SUPPORT-8750 +// LocalDateTime iatTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(esiaAccessToken.getIat()), +// ZoneId.systemDefault() +// ); +// LocalDateTime expTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(esiaAccessToken.getExp()), +// ZoneId.systemDefault() +// ); +// LocalDateTime currentTime = LocalDateTime.now(); +// if (!currentTime.isAfter(iatTime) || !expTime.isAfter(iatTime)) { +// return "Token invalid. Token expired"; +// } HttpResponse response = signVerify(accessToken); if (response.statusCode() != 200) { if (response.statusCode() == 401) {