generator-jhipster 7.1.0 → 7.4.0

package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs

@@ -19,25 +19,25 @@
 package <%= packageName %>.config;
 
 import <%= packageName %>.security.AuthoritiesConstants;
-<%_ if (authenticationType === 'jwt') { _%>
+<%_ if (authenticationTypeJwt) { _%>
 import <%= packageName %>.security.jwt.JWTFilter;
 import <%= packageName %>.security.jwt.TokenProvider;
 <%_ } _%>
-<%_ if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>
-    <%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>
+  <%_ if (authenticationTypeOauth2) { _%>
 import <%= packageName %>.security.SecurityUtils;
 import <%= packageName %>.security.oauth2.AudienceValidator;
 import <%= packageName %>.security.oauth2.JwtGrantedAuthorityConverter;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
-    <%_ } _%>
+  <%_ } _%>
 import tech.jhipster.web.filter.reactive.CookieCsrfFilter;
 <%_ } _%>
-<%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeOauth2) { _%>
 import org.springframework.beans.factory.annotation.Value;
 <%_ } _%>
 import tech.jhipster.config.JHipsterProperties;
-<%_ if (skipUserManagement && authenticationType !== 'oauth2') { _%>
+<%_ if (skipUserManagement && !authenticationTypeOauth2) { _%>
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
 <%_ } _%>
 <%_ if (!skipClient) { _%>
@@ -45,14 +45,14 @@ import <%= packageName %>.web.filter.SpaWebFilter;
 <%_ } _%>
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
-<%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeOauth2) { _%>
 import org.springframework.core.convert.converter.Converter;
 <%_ } _%>
 import org.springframework.http.HttpMethod;
-<%_ if (authenticationType === 'session') { _%>
+<%_ if (authenticationTypeSession) { _%>
 import org.springframework.http.HttpStatus;
 <%_ } _%>
-<%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
 import org.springframework.security.authentication.ReactiveAuthenticationManager;
 import org.springframework.security.authentication.UserDetailsRepositoryReactiveAuthenticationManager;
 <%_ } _%>
@@ -60,17 +60,27 @@ import org.springframework.security.config.annotation.method.configuration.Enabl
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.web.server.SecurityWebFiltersOrder;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
-<%_ if (authenticationType === 'session') { _%>
+<%_ if (authenticationTypeSession) { _%>
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 <%_ } _%>
-<%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeOauth2) { _%>
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcReactiveOAuth2UserService;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
+<%_ if (applicationTypeGateway) { _%>
+import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
+<%_ } _%>
 import org.springframework.security.oauth2.client.userinfo.ReactiveOAuth2UserService;
+<%_ if (applicationTypeGateway) { _%>
+import org.springframework.security.oauth2.client.web.server.DefaultServerOAuth2AuthorizationRequestResolver;
+import org.springframework.security.oauth2.client.web.server.ServerOAuth2AuthorizationRequestResolver;
+<%_ } _%>
 import org.springframework.security.oauth2.core.DelegatingOAuth2TokenValidator;
 import org.springframework.security.oauth2.core.OAuth2TokenValidator;
+<%_ if (applicationTypeGateway) { _%>
+import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
+<%_ } _%>
 import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.security.oauth2.core.oidc.user.OidcUserAuthority;
@@ -79,46 +89,49 @@ import org.springframework.security.oauth2.server.resource.authentication.Reacti
 import org.springframework.security.web.server.csrf.CookieServerCsrfTokenRepository;
 import org.springframework.security.web.server.header.ReferrerPolicyServerHttpHeadersWriter;
 <%_ } _%>
-<%_ if (authenticationType !== 'oauth2') { _%>
-    <%_ if (skipUserManagement) { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
+  <%_ if (skipUserManagement) { _%>
 import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
-    <%_ } _%>
+  <%_ } _%>
 import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
-    <%_ if (authenticationType === 'session' || skipUserManagement) { _%>
+  <%_ if (authenticationTypeSession || skipUserManagement) { _%>
 import org.springframework.security.core.userdetails.User;
-    <%_ } _%>
-    <%_ if (skipUserManagement) { _%>
+  <%_ } _%>
+  <%_ if (skipUserManagement) { _%>
 import org.springframework.security.core.userdetails.UserDetails;
-    <%_ } _%>
+  <%_ } _%>
 <%_ } _%>
 <%_ if (!skipUserManagement) { _%>
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 <%_ } _%>
 import org.springframework.security.web.server.SecurityWebFilterChain;
