diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/controller/AdminController.java b/backend/src/main/java/ru/micord/ervu/account_applications/controller/AdminController.java index 62a84d8e..7d989992 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/controller/AdminController.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/controller/AdminController.java @@ -11,7 +11,6 @@ import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +50,6 @@ public class AdminController { @Value("${ervu.url}") private String ervuUrl; - @Value("${test.user.id:}") - private String testUserId; - @Value("${test.token:}") - private String testToken; public AdminController(RestTemplate restTemplate, SecurityContext securityContext) { this.restTemplate = restTemplate; @@ -116,12 +111,10 @@ public class AdminController { } private String getUserId() { - //TODO remove after test - return StringUtils.hasText(testUserId) ? testUserId : securityContext.getUserId(); + return securityContext.getUserId(); } - //TODO after SUPPORT-8975 private String getToken() { - return StringUtils.hasText(testToken) ? testToken : securityContext.getUserId(); //TODO take token after SUPPORT-8975 merge + return securityContext.getToken(); } } diff --git a/config/micord.env b/config/micord.env index c2beec5c..2a7cf004 100644 --- a/config/micord.env +++ b/config/micord.env @@ -13,6 +13,4 @@ DB_SEC_PORT=5432 DB_SEC_NAME=account_applications ERVU_URL=https://ervu-uat.test.gosuslugi.ru -TEST_USER_ID= -TEST_TOKEN= ERVU_HTTP_TIMEOUT= \ No newline at end of file