Merge pull request #23218 from qmonmert/sonarjwt

Sonar: Remove this call to a deprecated method, it has been marked for removal
jhipster · Aug 20, 2023 · 1fc505a · 1fc505a
2 parents 7a9a174 + b43fc2c
commit 1fc505a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...s/server/templates/src/main/java/package/config/SecurityConfiguration_imperative.java.ejs b/...s/server/templates/src/main/java/package/config/SecurityConfiguration_imperative.java.ejs
@@ -37,6 +37,7 @@ import tech.jhipster.config.JHipsterConstants;
 <%_ } _%>
 <%_ if (authenticationTypeJwt) { _%>
 import org.springframework.http.HttpMethod;
+import org.springframework.security.config.Customizer;
 <%_ } _%>
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -248,7 +249,7 @@ public class SecurityConfiguration {
             .exceptionHandling((exceptions) -> exceptions
 				.authenticationEntryPoint(new BearerTokenAuthenticationEntryPoint())
 				.accessDeniedHandler(new BearerTokenAccessDeniedHandler()))
-            .oauth2ResourceServer(oauth2 -> oauth2.jwt());
+            .oauth2ResourceServer(oauth2 -> oauth2.jwt(Customizer.withDefaults()));
 <%_ } else if (authenticationTypeOauth2) { _%>
   <%_ if (applicationTypeMonolith) { _%>
             .oauth2Login(withDefaults())

diff --git a/...ors/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs b/...ors/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs
@@ -45,6 +45,9 @@ import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.ParameterizedTypeReference;
   <%_ } _%>
 <%_ } _%>
+<%_ if (authenticationTypeJwt) { _%>
+import org.springframework.security.config.Customizer;
+<%_ } _%>
 import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
 import org.springframework.security.config.web.server.SecurityWebFiltersOrder;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
@@ -293,7 +296,7 @@ public class SecurityConfiguration {
                     .jwtAuthenticationConverter(jwtAuthenticationConverter())));
 <%_ } else if (authenticationTypeJwt) { _%>
             .httpBasic(basic -> basic.disable())
-            .oauth2ResourceServer(oauth2 -> oauth2.jwt());
+            .oauth2ResourceServer(oauth2 -> oauth2.jwt(Customizer.withDefaults()));
 <%_ } else { _%>;<%_ } _%>
         return http.build();
     }