-<%_ if (authenticationType === 'session') { _%>
+<%_ if (authenticationTypeSession) { _%>
 import org.springframework.security.web.server.WebFilterExchange;
 import org.springframework.security.web.server.authentication.HttpStatusServerEntryPoint;
 import org.springframework.security.web.server.authentication.logout.HttpStatusReturningServerLogoutSuccessHandler;
 import org.springframework.security.web.server.csrf.CookieServerCsrfTokenRepository;
 <%_ } _%>
 import org.springframework.security.web.server.header.ReferrerPolicyServerHttpHeadersWriter;
-<%_ if (applicationType === 'microservice') { _%>
+<%_ if (applicationTypeMicroservice) { _%>
 import org.springframework.security.web.server.savedrequest.NoOpServerRequestCache;
 <%_ } _%>
 import org.springframework.security.web.server.util.matcher.NegatedServerWebExchangeMatcher;
 import org.springframework.security.web.server.util.matcher.OrServerWebExchangeMatcher;
-<%_ if (skipUserManagement && authenticationType !== 'oauth2') { _%>
+<%_ if (skipUserManagement && !authenticationTypeOauth2) { _%>
 import org.springframework.util.StringUtils;
 <%_ } _%>
 import org.zalando.problem.spring.webflux.advice.security.SecurityProblemSupport;
-<%_ if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>
 import reactor.core.publisher.Mono;
 <%_ } _%>
-<%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeOauth2) { _%>
 
 import java.util.HashSet;
 import java.util.Set;
+<%_ if (applicationType === 'gateway') { _%>
+import java.util.function.Consumer;
+<%_ } _%>
 <%_ } _%>
 
 import static org.springframework.security.web.server.util.matcher.ServerWebExchangeMatchers.pathMatchers;
@@ -130,32 +143,39 @@ public class SecurityConfiguration {
 
     private final JHipsterProperties jHipsterProperties;
 
-    <%_ if (!skipUserManagement) { _%>
+<%_ if (!skipUserManagement) { _%>
     private final ReactiveUserDetailsService userDetailsService;
 
-    <%_ } _%>
-    <%_ if (authenticationType === 'jwt') { _%>
+<%_ } _%>
+<%_ if (authenticationTypeJwt) { _%>
     private final TokenProvider tokenProvider;
-    <%_ } _%>
+<%_ } _%>
 
-    <%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeOauth2) { _%>
     @Value("${spring.security.oauth2.client.provider.oidc.issuer-uri}")
     private String issuerUri;
-    <%_ } _%>
+  <%_ if (applicationTypeGateway) { _%>
+
+    private final ReactiveClientRegistrationRepository clientRegistrationRepository;
+  <%_ } _%>
+<%_ } _%>
     private final SecurityProblemSupport problemSupport;
 
