From 574b5488bd3dc864b2a49726657139b1bfcb9949 Mon Sep 17 00:00:00 2001 From: Borelli-7 Date: Sun, 14 Jan 2024 17:15:31 +0100 Subject: [PATCH 1/6] update jwt-config.properties files --- .../src/main/resources/jwt-config.properties | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/datasafe-rest-impl/src/main/resources/jwt-config.properties b/datasafe-rest-impl/src/main/resources/jwt-config.properties index 97cd74c18..7402462a6 100644 --- a/datasafe-rest-impl/src/main/resources/jwt-config.properties +++ b/datasafe-rest-impl/src/main/resources/jwt-config.properties @@ -1,5 +1,7 @@ -jwt_secret=${JWT_SECRET} -default_user=${DEFAULT_USER} -default_password=${DEFAULT_PASSWORD} -#10 Days in ms -token_expiration=${TOKEN_EXPIRATION:864000000} +debug=false +management.endpoints.web.exposure.include=* + +jwt_secret=n2r5u8x/A%D*G-KaPdSgVkYp3s6v9y$B&E(H+MbQeThWmZq4t7w!z%C*F-J@NcRf +default_user=username +default_password=password +token_expiration=864000000 From 2edade0bbae22a71ed8d3bffac511a0b4578f70c Mon Sep 17 00:00:00 2001 From: Borelli-7 Date: Sun, 14 Jan 2024 17:23:30 +0100 Subject: [PATCH 2/6] update env.js file in frontend module --- frontend/datasafe-ui/src/env.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/datasafe-ui/src/env.js b/frontend/datasafe-ui/src/env.js index 6d0d1f1c2..5526ce23a 100644 --- a/frontend/datasafe-ui/src/env.js +++ b/frontend/datasafe-ui/src/env.js @@ -1,9 +1,9 @@ (function (window) { window.__env = window.__env || {}; - window.__env.apiUrl = '${API_URL}'; + window.__env.apiUrl = 'http://localhost:8080'; // ideally these are not necessary, but API is protected, so supplying it for docker-local deployment - window.__env.apiUsername = '${API_USERNAME}'; - window.__env.apiPassword = '${API_PASSWORD}'; + window.__env.apiUsername = 'username'; + window.__env.apiPassword = 'password'; }(this)); \ No newline at end of file From 95c293c6575f62726289108987ef50dd270a655f Mon Sep 17 00:00:00 2001 From: Borelli-7 Date: Sun, 14 Jan 2024 17:50:36 +0100 Subject: [PATCH 3/6] fixes dat-#249 bring back swagger --- datasafe-rest-impl/pom.xml | 5 +++++ .../adorsys/datasafe/rest/impl/security/SecurityConfig.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index fe3dc62b6..6b5adee94 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -24,6 +24,11 @@ + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.3.0 + de.adorsys datasafe-business diff --git a/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/security/SecurityConfig.java b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/security/SecurityConfig.java index ed5677088..f38cd7aae 100644 --- a/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/security/SecurityConfig.java +++ b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/security/SecurityConfig.java @@ -61,7 +61,7 @@ public SecurityFilterChain filterChain(HttpSecurity http, MvcRequestMatcher.Buil .requestMatchers(SWAGGER_RESOURCES).permitAll() .requestMatchers(mvc.pattern("/static/**")).permitAll() .requestMatchers(mvc.pattern(SecurityConstants.AUTH_LOGIN_URL)).permitAll() - .requestMatchers(mvc.pattern(HttpMethod.OPTIONS, "/**")).permitAll() + .requestMatchers(mvc.pattern(HttpMethod.GET, "/**")).permitAll() .anyRequest().authenticated() ) .addFilter(new JwtAuthorizationFilter(authenticationManager, securityProperties)) From cd99d653dd840689f53acb1168607eabb5f0ceca Mon Sep 17 00:00:00 2001 From: Borelli-7 Date: Mon, 12 Feb 2024 18:16:19 +0100 Subject: [PATCH 4/6] Remove password commited --- .../src/test/resources/jwt-config.properties | 12 +++++------- frontend/datasafe-ui/src/env.js | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/datasafe-rest-impl/src/test/resources/jwt-config.properties b/datasafe-rest-impl/src/test/resources/jwt-config.properties index 7402462a6..a35818175 100644 --- a/datasafe-rest-impl/src/test/resources/jwt-config.properties +++ b/datasafe-rest-impl/src/test/resources/jwt-config.properties @@ -1,7 +1,5 @@ -debug=false -management.endpoints.web.exposure.include=* - -jwt_secret=n2r5u8x/A%D*G-KaPdSgVkYp3s6v9y$B&E(H+MbQeThWmZq4t7w!z%C*F-J@NcRf -default_user=username -default_password=password -token_expiration=864000000 +jwt_secret=${JWT_SECRET} +default_user=${DEFAULT_USER} +default_password=${DEFAULT_PASSWORD} +#10 Days in ms +token_expiration=${TOKEN_EXPIRATION:864000000} \ No newline at end of file diff --git a/frontend/datasafe-ui/src/env.js b/frontend/datasafe-ui/src/env.js index 5526ce23a..6d0d1f1c2 100644 --- a/frontend/datasafe-ui/src/env.js +++ b/frontend/datasafe-ui/src/env.js @@ -1,9 +1,9 @@ (function (window) { window.__env = window.__env || {}; - window.__env.apiUrl = 'http://localhost:8080'; + window.__env.apiUrl = '${API_URL}'; // ideally these are not necessary, but API is protected, so supplying it for docker-local deployment - window.__env.apiUsername = 'username'; - window.__env.apiPassword = 'password'; + window.__env.apiUsername = '${API_USERNAME}'; + window.__env.apiPassword = '${API_PASSWORD}'; }(this)); \ No newline at end of file From 62cf3603b3ed85f0f665c9630772fb5f428c753c Mon Sep 17 00:00:00 2001 From: Borelli Fotso <121124104+Borelli-7@users.noreply.github.com> Date: Mon, 12 Feb 2024 18:49:50 +0100 Subject: [PATCH 5/6] Update jwt-config.properties --- .../src/main/resources/jwt-config.properties | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/datasafe-rest-impl/src/main/resources/jwt-config.properties b/datasafe-rest-impl/src/main/resources/jwt-config.properties index 7402462a6..97cd74c18 100644 --- a/datasafe-rest-impl/src/main/resources/jwt-config.properties +++ b/datasafe-rest-impl/src/main/resources/jwt-config.properties @@ -1,7 +1,5 @@ -debug=false -management.endpoints.web.exposure.include=* - -jwt_secret=n2r5u8x/A%D*G-KaPdSgVkYp3s6v9y$B&E(H+MbQeThWmZq4t7w!z%C*F-J@NcRf -default_user=username -default_password=password -token_expiration=864000000 +jwt_secret=${JWT_SECRET} +default_user=${DEFAULT_USER} +default_password=${DEFAULT_PASSWORD} +#10 Days in ms +token_expiration=${TOKEN_EXPIRATION:864000000} From b16c62ff6d4fbb171a5ff482a6d14afcb8794025 Mon Sep 17 00:00:00 2001 From: Borelli Fotso <121124104+Borelli-7@users.noreply.github.com> Date: Mon, 12 Feb 2024 18:51:21 +0100 Subject: [PATCH 6/6] Update pom.xml --- datasafe-rest-impl/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index 6b5adee94..80a61146d 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -21,13 +21,14 @@ 2.2.4 1.6.0 3.0.2 + 2.3.0 org.springdoc springdoc-openapi-starter-webmvc-ui - 2.3.0 + ${springdoc-openapi-starter-webmvc-ui.version} de.adorsys