From 85a33f67bd1ff79d5aa2573782f6606bf41977e0 Mon Sep 17 00:00:00 2001 From: Zaripov Emil Date: Mon, 28 Apr 2025 12:14:33 +0300 Subject: [PATCH] Revert "Merge branch 'feature/SUPPORT-9110_temp_remove_fileupload' into develop" This reverts commit 26c4e42546adeaad35b738b860c85bc87478150d, reversing changes made to f7756cac85467be39ae4186eede3f2382214b983. --- .../micord/ervu/security/SecurityConfig.java | 11 +- .../Личный кабинет юр лица.page | 454 ++++-------------- 2 files changed, 95 insertions(+), 370 deletions(-) diff --git a/backend/src/main/java/ru/micord/ervu/security/SecurityConfig.java b/backend/src/main/java/ru/micord/ervu/security/SecurityConfig.java index 5c57e79b..43236f99 100644 --- a/backend/src/main/java/ru/micord/ervu/security/SecurityConfig.java +++ b/backend/src/main/java/ru/micord/ervu/security/SecurityConfig.java @@ -33,7 +33,6 @@ public class SecurityConfig { private static final String[] PERMIT_ALL = new String[] { "/version", "/esia/url", "/esia/auth", "esia/refresh", "/esia/logout" }; - private static final String DENY_ALL = "/employee/document"; @Autowired private JwtAuthenticationFilter jwtAuthenticationFilter; @Autowired @@ -58,11 +57,11 @@ public class SecurityConfig { // Use only the handle() method of XorCsrfTokenRequestAttributeHandler and the // default implementation of resolveCsrfTokenValue() from CsrfTokenRequestHandler CsrfTokenRequestHandler requestHandler = delegate::handle; - http.authorizeHttpRequests((authorizeHttpRequests) -> authorizeHttpRequests - .requestMatchers(DENY_ALL).denyAll() - .requestMatchers(PERMIT_ALL).permitAll() - .anyRequest().authenticated() - ) + http.authorizeHttpRequests( + (authorizeHttpRequests) -> authorizeHttpRequests.requestMatchers(PERMIT_ALL) + .permitAll() + .anyRequest() + .authenticated()) .csrf((csrf) -> csrf.csrfTokenRepository(tokenRepository) .csrfTokenRequestHandler(requestHandler) .sessionAuthenticationStrategy(new NullAuthenticatedSessionStrategy())) diff --git a/resources/src/main/resources/business-model/Личный кабинет юр лица.page b/resources/src/main/resources/business-model/Личный кабинет юр лица.page index 10164fe3..2df73da3 100644 --- a/resources/src/main/resources/business-model/Личный кабинет юр лица.page +++ b/resources/src/main/resources/business-model/Личный кабинет юр лица.page @@ -804,7 +804,6 @@ 8101e7bf-e6fe-4f6d-82a5-740dce669649 Кнопка 1 false - false false @@ -908,7 +907,24 @@ eventRefs - + + + + + behavior + + {"objectId":"8101e7bf-e6fe-4f6d-82a5-740dce669649","packageName":"component.button","className":"Button","type":"TS"} + + + + propertyName + + "successActionEvent" + + + + + @@ -2624,7 +2640,6 @@ 481669b7-948e-474d-8f53-1d6afd409f98 Text false - false false @@ -3024,7 +3039,24 @@ eventRefs - + + + + + behavior + + {"objectId":"3b26aaa6-3639-4a36-8d37-2a4a2d3a2f87","packageName":"component.button","className":"Button","type":"TS"} + + + + propertyName + + "successActionEvent" + + + + + @@ -3555,7 +3587,6 @@ e52c6ec6-f425-438f-a701-10ecc2664248 Текст false - false false @@ -5082,7 +5113,24 @@ eventRefs - + + + + + behavior + + {"objectId":"cc33db1e-2720-4e87-ab51-e32c7a5e0b9e","packageName":"component.button","className":"Button","type":"TS"} + + + + propertyName + + "successActionEvent" + + + + + @@ -7243,7 +7291,24 @@ eventRefs - + + + + + behavior + + {"objectId":"20a9ff21-b90f-4e38-ab85-4826fbc11405","packageName":"component.button","className":"Button","type":"TS"} + + + + propertyName + + "successActionEvent" + + + + + @@ -9480,7 +9545,24 @@ eventRefs - + + + + + behavior + + {"objectId":"f6310258-ec19-4d13-b04d-cfc09d6b5e77","packageName":"component.button","className":"Button","type":"TS"} + + + + propertyName + + "successActionEvent" + + + + + @@ -10971,7 +11053,6 @@ f4eafa61-1ea3-440a-806b-7b05ec416871 Диалог - сведения направлены true - false false @@ -11025,7 +11106,6 @@ 503d22a0-c099-4593-a199-5c7eb4aa3237 Кнопка false - false false @@ -11136,7 +11216,6 @@ 894c4e19-0bd3-4e13-9bd6-d40ab378ca21 Диалог - что-то пошло не так true - false false @@ -11621,357 +11700,4 @@ - - 86f297f1-ab3d-40e0-ac2f-89cc944b7f0a - 93a1b29d-c3c8-4300-a063-44720562dff3 - Диалог- временное решение для загрузки файла - true - false - - - - closable - - false - - - - cssClasses - - - -"align-center" - - - - -"win-error" - - - - - - - - - - - - 98594cec-0a9b-4cef-af09-e1b71cb2ad9e - d6e0aa92-78ed-470e-8a98-9cce3f30efe5 - Обработка событий-show dialog - false - false - - - - eventRefs - - - - - - behavior - - {"objectId":"8101e7bf-e6fe-4f6d-82a5-740dce669649","packageName":"component.button","className":"Button","type":"TS"} - - - - propertyName - - "successActionEvent" - - - - - - - - - - behavior - - {"objectId":"3b26aaa6-3639-4a36-8d37-2a4a2d3a2f87","packageName":"component.button","className":"Button","type":"TS"} - - - - propertyName - - "successActionEvent" - - - - - - - - - - behavior - - {"objectId":"cc33db1e-2720-4e87-ab51-e32c7a5e0b9e","packageName":"component.button","className":"Button","type":"TS"} - - - - propertyName - - "successActionEvent" - - - - - - - - - - behavior - - {"objectId":"20a9ff21-b90f-4e38-ab85-4826fbc11405","packageName":"component.button","className":"Button","type":"TS"} - - - - propertyName - - "successActionEvent" - - - - - - - - - - behavior - - {"objectId":"f6310258-ec19-4d13-b04d-cfc09d6b5e77","packageName":"component.button","className":"Button","type":"TS"} - - - - propertyName - - "successActionEvent" - - - - - - - - - - - - - - - - - - ifCondition - - - - logicalOperation - - null - - - - - - - thenActions - - - - - - behavior - - {"objectId":"93a1b29d-c3c8-4300-a063-44720562dff3","packageName":"component","className":"Dialog","type":"TS"} - - - - method - - "show" - - - - value - - null - - - - - - - - - - - - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 - 03e9410a-8d47-4a74-b0c3-cfb8900004f1 - Вертикальный контейнер - true - false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 8e234aed-6ad7-4e00-834f-e043f2d29c55 - Текст - false - false - - - - collectible - -false - - - - initialValue - -"Система находится в опытной эксплуатации. Функция загрузки данных от организаций будет доступна позднее." - - - - - - - - - false - - - - fd7e47b9-dce1-4d14-9f3a-580c79f59579 - b32b3411-2032-4713-8c5c-67cb114ad231 - Кнопка - false - true - - - - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 - b28dce91-46cb-46fe-a309-ccc2ace6cb34 - Вертикальный контейнер - true - false - - - - - - - 98594cec-0a9b-4cef-af09-e1b71cb2ad9e - 14c11640-a5b2-4aea-a6a7-4b1ff334de7c - Обработка событий-close dialog - false - false - - - - eventRefs - - - - - - behavior - - {"objectId":"b32b3411-2032-4713-8c5c-67cb114ad231","packageName":"component.button","className":"Button","type":"TS"} - - - - propertyName - - "successActionEvent" - - - - - - - - - ifCondition - - - - logicalOperation - - null - - - - - - - thenActions - - - - - - behavior - - {"objectId":"93a1b29d-c3c8-4300-a063-44720562dff3","packageName":"component","className":"Dialog","type":"TS"} - - - - method - - "hide" - - - - value - - null - - - - - - - - - - - - fd7e47b9-dce1-4d14-9f3a-580c79f59579 - b32b3411-2032-4713-8c5c-67cb114ad231 - Кнопка - false - false - - - - caption - -"Закрыть" - - - - - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - f6703dc0-c93c-4d28-adb7-a04faf79a920 - Горизонтальный контейнер - true - true - - -