-    public SecurityConfiguration(<% if (!skipUserManagement && authenticationType !== 'oauth2') { %>ReactiveUserDetailsService userDetailsService, <% } %><% if (authenticationType === 'jwt') { %>TokenProvider tokenProvider, <% } %> JHipsterProperties jHipsterProperties, SecurityProblemSupport problemSupport) {
-        <%_ if (!skipUserManagement && authenticationType !== 'oauth2') { _%>
+    public SecurityConfiguration(<% if (!skipUserManagement && !authenticationTypeOauth2) { %>ReactiveUserDetailsService userDetailsService, <% } %><% if (authenticationTypeJwt) { %>TokenProvider tokenProvider, <% } %><% if (authenticationTypeOauth2 && applicationTypeGateway) { %> ReactiveClientRegistrationRepository clientRegistrationRepository, <% } %>JHipsterProperties jHipsterProperties, SecurityProblemSupport problemSupport) {
+<%_ if (authenticationTypeOauth2 && applicationTypeGateway) { _%>
+        this.clientRegistrationRepository = clientRegistrationRepository;
+<%_ } _%>
+<%_ if (!skipUserManagement && !authenticationTypeOauth2) { _%>
         this.userDetailsService = userDetailsService;
-        <%_ } _%>
-        <%_ if (authenticationType === 'jwt') { _%>
+<%_ } _%>
+<%_ if (authenticationTypeJwt) { _%>
         this.tokenProvider = tokenProvider;
-        <%_ } _%>
+<%_ } _%>
         this.jHipsterProperties = jHipsterProperties;
         this.problemSupport = problemSupport;
     }
 
-    <%_ if (!skipUserManagement && authenticationType !== 'oauth2') { _%>
+<%_ if (!skipUserManagement && !authenticationTypeOauth2) { _%>
     @Bean
     public PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
@@ -168,7 +188,7 @@ public class SecurityConfiguration {
         return authenticationManager;
     }
 
-    <%_ } else if (authenticationType !== 'oauth2') { _%>
+<%_ } else if (!authenticationTypeOauth2) { _%>
     @Bean
     public MapReactiveUserDetailsService userDetailsService(SecurityProperties properties) {
         SecurityProperties.User user = properties.getUser();
@@ -185,7 +205,7 @@ public class SecurityConfiguration {
         return new UserDetailsRepositoryReactiveAuthenticationManager(userDetailsService);
     }
 
-    <%_ } _%>
+<%_ } _%>
     @Bean
     public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
         // @formatter:off
@@ -195,27 +215,27 @@ public class SecurityConfiguration {
                 pathMatchers(HttpMethod.OPTIONS, "/**")
             )))
             .csrf()
-            <%_ if (['session','oauth2'].includes(authenticationType) && applicationType !== 'microservice') { _%>
+<%_ if ((authenticationTypeSession || authenticationTypeOauth2) && !applicationTypeMicroservice) { _%>
                 .csrfTokenRepository(CookieServerCsrfTokenRepository.withHttpOnlyFalse())
         .and()
             // See https://github.com/spring-projects/spring-security/issues/5766
             .addFilterAt(new CookieCsrfFilter(), SecurityWebFiltersOrder.REACTOR_CONTEXT)
-            <%_ } else { _%>
+<%_ } else { _%>
                 .disable()
-            <%_ } _%>
-            <%_ if (!skipClient) { _%>
+<%_ } _%>
+<%_ if (!skipClient) { _%>
             .addFilterAt(new SpaWebFilter(), SecurityWebFiltersOrder.AUTHENTICATION)
-            <%_ } _%>
-            <%_ if (authenticationType === 'jwt') { _%>
+<%_ } _%>
+<%_ if (authenticationTypeJwt) { _%>
             .addFilterAt(new JWTFilter(tokenProvider), SecurityWebFiltersOrder.HTTP_BASIC)
-            <%_ } _%>
-            <%_ if (!skipUserManagement && authenticationType !== 'oauth2') { _%>
+<%_ } _%>
+<%_ if (!skipUserManagement && !authenticationTypeOauth2) { _%>
             .authenticationManager(reactiveAuthenticationManager())
-            <%_ } _%>
+<%_ } _%>
             .exceptionHandling()
                 .accessDeniedHandler(problemSupport)
                 .authenticationEntryPoint(problemSupport)
