generator-jhipster 8.7.2 → 8.8.0

package/dist/generators/spring-boot/templates/README.md.jhi.spring-boot.ejs

@@ -345,7 +345,7 @@ To stop and remove the containers, run:
 docker compose -f <%- dockerServicesDir %>services.yml down
 ```
 
-[Spring Docker Compose Integration](https://docs.spring.io/spring-boot/reference/features/dev-services.html) is enable by default. It's possible to disable it in application.yml:
+[Spring Docker Compose Integration](https://docs.spring.io/spring-boot/reference/features/dev-services.html) is enabled by default. It's possible to disable it in application.yml:
 
 ```yaml
 spring:

package/dist/generators/spring-boot/templates/build.gradle.ejs

@@ -264,10 +264,15 @@ task cleanResources(type: Delete) {
     delete "build/resources"
 }
 
-<%_ if (embeddableLaunchScript) { _%>
+<%_ if ( embeddableLaunchScript || databaseTypeCouchbase ) { _%>
 
 bootJar {
+<%_ if ( databaseTypeCouchbase ) { _%>
+    loaderImplementation = org.springframework.boot.loader.tools.LoaderImplementation.CLASSIC
+<%_ } _%>
+<%_ if ( embeddableLaunchScript ) { _%>
     launchScript()
+<%_ } _%>
 }
 <%_ } _%>
 

package/dist/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs

@@ -51,59 +51,18 @@ bootRun {
 <%_ if (!skipClient) { _%>
 task webapp(type: NpmTask) {
     inputs.property('appVersion', project.version)
-    inputs.files("package-lock.json")
-        .withPropertyName('package-lock')
-        .withPathSensitivity(PathSensitivity.RELATIVE)
     inputs.files("build.gradle")
         .withPropertyName('build.gradle')
         .withPathSensitivity(PathSensitivity.RELATIVE)
-  <%_ if (clientFrameworkAngular) { _%>
-    inputs.files("angular.json")
-        .withPropertyName('angular.json')
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-    inputs.files("tsconfig.json", "tsconfig.app.json")
-        .withPropertyName("tsconfig")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-    inputs.dir("<%= CLIENT_WEBPACK_DIR %>")
-        .withPropertyName("<%= CLIENT_WEBPACK_DIR %>")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-  <%_ } _%>
-    inputs.dir("<%= clientSrcDir %>")
-        .withPropertyName("webapp-source-dir")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-  <%_ if (clientFrameworkReact) { _%>
-    inputs.files("tsconfig.json")
-        .withPropertyName("tsconfig")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-
-    def webpackDevFiles = fileTree("<%= CLIENT_WEBPACK_DIR %>")
-    webpackDevFiles.exclude("webpack.prod.js")
-    inputs.files(webpackDevFiles)
-        .withPropertyName("webpack-dir")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-  <%_ } _%>
-  <%_ if (clientFrameworkVue) { _%>
-    inputs.files("tsconfig.json", "tsconfig.app.json")
-        .withPropertyName("tsconfig")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-
-    inputs.files(".postcssrc")
-        .withPropertyName("postcssrc")
+    inputs.files(<%- javaNodeBuildPaths.filter(file => !file.endsWith('/')).map(file => `'${file}'`).join(', ') %>)
+        .withPropertyName('<%= clientFramework %>-build')
         .withPathSensitivity(PathSensitivity.RELATIVE)
-    <%_ if (microfrontend) { _%>
-
-    def webpackDevFiles = fileTree("<%= CLIENT_WEBPACK_DIR %>")
-    webpackDevFiles.exclude("webpack.prod.js")
-    inputs.files(webpackDevFiles)
-        .withPropertyName("webpack-dir")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-    <%_ } else { _%>
-
-    inputs.files("vite.config.ts")
-        .withPropertyName("vite")
+    <%_ for (const file of javaNodeBuildPaths.filter(file => file.endsWith('/'))) { _%>
+    inputs.dir("<%= file %>")
+        .withPropertyName("<%= file %>")
         .withPathSensitivity(PathSensitivity.RELATIVE)
     <%_ } _%>
-  <%_ } _%>
+
     outputs.dir("<%= clientDistDir %>")
         .withPropertyName("webapp-build-dir")
 
@@ -149,7 +108,7 @@ task integrationTest(type: Test) {
         events 'FAILED', 'SKIPPED'
         exceptionFormat "full"
     }
-    systemProperty('spring.profiles.active', 'testdev')
+    systemProperty('spring.profiles.active', 'test,testdev')
     systemProperty('java.security.egd', 'file:/dev/./urandom')
     // uncomment if the tests reports are not generated
     // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484

package/dist/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs

@@ -82,7 +82,7 @@ task integrationTest(type: Test) {
         events 'FAILED', 'SKIPPED'
         exceptionFormat "full"
     }
-    systemProperty('spring.profiles.active', 'testprod')
+    systemProperty('spring.profiles.active', 'test,testprod')
     systemProperty('java.security.egd', 'file:/dev/./urandom')
     // uncomment if the tests reports are not generated
     // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484

package/dist/generators/spring-boot/templates/package.json.ejs

@@ -31,8 +31,5 @@
   "config": {
     "default_environment": "prod"
   },
-  "scripts": {
-    "prettier:check": "prettier --check \"{,src/**/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
-    "prettier:format": "prettier --write \"{,src/**/,.blueprint/**/}*.{<%= prettierExtensions %>}\""
-  }
+  "scripts": {}
 }

package/dist/generators/spring-boot/templates/pom.xml.ejs

@@ -42,6 +42,7 @@
             Build properties
             The spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/${jhipster-dependencies.version}
         -->
+        <spring.profiles.active>dev</spring.profiles.active>
         <maven.version>3.2.5</maven.version>
         <resource.delimiter>@</resource.delimiter>
         <java.version><%= JAVA_VERSION %></java.version>
@@ -527,6 +528,9 @@
                     </executions>
                     <configuration>
                         <mainClass>${start-class}</mainClass>
+<%_ if (databaseTypeCouchbase) { _%>
+                        <loaderImplementation>CLASSIC</loaderImplementation>
+<%_ } _%>
 <%_ if (embeddableLaunchScript) { _%>
                         <executable>true</executable>
 <%_ } _%>
@@ -611,7 +615,7 @@
             <properties>
                 <!-- default Spring profiles -->
                 <spring.profiles.active>dev${profile.tls}<%_ if (databaseMigrationLiquibase) { _%>${profile.no-liquibase}<%_ } _%></spring.profiles.active>
-                <profile.test>testdev</profile.test>
+                <profile.test>test,testdev</profile.test>
             </properties>
             <dependencies>
                 <dependency>
@@ -626,7 +630,7 @@
             <properties>
                 <!-- default Spring profiles -->
                 <spring.profiles.active>prod${profile.api-docs}${profile.tls}${profile.e2e}<%_ if (databaseMigrationLiquibase) { _%>${profile.no-liquibase}<%_ } _%></spring.profiles.active>
-                <profile.test>testprod</profile.test>
+                <profile.test>test,testprod</profile.test>
             </properties>
             <build>
                 <plugins>

package/dist/generators/spring-boot/templates/settings.gradle.ejs

@@ -32,7 +32,7 @@ pluginManagement {
             mavenCentral()
         }
         dependencies {
-            classpath group: 'org.liquibase', name: 'liquibase-core', version: "${liquibaseCoreVersion}"
+            classpath group: 'org.liquibase', name: 'liquibase-core', version: "${liquibaseVersion}"
         }
     }
 <%_ } _%>

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs

@@ -203,7 +203,7 @@ public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepositor
   <%_ if (!authenticationTypeOauth2) { _%>
     <%_ if (databaseTypeCouchbase || databaseTypeMongodb || databaseTypeNeo4j) { _%>
       <%_ if (cacheProviderAny) { _%>
-    @Cacheable(cacheNames = USERS_BY_EMAIL_CACHE)
+    @Cacheable(cacheNames = USERS_BY_EMAIL_CACHE, unless="#result == null")
       <%_ } _%>
     <%_ } _%>
     <% if (databaseTypeCouchbase) { %>default <% } %><%= optionalOrMono %><<%= user.persistClass %>> findOneByEmailIgnoreCase(String email)<% if (!databaseTypeCouchbase) { %>;<% } else { %> {
@@ -219,14 +219,14 @@ public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepositor
   <%_ } _%>
   <%_ if (databaseTypeCouchbase) { _%>
     <%_ if (cacheProviderAny) { _%>
-    @Cacheable(cacheNames = USERS_BY_LOGIN_CACHE)
+    @Cacheable(cacheNames = USERS_BY_LOGIN_CACHE, unless="#result == null")
     <%_ } _%>
     default <%= optionalOrMono %><<%= user.persistClass %>> findOneByLogin(String login) {
         return findById(login);
     }
   <%_ } else if (databaseTypeMongodb || databaseTypeNeo4j) { _%>
     <%_ if (cacheProviderAny) { _%>
-    @Cacheable(cacheNames = USERS_BY_LOGIN_CACHE)
+    @Cacheable(cacheNames = USERS_BY_LOGIN_CACHE, unless="#result == null")
     <%_ } _%>
     <%= optionalOrMono %><<%= user.persistClass %>> findOneByLogin(String login);
   <%_ } else { _%>
@@ -241,14 +241,14 @@ public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepositor
   <%_ if (databaseTypeSql) { _%>
     @EntityGraph(attributePaths = "authorities")
     <%_ if (cacheProviderAny) { _%>
-    @Cacheable(cacheNames = USERS_BY_LOGIN_CACHE)
+    @Cacheable(cacheNames = USERS_BY_LOGIN_CACHE, unless="#result == null")
     <%_ } _%>
     Optional<<%= user.persistClass %>> findOneWithAuthoritiesByLogin(String login);
 
     <%_ if (!authenticationTypeOauth2) { _%>
     @EntityGraph(attributePaths = "authorities")
       <%_ if (cacheProviderAny) { _%>
-    @Cacheable(cacheNames = USERS_BY_EMAIL_CACHE)
+    @Cacheable(cacheNames = USERS_BY_EMAIL_CACHE, unless="#result == null")
       <%_ } _%>
     Optional<<%= user.persistClass %>> findOneWithAuthoritiesByEmailIgnoreCase(String email);
 
@@ -609,7 +609,7 @@ public class UserRepository {
     }
 
   <%_ if (cacheProviderAny) { _%>
-    @Cacheable(cacheNames = USERS_BY_EMAIL_CACHE)
+    @Cacheable(cacheNames = USERS_BY_EMAIL_CACHE, unless="#result == null")
   <%_ } _%>
     public <%= optionalOrMono %><<%= user.persistClass %>> findOneByEmailIgnoreCase(String email) {
         BoundStatement stmt = findOneByEmailStmt.bind().setString("email", email.toLowerCase());
@@ -617,7 +617,7 @@ public class UserRepository {
     }
 
   <%_ if (cacheProviderAny) { _%>
-    @Cacheable(cacheNames = USERS_BY_LOGIN_CACHE)
+    @Cacheable(cacheNames = USERS_BY_LOGIN_CACHE, unless="#result == null")
   <%_ } _%>
     public <%= optionalOrMono %><<%= user.persistClass %>> findOneByLogin(String login) {
         BoundStatement stmt = findOneByLoginStmt.bind().setString("login", login);

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs

@@ -54,6 +54,9 @@ import org.slf4j.LoggerFactory;
 <%_ } _%>
 <%_ if (cacheProviderAny) { _%>
 import org.springframework.cache.CacheManager;
+<%_ if (databaseTypeCouchbase) { _%>
+import org.springframework.cache.annotation.CacheEvict;
+<%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
   <%_ if (!reactive) { _%>
@@ -573,6 +576,9 @@ public class UserService {
             .map(<%= user.adminUserDto %>::new);
     }
 
+    <%_ if (databaseTypeCouchbase && cacheProviderAny) { _%>
+    @CacheEvict(cacheNames =  UserRepository.USERS_BY_LOGIN_CACHE, key = "#login")
+    <%_ } _%>
     <%_ if (reactive) { _%>
       <%_ if (databaseTypeSql) { _%>
     @Transactional
@@ -814,7 +820,7 @@ public class UserService {
      * Persistent Token are used for providing automatic authentication, they should be automatically deleted after
      * 30 days.
      * <p>
-     * This is scheduled to get fired everyday, at midnight.
+     * This is scheduled to get fired every day, at midnight.
      */
     @Scheduled(cron = "0 0 0 * * ?")
     public void removeOldPersistentTokens() {
@@ -832,7 +838,7 @@ public class UserService {
     /**
      * Not activated users should be automatically deleted after 3 days.
      * <p>
-     * This is scheduled to get fired everyday, at 01:00 (am).
+     * This is scheduled to get fired every day, at 01:00 (am).
      */
     @Scheduled(cron = "0 0 1 * * ?")
     public void removeNotActivatedUsers() {
@@ -1091,9 +1097,9 @@ public class UserService {
 <%_ if (cacheProviderAny && !databaseTypeNo) { _%>
 
     private void clearUserCaches(<%= user.persistClass %> user) {
-        Objects.requireNonNull(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE)).evict(user.getLogin());
+        Objects.requireNonNull(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE)).evictIfPresent(user.getLogin());
         if (user.getEmail() != null) {
-            Objects.requireNonNull(cacheManager.getCache(UserRepository.USERS_BY_EMAIL_CACHE)).evict(user.getEmail());
+            Objects.requireNonNull(cacheManager.getCache(UserRepository.USERS_BY_EMAIL_CACHE)).evictIfPresent(user.getEmail());
         }
     }
 <%_ } _%>

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/PublicUserResource.java.ejs

@@ -29,7 +29,9 @@ import java.util.stream.StreamSupport;
 <%_ } _%>
 <%_ if (!authenticationTypeOauth2) { _%>
 import org.springframework.data.domain.Sort;
+  <%_ if (reactive) { _%>
 import java.util.Collections;
+  <%_ } _%>
 <%_ } _%>
 import <%= packageName %>.service.UserService;
 import <%= packageName %>.service.dto.<%= user.dtoClass %>;

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/UserResource.java.ejs

@@ -24,7 +24,6 @@ import <%= packageName %>.repository.UserRepository;
 import <%= packageName %>.security.AuthoritiesConstants;
 import <%= packageName %>.service.MailService;
 import org.springframework.data.domain.Sort;
-import java.util.Collections;
 import <%= packageName %>.service.UserService;
 import <%= packageName %>.service.dto.<%= user.adminUserDto %>;
 import <%= packageName %>.web.rest.errors.BadRequestAlertException;
@@ -77,6 +76,7 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Arrays;
+import java.util.Collections;
 <%_ } else { _%>
 import java.util.*;
 <%_ } _%>

package/dist/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs

@@ -45,16 +45,9 @@ import org.springframework.security.web.SecurityFilterChain;
 <%_ if (!skipClient || authenticationUsesCsrf) { _%>
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 <%_ } _%>
-<%_ if (authenticationUsesCsrf) { _%>
-import tech.jhipster.web.filter.CookieCsrfFilter;
-<%_ } _%>
 <%_ if (!skipClient) { _%>
 import <%= packageName %>.web.filter.SpaWebFilter;
 <%_ } _%>
-<%_ if (applicationTypeGateway) { _%>
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-<%_ } _%>
 <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -117,10 +110,6 @@ import <%= packageName %>.security.oauth2.CustomClaimConverter;
 <%_ if(!skipClient) { _%>
 import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter;
 <%_ } _%>
-<%_ if (applicationTypeGateway) { _%>
-import org.springframework.security.web.server.WebFilterChainProxy;
-import org.springframework.security.web.server.firewall.ServerWebExchangeFirewall;
-<%_ } _%>
 <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
 import org.springframework.util.StringUtils;
 <%_ } _%>
@@ -183,17 +172,12 @@ public class SecurityConfiguration {
 <%_ if (!skipClient) { _%>
             .addFilterAfter(new SpaWebFilter(), BasicAuthenticationFilter.class)
 <%_ } _%>
-<%_ if (!applicationTypeMicroservice) { _%>
-  <%_ if (authenticationUsesCsrf) { _%>
-            .addFilterAfter(new CookieCsrfFilter(), BasicAuthenticationFilter.class)
-  <%_ } _%>
-<%_ } _%>
 <%_ if (!skipClient) { _%>
             .headers(headers -> headers
                 .contentSecurityPolicy(csp -> csp.policyDirectives(jHipsterProperties.getSecurity().getContentSecurityPolicy()))
                 .frameOptions(FrameOptionsConfig::sameOrigin)
                 .referrerPolicy(referrer -> referrer.policy(ReferrerPolicyHeaderWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN))
-                .permissionsPolicy(permissions ->
+                .permissionsPolicyHeader(permissions ->
                     permissions.policy("camera=(), fullscreen=(self), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=()")))
 <%_ } _%>
             .authorizeHttpRequests(authz ->
@@ -204,6 +188,9 @@ public class SecurityConfiguration {
                     .requestMatchers(mvc.pattern("/*.ico"), mvc.pattern("/*.png"), mvc.pattern("/*.svg"), mvc.pattern("/*.webapp")).permitAll()
   <%_ if (clientBundlerVite) { _%>
                     .requestMatchers(mvc.pattern("/assets/**")).permitAll()
+  <%_ } else if (clientBundlerExperimentalEsbuild) { _%>
+                    .requestMatchers(mvc.pattern("/content/**")).permitAll()
+                    .requestMatchers(mvc.pattern("/resources/**")).permitAll()
   <%_ } else { _%>
                     .requestMatchers(mvc.pattern("/app/**")).permitAll()
                     .requestMatchers(mvc.pattern("/i18n/**")).permitAll()
@@ -384,15 +371,15 @@ public class SecurityConfiguration {
 <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
 
     /**
-     * Custom CSRF handler to provide BREACH protection.
+     * Custom CSRF handler to provide BREACH protection for Single-Page Applications (SPA).
      *
      * @see <a href="https://docs.spring.io/spring-security/reference/servlet/exploits/csrf.html#csrf-integration-javascript-spa">Spring Security Documentation - Integrating with CSRF Protection</a>
      * @see <a href="https://github.com/jhipster/generator-jhipster/pull/25907">JHipster - use customized SpaCsrfTokenRequestHandler to handle CSRF token</a>
      * @see <a href="https://stackoverflow.com/q/74447118/65681">CSRF protection not working with Spring Security 6</a>
      */
-    static final class SpaCsrfTokenRequestHandler extends CsrfTokenRequestAttributeHandler {
-
-        private final CsrfTokenRequestHandler delegate = new XorCsrfTokenRequestAttributeHandler();
+    static final class SpaCsrfTokenRequestHandler implements CsrfTokenRequestHandler {
+        private final CsrfTokenRequestHandler plain = new CsrfTokenRequestAttributeHandler();
+        private final CsrfTokenRequestHandler xor = new XorCsrfTokenRequestAttributeHandler();
 
         @Override
         public void handle(HttpServletRequest request, HttpServletResponse response, Supplier<CsrfToken> csrfToken) {
@@ -400,7 +387,10 @@ public class SecurityConfiguration {
              * Always use XorCsrfTokenRequestAttributeHandler to provide BREACH protection of
              * the CsrfToken when it is rendered in the response body.
              */
-            this.delegate.handle(request, response, csrfToken);
+            this.xor.handle(request, response, csrfToken);
+
+            // Render the token value to a cookie by causing the deferred token to be loaded.
+            csrfToken.get();
         }
 
         @Override
@@ -412,7 +402,7 @@ public class SecurityConfiguration {
              * raw CsrfToken.
              */
             if (StringUtils.hasText(request.getHeader(csrfToken.getHeaderName()))) {
-                return super.resolveCsrfTokenValue(request, csrfToken);
+                return this.plain.resolveCsrfTokenValue(request, csrfToken);
             }
             /*
              * In all other cases (e.g. if the request contains a request parameter), use
@@ -420,24 +410,8 @@ public class SecurityConfiguration {
              * when a server-side rendered form includes the _csrf request parameter as a
              * hidden input.
              */
-            return this.delegate.resolveCsrfTokenValue(request, csrfToken);
+            return this.xor.resolveCsrfTokenValue(request, csrfToken);
         }
     }
 <%_ } _%>
-<%_ if (applicationTypeGateway) { _%>
-
-    // Fix for Spring Boot 3.3.5: https://github.com/spring-cloud/spring-cloud-gateway/issues/3568
-    @Bean
-    BeanPostProcessor beanPostProcessor() {
-        return new BeanPostProcessor() {
-            @Override
-            public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-                if (bean instanceof WebFilterChainProxy springSecurity) {
-                    springSecurity.setFirewall(ServerWebExchangeFirewall.INSECURE_NOOP);
-                }
-                return bean;
-            }
-        };
-    }
-<%_ } _%>
 }

package/dist/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs

@@ -39,10 +39,6 @@ import org.springframework.boot.autoconfigure.security.SecurityProperties;
 <%_ if (!skipClient) { _%>
 import <%= packageName %>.web.filter.SpaWebFilter;
 <%_ } _%>
-<%_ if (applicationTypeGateway) { _%>
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-<%_ } _%>
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 <%_ if (authenticationTypeOauth2) { _%>
@@ -118,10 +114,6 @@ import org.springframework.security.web.server.savedrequest.NoOpServerRequestCac
 <%_ } _%>
 import org.springframework.security.web.server.util.matcher.NegatedServerWebExchangeMatcher;
 import org.springframework.security.web.server.util.matcher.OrServerWebExchangeMatcher;
-<%_ if (applicationTypeGateway) { _%>
-import org.springframework.security.web.server.WebFilterChainProxy;
-import org.springframework.security.web.server.firewall.ServerWebExchangeFirewall;
-<%_ } _%>
 <%_ if (authenticationUsesCsrf) { _%>
 import reactor.core.publisher.Mono;
 <%_ } _%>
@@ -225,6 +217,9 @@ public class SecurityConfiguration {
                 pathMatchers(
   <%_ if (clientBundlerVite) { _%>
                     "/assets/**",
+  <%_ } else if (clientBundlerExperimentalEsbuild) { _%>
+                    "/content/**",
+                    "/resources/**",
   <%_ } else { _%>
                     "/app/**",
                     "/i18n/**",
@@ -490,20 +485,4 @@ public class SecurityConfiguration {
         return Mono.empty();
     }
 <%_ } _%>
-<%_ if (applicationTypeGateway) { _%>
-
-    // Fix for Spring Boot 3.3.5: https://github.com/spring-cloud/spring-cloud-gateway/issues/3568
-    @Bean
-    BeanPostProcessor beanPostProcessor() {
-        return new BeanPostProcessor() {
-            @Override
-            public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-                if (bean instanceof WebFilterChainProxy springSecurity) {
-                    springSecurity.setFirewall(ServerWebExchangeFirewall.INSECURE_NOOP);
-                }
-                return bean;
-            }
-        };
-    }
-<%_ } _%>
 }

package/dist/generators/spring-boot/templates/src/main/java/_package_/service/MailService.java.ejs

@@ -88,11 +88,11 @@ public class MailService {
     public void sendEmail(String to, String subject, String content, boolean isMultipart, boolean isHtml) {
 <%_ if (reactive) { _%>
         Mono.defer(() -> {
-            this.sendEmailSync(to, subject, content, isMultipart, isHtml);
+            sendEmailSync(to, subject, content, isMultipart, isHtml);
             return Mono.empty();
         }).subscribe();
 <%_ } else { _%>
-        this.sendEmailSync(to, subject, content, isMultipart, isHtml);
+        sendEmailSync(to, subject, content, isMultipart, isHtml);
 <%_ } _%>
     }
 
@@ -127,11 +127,11 @@ public class MailService {
     public void sendEmailFromTemplate(<%= user.persistClass %> user, String templateName, String titleKey) {
 <%_ if (reactive) { _%>
         Mono.defer(() -> {
-            this.sendEmailFromTemplateSync(user, templateName, titleKey);
+            sendEmailFromTemplateSync(user, templateName, titleKey);
             return Mono.empty();
         }).subscribe();
 <%_ } else { _%>
-        this.sendEmailFromTemplateSync(user, templateName, titleKey);
+        sendEmailFromTemplateSync(user, templateName, titleKey);
 <%_ } _%>
     }
 
@@ -146,7 +146,7 @@ public class MailService {
         context.setVariable(BASE_URL, jHipsterProperties.getMail().getBaseUrl());
         String content = templateEngine.process(templateName, context);
         String subject = messageSource.getMessage(titleKey, null, locale);
-        this.sendEmailSync(user.getEmail(), subject, content, false, true);
+        sendEmailSync(user.getEmail(), subject, content, false, true);
     }
 <%_ if (!authenticationTypeOauth2) { _%>
 
@@ -155,7 +155,7 @@ public class MailService {
 <%_ } _%>
     public void sendActivationEmail(<%= user.persistClass %> user) {
         LOG.debug("Sending activation email to '{}'", user.getEmail());
-        this.<%- localSendEmailFromTemplateApi %>(user, "mail/activationEmail", "email.activation.title");
+        <%- localSendEmailFromTemplateApi %>(user, "mail/activationEmail", "email.activation.title");
     }
 
 <%_ if (!reactive) { _%>
@@ -163,7 +163,7 @@ public class MailService {
 <%_ } _%>
     public void sendCreationEmail(<%= user.persistClass %> user) {
         LOG.debug("Sending creation email to '{}'", user.getEmail());
-        this.<%- localSendEmailFromTemplateApi %>(user, "mail/creationEmail", "email.activation.title");
+        <%- localSendEmailFromTemplateApi %>(user, "mail/creationEmail", "email.activation.title");
     }
 
 <%_ if (!reactive) { _%>
@@ -171,7 +171,7 @@ public class MailService {
 <%_ } _%>
     public void sendPasswordResetMail(<%= user.persistClass %> user) {
         LOG.debug("Sending password reset email to '{}'", user.getEmail());
-        this.<%- localSendEmailFromTemplateApi %>(user, "mail/passwordResetEmail", "email.reset.title");
+        <%- localSendEmailFromTemplateApi %>(user, "mail/passwordResetEmail", "email.reset.title");
     }
 <%_ } _%>
 }

package/dist/generators/spring-boot/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs

@@ -22,7 +22,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
-import org.springframework.security.oauth2.core.oidc.OidcIdToken;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import jakarta.servlet.http.HttpServletRequest;
@@ -44,18 +44,18 @@ public class LogoutResource {
      * {@code POST  /api/logout} : logout the current user.
      *
      * @param request the {@link HttpServletRequest}.
-     * @param idToken the ID token.
+     * @param oidcUser the OIDC user.
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and a body with a global logout URL.
      */
     @PostMapping("/api/logout")
-    public ResponseEntity<?> logout(HttpServletRequest request, @AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken) {
+    public ResponseEntity<?> logout(HttpServletRequest request, @AuthenticationPrincipal OidcUser oidcUser) {
         StringBuilder logoutUrl = new StringBuilder();
 
         logoutUrl.append(this.registration.getProviderDetails().getConfigurationMetadata().get("end_session_endpoint").toString());
 
         String originUrl = request.getHeader(HttpHeaders.ORIGIN);
 
-        logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl);
+        logoutUrl.append("?id_token_hint=").append(oidcUser.getIdToken().getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl);
 
         request.getSession().invalidate();
         return ResponseEntity.ok().body(Map.of("logoutUrl", logoutUrl.toString()));

package/dist/generators/spring-boot/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs

@@ -22,6 +22,7 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
 import org.springframework.security.oauth2.core.oidc.OidcIdToken;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.WebSession;
@@ -43,18 +44,18 @@ public class LogoutResource {
     /**
      * {@code POST  /api/logout} : logout the current user.
      *
-     * @param idToken the ID token.
+     * @param oidcUser the OIDC user.
      * @param request a {@link ServerHttpRequest} request.
      * @param session the current {@link WebSession}.
      * @return status {@code 200 (OK)} and a body with a global logout URL.
      */
     @PostMapping("/api/logout")
     public Mono<Map<String, String>> logout(
-        @AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken,
+        @AuthenticationPrincipal OidcUser oidcUser,
         ServerHttpRequest request,
         WebSession session
     ) {
-        return session.invalidate().then(this.registration.map(oidc -> prepareLogoutUri(request, oidc, idToken)));
+        return session.invalidate().then(this.registration.map(oidc -> prepareLogoutUri(request, oidc, oidcUser.getIdToken())));
     }
 
     private Map<String, String> prepareLogoutUri(ServerHttpRequest request, ClientRegistration clientRegistration, OidcIdToken idToken) {

package/dist/generators/spring-boot/templates/src/main/resources/config/application-dev.yml.ejs

@@ -302,7 +302,7 @@ jhipster:
   <%_ if (microfrontend) { _%>
     # Ports <%= devServerPort + 1 %>-<%= devServerPort + 9 %> are allowed for microfrontend development
   <%_ } _%>
-    allowed-origins: "http://localhost:8100,https://localhost:8100,http://localhost:9000,https://localhost:9000<%_ if (!skipClient) { _%>,http://localhost:<%= devServerPort %>,https://localhost:<%= devServerPort %><%_ if (microfrontend) { for (let port = 1; port < 10; port++) { _%>,http://localhost:<%= devServerPort + port %>,https://localhost:<%= devServerPort + port %><%_ } _%><%_ } } _%>"
+    allowed-origins: "http://localhost:8100,https://localhost:8100<%_ if (devServerPortProxy) { _%>,http://localhost:<%= devServerPortProxy %>,https://localhost:<%= devServerPortProxy %><%_ } _%><%_ if (!skipClient) { _%>,http://localhost:<%= devServerPort %>,https://localhost:<%= devServerPort %><%_ if (microfrontend) { for (let port = 1; port < 10; port++) { _%>,http://localhost:<%= devServerPort + port %>,https://localhost:<%= devServerPort + port %><%_ } _%><%_ } } _%>"
     # Enable CORS when running in GitHub Codespaces
     allowed-origin-patterns: 'https://*.githubpreview.dev'
     allowed-methods: "*"

package/dist/generators/spring-boot/templates/src/main/resources/config/application-tls.yml.ejs

@@ -31,7 +31,15 @@ server:
     key-store-password: password
     key-store-type: PKCS12
     key-alias: selfsigned
-    ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
+    ciphers:
+      - TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+      - TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+      - TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
+      - TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
+      - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+      - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+      - TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
+      - TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
     enabled-protocols: TLSv1.2
   http2:
     enabled: true