-            <%_ if (authenticationType === 'session') { _%>
+<%_ if (authenticationTypeSession) { _%>
         .and()
             .formLogin()
             .requiresAuthenticationMatcher(pathMatchers(HttpMethod.POST, "/api/authentication"))
@@ -226,58 +246,86 @@ public class SecurityConfiguration {
             .logout()
             .logoutUrl("/api/logout")
             .logoutSuccessHandler(new HttpStatusReturningServerLogoutSuccessHandler())
-            <%_ } _%>
+<%_ } _%>
         .and()
             .headers()
             .contentSecurityPolicy(jHipsterProperties.getSecurity().getContentSecurityPolicy())
             .and()
                 .referrerPolicy(ReferrerPolicyServerHttpHeadersWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN)
             .and()
-                .featurePolicy("geolocation 'none'; midi 'none'; sync-xhr 'none'; microphone 'none'; camera 'none'; magnetometer 'none'; gyroscope 'none'; fullscreen 'self'; payment 'none'")
+                .permissionsPolicy().policy("camera=(), fullscreen=(self), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=()")
             .and()
                 .frameOptions().disable()
-        <%_ if (applicationType === 'microservice') { _%>
+<%_ if (applicationTypeMicroservice) { _%>
         .and()
             .requestCache()
             .requestCache(NoOpServerRequestCache.getInstance())
-        <%_ } _%>
+<%_ } _%>
         .and()
             .authorizeExchange()
-            <%_ if (!skipClient) { _%>
+<%_ if (!skipClient) { _%>
             .pathMatchers("/").permitAll()
             .pathMatchers("/*.*").permitAll()
-            <%_ } _%>
+<%_ } _%>
             .pathMatchers("/api/authenticate").permitAll()
-            <%_ if (!skipUserManagement) { _%>
+<%_ if (!skipUserManagement) { _%>
             .pathMatchers("/api/register").permitAll()
             .pathMatchers("/api/activate").permitAll()
             .pathMatchers("/api/account/reset-password/init").permitAll()
             .pathMatchers("/api/account/reset-password/finish").permitAll()
-            <%_ } _%>
+<%_ } _%>
             .pathMatchers("/api/auth-info").permitAll()
             .pathMatchers("/api/admin/**").hasAuthority(AuthoritiesConstants.ADMIN)
             .pathMatchers("/api/**").authenticated()
-            <%_ if (applicationType === 'monolith' || applicationType === 'gateway') { _%>
+<%_ if (applicationTypeGateway) { _%>
+  <%_ if (microfrontend && (authenticationTypeJwt || clientFrameworkVue)) { _%>
+            // microfrontend resources are loaded by webpack without authentication, they need to be public
+            .pathMatchers("/services/*/*.js").permitAll()
+            .pathMatchers("/services/*/*.js.map").permitAll()
+  <%_ } _%>
+            .pathMatchers("/services/*/v3/api-docs").hasAuthority(AuthoritiesConstants.ADMIN)
+<%_ } _%>
+<%_ if (applicationTypeMonolith || applicationTypeGateway) { _%>
             .pathMatchers("/services/**").authenticated()
-            <%_ } _%>
+<%_ } _%>
             .pathMatchers("/management/health").permitAll()
             .pathMatchers("/management/health/**").permitAll()
             .pathMatchers("/management/info").permitAll()
             .pathMatchers("/management/prometheus").permitAll()
             .pathMatchers("/management/**").hasAuthority(AuthoritiesConstants.ADMIN);
-        <%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeOauth2) { _%>
 
-        http<%_ if (['monolith', 'gateway'].includes(applicationType)) { _%>.oauth2Login()
-            .and()
-            <% } %>.oauth2ResourceServer()
+        http<%_ if (applicationTypeGateway || applicationTypeMonolith) { _%><%_ if (applicationTypeGateway) { _%>.oauth2Login(oauth2 -> oauth2.authorizationRequestResolver(authorizationRequestResolver(this.clientRegistrationRepository)))<%_ } else { _%>.oauth2Login()
+            .and()<%_ } _%>
+            <% } %>
+            .oauth2ResourceServer()
                 .jwt()
                 .jwtAuthenticationConverter(jwtAuthenticationConverter());
         http.oauth2Client();
-            <%_ } _%>
+<%_ } _%>
         // @formatter:on
         return http.build();
     }
-    <%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeOauth2) { _%>
+
+    <%_ if (applicationType === 'gateway') { _%>
+    private ServerOAuth2AuthorizationRequestResolver authorizationRequestResolver(
+        ReactiveClientRegistrationRepository clientRegistrationRepository) {
+        DefaultServerOAuth2AuthorizationRequestResolver authorizationRequestResolver =
+            new DefaultServerOAuth2AuthorizationRequestResolver(clientRegistrationRepository);
+        if (this.issuerUri.contains("auth0.com")) {
+            authorizationRequestResolver.setAuthorizationRequestCustomizer(authorizationRequestCustomizer());
+        }
+        return  authorizationRequestResolver;
+    }
+
+    private Consumer<OAuth2AuthorizationRequest.Builder> authorizationRequestCustomizer() {
+        return customizer -> customizer
+            .authorizationRequestUri(uriBuilder ->
+                uriBuilder.queryParam("audience", jHipsterProperties.getSecurity().getOauth2().getAudience())
+                    .build());
+    }
+    <%_ } _%>
 
     Converter<Jwt, Mono<AbstractAuthenticationToken>> jwtAuthenticationConverter() {
         JwtAuthenticationConverter jwtAuthenticationConverter = new JwtAuthenticationConverter();
@@ -324,8 +372,8 @@ public class SecurityConfiguration {
         return jwtDecoder;
     }
 
-    <%_ } _%>
-    <%_ if (authenticationType === 'session') { _%>
+<%_ } _%>
+<%_ if (authenticationTypeSession) { _%>
 
     private Mono<Void> onAuthenticationError(WebFilterExchange exchange, AuthenticationException e) {
         exchange.getExchange().getResponse().setStatusCode(HttpStatus.UNAUTHORIZED);
@@ -336,5 +384,5 @@ public class SecurityConfiguration {
         exchange.getExchange().getResponse().setStatusCode(HttpStatus.OK);
         return Mono.empty();
     }
-    <%_ } _%>
+<%_ } _%>
 }

package/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs

@@ -21,11 +21,11 @@ package <%= packageName %>.config;
 <%_ if (reactive) { _%>
 import com.fasterxml.jackson.databind.ObjectMapper;
 <%_ } _%>
-<%_ if (!skipClient || ['h2Disk', 'h2Memory'].includes(devDatabaseType)) { _%>
+<%_ if (!skipClient || devDatabaseTypeH2Any) { _%>
 import tech.jhipster.config.JHipsterConstants;
 <%_ } _%>
 import tech.jhipster.config.JHipsterProperties;
-<%_ if (['h2Disk', 'h2Memory'].includes(devDatabaseType)) { _%>
+<%_ if (devDatabaseTypeH2Any) { _%>
 import tech.jhipster.config.h2.H2ConfigurationHelper;
 <%_ } _%>
 <%_ if (!skipClient && reactive) { _%>
@@ -49,11 +49,11 @@ import org.springframework.context.annotation.Profile;
     <%_ } _%>
 import org.springframework.core.annotation.Order;
 <%_ } _%>
-<%_ if (reactive) { _%>
+<%_ if (reactive && !databaseTypeNo) { _%>
 import org.springframework.data.web.ReactivePageableHandlerMethodArgumentResolver;
 import org.springframework.data.web.ReactiveSortHandlerMethodArgumentResolver;
 <%_ } _%>
-<%_ if (!reactive || (['h2Disk', 'h2Memory'].includes(devDatabaseType) && reactive)) { _%>
+<%_ if (!reactive || (devDatabaseTypeH2Any && reactive)) { _%>
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.Profiles;
 <%_ } _%>
@@ -77,10 +77,8 @@ import org.zalando.problem.spring.webflux.advice.ProblemHandling;
 import javax.servlet.*;
     <%_ if (!skipClient) { _%>
 import java.io.File;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
-import java.util.*;
 
 import static java.net.URLDecoder.decode;
     <%_ } _%>
@@ -98,22 +96,27 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
 
     private final Logger log = LoggerFactory.getLogger(WebConfigurer.class);
 
-    <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
     private final Environment env;
 
-    <%_ } _%>
+<%_ } _%>
     private final JHipsterProperties jHipsterProperties;
 
     public WebConfigurer(<% if (!reactive || (devDatabaseTypeH2Any && reactive)) { %>Environment env, <% } %>JHipsterProperties jHipsterProperties) {
-        <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
         this.env = env;
-        <%_ } _%>
+<%_ } _%>
         this.jHipsterProperties = jHipsterProperties;
 <%_ if (devDatabaseTypeH2Any && reactive) { _%>
         if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) {
-            H2ConfigurationHelper.initH2Console();
+            try {
+                H2ConfigurationHelper.initH2Console();
+            } catch (Exception e) {
+                // Console may already be running on another app or after a refresh.
+                e.printStackTrace();
+            };
         }
-<%_ } _%>  
+<%_ } _%>
     }
 
 
@@ -125,21 +128,21 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
             log.info("Web application configuration, using profiles: {}", (Object[]) env.getActiveProfiles());
         }
 
-    <%_ if (devDatabaseTypeH2Any) { _%>
+  <%_ if (devDatabaseTypeH2Any) { _%>
         if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) {
             initH2Console(servletContext);
         }
-    <%_ } _%>
+  <%_ } _%>
         log.info("Web application fully configured");
     }
-    <%_ if (!skipClient) { _%>
+  <%_ if (!skipClient) { _%>
 
     /**
      * Customize the Servlet engine: Mime types, the document root, the cache.
      */
     @Override
     public void customize(WebServerFactory server) {
-        // When running in an IDE or with <% if (buildTool === 'gradle') { %>./gradlew bootRun<% } else { %>./mvnw spring-boot:run<% } %>, set location of the static web assets.
+        // When running in an IDE or with <% if (buildToolGradle) { %>./gradlew bootRun<% } else { %>./mvnw spring-boot:run<% } %>, set location of the static web assets.
         setLocationForStaticAssets(server);
     }
 
@@ -159,13 +162,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
      * Resolve path prefix to static resources.
      */
     private String resolvePathPrefix() {
-        String fullExecutablePath;
-        try {
-            fullExecutablePath = decode(this.getClass().getResource("").getPath(), StandardCharsets.UTF_8.name());
-        } catch (UnsupportedEncodingException e) {
-            /* try without decoding if this ever happens */
-            fullExecutablePath = this.getClass().getResource("").getPath();
-        }
+        String fullExecutablePath = decode(this.getClass().getResource("").getPath(), StandardCharsets.UTF_8);
         String rootPath = Paths.get(".").toUri().normalize().getPath();
         String extractedPath = fullExecutablePath.replace(rootPath, "");
         int extractionEndIndex = extractedPath.indexOf("<%= BUILD_DIR %>");
@@ -175,7 +172,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
         return extractedPath.substring(0, extractionEndIndex);
     }
 
-    <%_ } _%>
+  <%_ } _%>
 <%_ } _%>
 
     @Bean
@@ -190,16 +187,17 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
             source.registerCorsConfiguration("/v3/api-docs", config);
             source.registerCorsConfiguration("/swagger-resources", config);
             source.registerCorsConfiguration("/swagger-ui/**", config);
-            <%_ if (applicationType === 'gateway') { _%>
+<%_ if (applicationTypeGateway) { _%>
             source.registerCorsConfiguration("/*/api/**", config);
             source.registerCorsConfiguration("/services/*/api/**", config);
             source.registerCorsConfiguration("/*/management/**", config);
-            <%_ } _%>
+<%_ } _%>
         }
         return new Cors<% if (reactive) { %>Web<% } %>Filter(source);
     }
-    <%_ if (reactive) { _%>
+<%_ if (reactive) { _%>
 
+  <%_ if (!databaseTypeNo) { _%>
     // TODO: remove when this is supported in spring-boot
     @Bean
     HandlerMethodArgumentResolver reactivePageableHandlerMethodArgumentResolver() {
@@ -211,13 +209,14 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
     HandlerMethodArgumentResolver reactiveSortHandlerMethodArgumentResolver() {
         return new ReactiveSortHandlerMethodArgumentResolver();
     }
+  <%_ } _%>
 
     @Bean
     @Order(-2) // The handler must have precedence over WebFluxResponseStatusExceptionHandler and Spring Boot's ErrorWebExceptionHandler
     public WebExceptionHandler problemExceptionHandler(ObjectMapper mapper, ProblemHandling problemHandling) {
         return new ProblemExceptionHandler(mapper, problemHandling);
     }
-        <%_ if (!skipClient) { _%>
+  <%_ if (!skipClient) { _%>
 
     @Bean
     ResourceHandlerRegistrationCustomizer registrationCustomizer() {
@@ -231,9 +230,9 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
         // Use a cache filter that only match selected paths
         return new CachingHttpHeadersFilter(TimeUnit.DAYS.toMillis(jHipsterProperties.getHttp().getCache().getTimeToLiveInDays()));
     }
-        <%_ } _%>
-    <%_ } _%>
-    <%_ if (['h2Disk', 'h2Memory'].includes(devDatabaseType) && !reactive) { _%>
+  <%_ } _%>
+<%_ } _%>
+<%_ if (devDatabaseTypeH2Any && !reactive) { _%>
 
     /**
      * Initializes H2 console.
@@ -242,6 +241,6 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
         log.debug("Initialize H2 console");
         H2ConfigurationHelper.initH2Console(servletContext);
     }
-    <%_ } _%>
+<%_ } _%>
 
 }

package/generators/server/templates/src/main/java/package/config/WebsocketSecurityConfiguration.java.ejs

@@ -41,7 +41,8 @@ public class WebsocketSecurityConfiguration extends AbstractSecurityWebSocketMes
             .simpTypeMatchers(SimpMessageType.MESSAGE, SimpMessageType.SUBSCRIBE).denyAll()
             // catch all
             .anyMessage().denyAll();
-    }<% if (authenticationType !== 'session') { %>
+    }
+<%_ if (!authenticationTypeSession) { _%>
 
     /**
      * Disables CSRF for Websockets.
@@ -49,5 +50,6 @@ public class WebsocketSecurityConfiguration extends AbstractSecurityWebSocketMes
     @Override
     protected boolean sameOriginDisabled() {
         return true;
-    }<% } %>
+    }
+<%_ } _%>
 }

package/generators/server/templates/src/main/java/package/config/apidocs/GatewaySwaggerResourcesProvider.java.ejs

@@ -56,9 +56,9 @@ public class GatewaySwaggerResourcesProvider implements SwaggerResourcesProvider
         microservices
             .stream()
             .filter(this::isNotGateway)
-            <%_ if (serviceDiscoveryType === 'consul') { _%>
+<%_ if (serviceDiscoveryConsul) { _%>
             .filter(this::isNotConsul)
-            <%_ } _%>
+<%_ } _%>
             .forEach(microservice -> swaggerResources.add(swaggerResource(microservice, getMicroserviceApiDocs(microservice))));
         return swaggerResources;
     }
@@ -75,16 +75,16 @@ public class GatewaySwaggerResourcesProvider implements SwaggerResourcesProvider
         return !name.equalsIgnoreCase(gatewayName);
     }
 
-    <%_ if (serviceDiscoveryType === 'consul') { _%>
+<%_ if (serviceDiscoveryConsul) { _%>
     private boolean isNotConsul(String name) {
         return !name.equalsIgnoreCase("consul");
     }
 
-    <%_ } _%>
+<%_ } _%>
     private String getMicroserviceApiDocs(String name) {
         return "/services/".concat(name).concat("/v3/api-docs");
     }
-    
+
     private String getMicroserviceName(Route route) {
         return route.getUri().toString().replace("lb://", "").toLowerCase();
     }

package/generators/server/templates/src/main/java/package/config/dbmigrations/InitialSetupMigration.java.ejs

@@ -44,7 +44,7 @@ public class InitialSetupMigration {
         mongoTemplate.save(adminAuthority);
         mongoTemplate.save(userAuthority);
     }
-    <%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
 
     @ChangeSet(order = "02", author = "initiator", id = "02-addUsers")
     public void addUsers(MongockTemplate mongoTemplate) {
@@ -56,9 +56,7 @@ public class InitialSetupMigration {
         <%= asEntity('User') %> adminUser = new <%= asEntity('User') %>();
         adminUser.setId("user-1");
         adminUser.setLogin("admin");
-        <%_ if (authenticationType !== 'oauth2') { _%>
         adminUser.setPassword("$2a$10$gSAhZrxMllrbgj/kkK9UceBPpChGWJA7SYIb1Mqo.n5aNLq1/oRrC");
-        <%_ } _%>
         adminUser.setFirstName("admin");
         adminUser.setLastName("Administrator");
         adminUser.setEmail("admin@localhost");
@@ -73,9 +71,7 @@ public class InitialSetupMigration {
         <%= asEntity('User') %> userUser = new <%= asEntity('User') %>();
         userUser.setId("user-2");
         userUser.setLogin("user");
-        <%_ if (authenticationType !== 'oauth2') { _%>
         userUser.setPassword("$2a$10$VEjxo0jq2YG9Rbk2HmX9S.k1uZBGYUHdUcid3g/vfiEl7lwWgOH/K");
-        <%_ } _%>
         userUser.setFirstName("");
         userUser.setLastName("User");
         userUser.setEmail("user@localhost");
@@ -86,5 +82,5 @@ public class InitialSetupMigration {
         userUser.getAuthorities().add(userAuthority);
         mongoTemplate.save(userUser);
     }
-    <%_ } _%>
+<%_ } _%>
 }