generator-jhipster 7.1.0 → 7.4.0

package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs

@@ -18,62 +18,53 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (databaseType === 'cassandra') { _%>
+import static <%= packageName %>.test.util.OAuth2TestUtil.TEST_USER_LOGIN;
+import static <%= packageName %>.test.util.OAuth2TestUtil.registerAuthenticationToken;
+<%_ if (!reactive) { _%>
+import static <%= packageName %>.test.util.OAuth2TestUtil.testAuthenticationToken;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+<%_ } else { _%>
+import static <%= packageName %>.test.util.OAuth2TestUtil.authenticationToken;
+import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.*;
+  <%_ if (searchEngineElasticsearch) { _%>
+import static org.mockito.Mockito.*;
+  <%_ } _%>
+<%_ } _%>
+
+<%_ if (databaseTypeCassandra) { _%>
 import <%= packageName %>.AbstractCassandraTest;
 <%_ } _%>
 import <%= packageName %>.IntegrationTest;
-import <%= packageName %>.config.TestSecurityConfiguration;
 import <%= packageName %>.security.AuthoritiesConstants;
-import <%= packageName %>.service.UserService;
 
-<%_ if (reactive) { _%>
-import org.junit.jupiter.api.BeforeEach;
-<%_ } _%>
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-<%_ if (!reactive) { _%>
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-<%_ } else { _%>
-import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
-<%_ } _%>
 import org.springframework.http.MediaType;
+import org.springframework.security.test.context.support.WithMockUser;
 <%_ if (!reactive) { _%>
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
-import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
-import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.test.context.TestSecurityContextHolder;
-import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MockMvc;
-    <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
 import org.springframework.transaction.annotation.Transactional;
-    <%_ } _%>
+  <%_ } _%>
 
-import java.util.Collection;
 <%_ } else { _%>
-import org.springframework.security.oauth2.core.oidc.OidcIdToken;
+import org.junit.jupiter.api.BeforeEach;
+import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
+import org.springframework.security.oauth2.client.ReactiveOAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.test.web.reactive.server.WebTestClient;
-    <%_ if (searchEngine === 'elasticsearch' && reactive) { _%>
+  <%_ if (searchEngineElasticsearch) { _%>
 import reactor.core.publisher.Mono;
-    <%_ } _%>
+  <%_ } _%>
 
-import java.time.Instant;
-<%_ } _%>
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-
-<%_ if (reactive && searchEngine === 'elasticsearch') { _%>
-import static org.mockito.Mockito.*;
-<%_ } _%>
-import static <%= packageName %>.web.rest.AccountResourceIT.TEST_USER_LOGIN;
-import org.springframework.security.test.context.support.WithMockUser;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-<%_ if (reactive) { _%>
-import static <%= packageName %>.web.rest.TestUtil.ID_TOKEN;
-import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.*;
 <%_ } _%>
 
 /**
@@ -86,43 +77,49 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock
 <%_ } _%>
 @WithMockUser(value = TEST_USER_LOGIN)
 @IntegrationTest
-class AccountResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCassandraTest <% } %>{
+class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+<%_ if (!reactive) { _%>
+    @Autowired
+    private MockMvc restAccountMockMvc;
 
-    static final String TEST_USER_LOGIN = "test";
+    @Autowired
+    OAuth2AuthorizedClientService authorizedClientService;
 
-    <%_ if (!reactive) { _%>
     @Autowired
-    private MockMvc restAccountMockMvc;
-    <%_ } else { _%>
-    private OidcIdToken idToken;
+    ClientRegistration clientRegistration;
+<%_ } else { _%>
+
+    private Map<String, Object> claims;
 
     @Autowired
     private WebTestClient webTestClient;
-    <%_ } _%>
 
-    <%_ if (reactive) { _%>
+    @Autowired
+    private ReactiveOAuth2AuthorizedClientService authorizedClientService;
+
+    @Autowired
+    private ClientRegistration clientRegistration;
+<%_ } _%>
+
+<%_ if (reactive) { _%>
     @BeforeEach
     public void setup() {
-        Map<String, Object> claims = new HashMap<>();
+        claims = new HashMap<>();
         claims.put("groups", Collections.singletonList(AuthoritiesConstants.ADMIN));
         claims.put("sub", "jane");
         claims.put("email", "jane.doe@jhipster.com");
-        this.idToken = new OidcIdToken(ID_TOKEN, Instant.now(),
-            Instant.now().plusSeconds(60), claims);
     }
 
-    <%_ } _%>
-    @Test<% if (databaseType === 'sql' && !reactive) { %>
-    @Transactional<% } %>
+<%_ } _%>
+    @Test
+<%_ if (databaseTypeSql && !reactive) { _%>
+    @Transactional
+<%_ } _%>
     void testGetExistingAccount() <% if (!reactive) { %>throws Exception <% } %>{
-    <%_ if (!reactive) { _%>
-        Map<String, Object> userDetails = new HashMap<>();
-        userDetails.put("sub", TEST_USER_LOGIN);
-        userDetails.put("email", "john.doe@jhipster.com");
-        Collection<GrantedAuthority> authorities = Collections.singletonList(new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN));
-        OAuth2User user = new DefaultOAuth2User(authorities, userDetails, "sub");
-        OAuth2AuthenticationToken authentication = new OAuth2AuthenticationToken(user, authorities, "oidc");
-        TestSecurityContextHolder.getContext().setAuthentication(authentication);
+<%_ if (!reactive) { _%>
+        TestSecurityContextHolder
+            .getContext()
+            .setAuthentication(registerAuthenticationToken(authorizedClientService, clientRegistration, testAuthenticationToken()));
 
         restAccountMockMvc.perform(get("/api/account")
             .accept(MediaType.APPLICATION_JSON))
@@ -131,9 +128,9 @@ class AccountResourceIT <% if (databaseType === 'cassandra') { %>extends Abstrac
             .andExpect(jsonPath("$.login").value(TEST_USER_LOGIN))
             .andExpect(jsonPath("$.email").value("john.doe@jhipster.com"))
             .andExpect(jsonPath("$.authorities").value(AuthoritiesConstants.ADMIN));
-    <%_ } else { _%>
+<%_ } else { _%>
         webTestClient
-            .mutateWith(mockAuthentication(TestUtil.authenticationToken(idToken)))
+            .mutateWith(mockAuthentication(registerAuthenticationToken(authorizedClientService, clientRegistration, authenticationToken(claims))))
             .mutateWith(csrf())
             .get().uri("/api/account")
             .accept(MediaType.APPLICATION_JSON)
@@ -144,43 +141,43 @@ class AccountResourceIT <% if (databaseType === 'cassandra') { %>extends Abstrac
             .jsonPath("$.login").isEqualTo("jane")
             .jsonPath("$.email").isEqualTo("jane.doe@jhipster.com")
             .jsonPath("$.authorities").isEqualTo(AuthoritiesConstants.ADMIN);
-    <%_ } _%>
+<%_ } _%>
     }
 
     @Test
     void testGetUnknownAccount() <% if (!reactive) { %>throws Exception <% } %>{
-    <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
         restAccountMockMvc.perform(get("/api/account")
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isInternalServerError());
-    <%_ } else { _%>
+<%_ } else { _%>
         webTestClient.get().uri("/api/account")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
             .expectStatus().is5xxServerError();
-    <%_ } _%>
+<%_ } _%>
     }
 
     @Test
     @WithUnauthenticatedMockUser
-    <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
     void testNonAuthenticatedUser() <% if (!reactive) { %>throws Exception <% } %>{
         restAccountMockMvc.perform(get("/api/authenticate")
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().string(""));
-    <%_ } else { _%>
+<%_ } else { _%>
     void testNonAuthenticatedUser() {
         webTestClient.get().uri("/api/authenticate")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
             .expectStatus().isOk()
             .expectBody().isEmpty();
-    <%_ } _%>
+<%_ } _%>
     }
 
     @Test
-    <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
     void testAuthenticatedUser() <% if (!reactive) { %>throws Exception <% } %>{
         restAccountMockMvc.perform(get("/api/authenticate")
             .with(request -> {
@@ -190,7 +187,7 @@ class AccountResourceIT <% if (databaseType === 'cassandra') { %>extends Abstrac
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().string(TEST_USER_LOGIN));
-    <%_ } else { _%>
+<%_ } else { _%>
     void testAuthenticatedUser() {
         webTestClient
             .get().uri("/api/authenticate")
@@ -198,6 +195,6 @@ class AccountResourceIT <% if (databaseType === 'cassandra') { %>extends Abstrac
             .exchange()
             .expectStatus().isOk()
             .expectBody(String.class).isEqualTo(TEST_USER_LOGIN);
-    <%_ } _%>
+<%_ } _%>
     }
 }

package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs

@@ -18,11 +18,11 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (databaseType === 'cassandra') { _%>
+<%_ if (databaseTypeCassandra) { _%>
 import <%= packageName %>.AbstractCassandraTest;
 <%_ } _%>
 import <%= packageName %>.IntegrationTest;
-<%_ if (reactive && searchEngine === 'elasticsearch') { _%>
+<%_ if (reactive && searchEngineElasticsearch) { _%>
 import <%= packageName %>.repository.search.UserSearchRepository;
 <%_ } _%>
 import <%= packageName %>.security.AuthoritiesConstants;
@@ -46,7 +46,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 <%_ } else { _%>
 import org.springframework.test.web.reactive.server.WebTestClient;
 <%_ } _%>
-<%_ if (reactive && searchEngine === 'elasticsearch') { _%>
+<%_ if (reactive && searchEngineElasticsearch) { _%>
 import reactor.core.publisher.Mono;
 
 import static org.mockito.Mockito.*;
@@ -63,32 +63,32 @@ import static <%= packageName %>.web.rest.AccountResourceIT.TEST_USER_LOGIN;
 <%_ } _%>
 @WithMockUser(value = TEST_USER_LOGIN)
 @IntegrationTest
-class AccountResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCassandraTest <% } %>{
+class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
     static final String TEST_USER_LOGIN = "test";
 
     @Autowired
-    <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
     private MockMvc restAccountMockMvc;
-    <%_ } else { _%>
+<%_ } else { _%>
     private WebTestClient accountWebTestClient;
-    <%_ } _%>
-    <%_ if (searchEngine === 'elasticsearch' && reactive) { _%>
+<%_ } _%>
+<%_ if (searchEngineElasticsearch && reactive) { _%>
 
     @Autowired
     private UserSearchRepository mockUserSearchRepository;
-    <%_ } _%>
+<%_ } _%>
 
     @Test
     @WithMockUser(username = TEST_USER_LOGIN, authorities = AuthoritiesConstants.ADMIN)
     void testGetExistingAccount() <% if (!reactive) { %>throws Exception <% } %>{
-        <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
         restAccountMockMvc.perform(get("/api/account")
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
             .andExpect(jsonPath("$.login").value(TEST_USER_LOGIN))
             .andExpect(jsonPath("$.authorities").value(AuthoritiesConstants.ADMIN));
-        <%_ } else { _%>
+<%_ } else { _%>
         accountWebTestClient.get().uri("/api/account")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
@@ -97,29 +97,29 @@ class AccountResourceIT <% if (databaseType === 'cassandra') { %>extends Abstrac
             .expectBody()
             .jsonPath("$.login").isEqualTo(TEST_USER_LOGIN)
             .jsonPath("$.authorities").isEqualTo(AuthoritiesConstants.ADMIN);
-        <%_ } _%>
+<%_ } _%>
     }
 
     @Test
     @WithUnauthenticatedMockUser
-    <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
     void testNonAuthenticatedUser() <% if (!reactive) { %>throws Exception <% } %>{
         restAccountMockMvc.perform(get("/api/authenticate")
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().string(""));
-    <%_ } else { _%>
+<%_ } else { _%>
     void testNonAuthenticatedUser() {
-        webTestClient.get().uri("/api/authenticate")
+        accountWebTestClient.get().uri("/api/authenticate")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
             .expectStatus().isOk()
             .expectBody().isEmpty();
-    <%_ } _%>
+<%_ } _%>
     }
 
     @Test
-    <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
     void testAuthenticatedUser() <% if (!reactive) { %>throws Exception <% } %>{
         restAccountMockMvc.perform(get("/api/authenticate")
             .with(request -> {
@@ -129,14 +129,14 @@ class AccountResourceIT <% if (databaseType === 'cassandra') { %>extends Abstrac
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().string(TEST_USER_LOGIN));
-    <%_ } else { _%>
+<%_ } else { _%>
     void testAuthenticatedUser() {
-        webTestClient
+        accountWebTestClient
             .get().uri("/api/authenticate")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
             .expectStatus().isOk()
             .expectBody(String.class).isEqualTo(TEST_USER_LOGIN);
-    <%_ } _%>
+<%_ } _%>
     }
 }

package/generators/server/templates/src/test/java/package/web/rest/ClientForwardControllerTest.java.ejs

@@ -70,7 +70,7 @@ class ClientForwardControllerTest {
             .andExpect(forwardedUrl("/"));
     }
 
-    <%_ if (websocket === 'spring-websocket') { _%>
+<%_ if (communicationSpringWebsocket) { _%>
     @Test
     void getWebsocketInfoEndpoint() throws Exception {
         restMockMvc.perform(get("/websocket/info"))
@@ -88,7 +88,7 @@ class ClientForwardControllerTest {
         restMockMvc.perform(get("/websocket/tracker/308/sessionId/xhr_streaming"))
             .andExpect(status().isNotFound());
     }
-    <%_ } _%>
+<%_ } _%>
 
     @RestController
     public static class TestController {

package/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT.java.ejs

@@ -36,6 +36,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.test.web.reactive.server.WebTestClient;
 <%_ } _%>
 import org.testcontainers.containers.KafkaContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
 import java.util.Collections;
@@ -55,11 +56,11 @@ class <%= upperFirstCamelCase(baseName) %>KafkaResourceIT {
     private static boolean started = false;
     private static KafkaContainer kafkaContainer;
 
-    <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
     private MockMvc restMockMvc;
-    <%_ } else { _%>
+<%_ } else { _%>
     private WebTestClient client;
-    <%_ } _%>
+<%_ } _%>
 
     @BeforeAll
     static void startServer() {
@@ -72,7 +73,7 @@ class <%= upperFirstCamelCase(baseName) %>KafkaResourceIT {
     private static void startTestcontainer() {
         // TODO: withNetwork will need to be removed soon
         // See discussion at https://github.com/jhipster/generator-jhipster/issues/11544#issuecomment-609065206
-        kafkaContainer = new KafkaContainer("<%= KAFKA_VERSION %>").withNetwork(null);
+        kafkaContainer = new KafkaContainer(DockerImageName.parse("<%= DOCKER_KAFKA %>")).withNetwork(null);
         kafkaContainer.start();
     }
 
@@ -88,25 +89,25 @@ class <%= upperFirstCamelCase(baseName) %>KafkaResourceIT {
 
         <%= upperFirstCamelCase(baseName) %>KafkaResource kafkaResource = new <%= upperFirstCamelCase(baseName) %>KafkaResource(kafkaProperties);
 
-        <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
         restMockMvc = MockMvcBuilders.standaloneSetup(kafkaResource).build();
-        <%_ } else { _%>
+<%_ } else { _%>
         client = WebTestClient.bindToController(kafkaResource).build();
-        <%_ } _%>
+<%_ } _%>
     }
 
     @Test
     void producesMessages()<% if (!reactive) { %> throws Exception<% } %> {
-        <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
         restMockMvc.perform(post("/api/<%= dasherizedBaseName %>-kafka/publish/topic-produce?message=value-produce"))
             .andExpect(status().isOk())
             .andExpect(content().contentType(MediaType.APPLICATION_JSON));
-        <%_ } else { _%>
+<%_ } else { _%>
         client.post().uri("/api/<%= dasherizedBaseName %>-kafka/publish/topic-produce?message=value-produce")
             .exchange()
             .expectStatus().isOk()
             .expectHeader().contentType(MediaType.APPLICATION_JSON);
-        <%_ } _%>
+<%_ } _%>
 
         Map<String, Object> consumerProps = new HashMap<>(getConsumerProps("group-produce"));
         KafkaConsumer<String, String> consumer = new KafkaConsumer<>(consumerProps);
@@ -125,7 +126,7 @@ class <%= upperFirstCamelCase(baseName) %>KafkaResourceIT {
 
         producer.send(new ProducerRecord<>("topic-consume", "value-consume"));
 
-        <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
         MvcResult mvcResult = restMockMvc.perform(get("/api/<%= dasherizedBaseName %>-kafka/consume?topic=topic-consume"))
             .andExpect(status().isOk())
             .andExpect(request().asyncStarted())
@@ -139,7 +140,7 @@ class <%= upperFirstCamelCase(baseName) %>KafkaResourceIT {
             }
         }
         fail("Expected content data:value-consume not received");
-        <%_ } else { _%>
+<%_ } else { _%>
         String value = client.get().uri("/api/<%= dasherizedBaseName %>-kafka/consume?topic=topic-consume")
             .accept(MediaType.TEXT_EVENT_STREAM)
             .exchange()
@@ -149,7 +150,7 @@ class <%= upperFirstCamelCase(baseName) %>KafkaResourceIT {
             .getResponseBody().blockFirst(Duration.ofSeconds(10));
 
         assertThat(value).isEqualTo("value-consume");
-        <%_ } _%>
+<%_ } _%>
     }
 
     private Map<String, String> getProducerProps() {
@@ -170,4 +171,3 @@ class <%= upperFirstCamelCase(baseName) %>KafkaResourceIT {
         return consumerProps;
     }
 }
-

package/generators/server/templates/src/test/java/package/web/rest/LogoutResourceIT.java.ejs

@@ -16,44 +16,44 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+<%_ const reactivePrefix = reactive ? 'Reactive' : ''; _%>
 package <%= packageName %>.web.rest;
 
+import static <%= packageName %>.test.util.OAuth2TestUtil.ID_TOKEN;
+import static <%= packageName %>.test.util.OAuth2TestUtil.authenticationToken;
+import static <%= packageName %>.test.util.OAuth2TestUtil.registerAuthenticationToken;
+<%_ if (!reactive) { _%>
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+<%_ } else { _%>
+import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.*;
+<%_ } _%>
+
 import <%= packageName %>.IntegrationTest;
 import <%= packageName %>.security.AuthoritiesConstants;
-import <%= packageName %>.config.TestSecurityConfiguration;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-<%_ if (reactive) { _%>
-import org.springframework.context.ApplicationContext;
-<%_ } _%>
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
-import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.client.<% if (reactive) { %>Reactive<% } %>OAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.oauth2.client.registration.<% if (reactive) { %>Reactive<% } %>ClientRegistrationRepository;
-import org.springframework.security.oauth2.core.oidc.OidcIdToken;
 <%_ if (!reactive) { _%>
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 <%_ } else { _%>
+import org.springframework.context.ApplicationContext;
 import org.springframework.test.web.reactive.server.WebTestClient;
 <%_ } _%>
 
-import java.time.Instant;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import static <%= packageName %>.web.rest.TestUtil.ID_TOKEN;
-import static <%= packageName %>.web.rest.TestUtil.authenticationToken;
-<%_ if (!reactive) { _%>
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-<%_ } else { _%>
-import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.*;
-<%_ } _%>
-
 /**
  * Integration tests for the {@link LogoutResource} REST controller.
  */
@@ -66,58 +66,65 @@ class LogoutResourceIT {
     @Autowired
     private <% if (!reactive) { %>Web<% } %>ApplicationContext context;
 
+    @Autowired
+    private <%= reactivePrefix %>OAuth2AuthorizedClientService authorizedClientService;
+
+    @Autowired
+    private ClientRegistration clientRegistration;
+
 <%_ if (!reactive) { _%>
     private MockMvc restLogoutMockMvc;
 <%_ } else { _%>
     private WebTestClient webTestClient;
 <%_ } _%>
 
-    private OidcIdToken idToken;
+    private Map<String, Object> claims;
 
     @BeforeEach
     public void before() <% if (!reactive) { %>throws Exception <% } %>{
-        Map<String, Object> claims = new HashMap<>();
+        claims = new HashMap<>();
         claims.put("groups", Collections.singletonList(AuthoritiesConstants.USER));
         claims.put("sub", 123);
-        this.idToken = new OidcIdToken(ID_TOKEN, Instant.now(), Instant.now().plusSeconds(60), claims);
 
-    <%_ if (!reactive) { _%>
-        SecurityContextHolder.getContext().setAuthentication(authenticationToken(idToken));
+<%_ if (!reactive) { _%>
+        SecurityContextHolder
+            .getContext()
+            .setAuthentication(registerAuthenticationToken(authorizedClientService, clientRegistration, authenticationToken(claims)));
         SecurityContextHolderAwareRequestFilter authInjector = new SecurityContextHolderAwareRequestFilter();
         authInjector.afterPropertiesSet();
 
         this.restLogoutMockMvc = MockMvcBuilders.webAppContextSetup(this.context).build();
-    <%_ } else { _%>
+<%_ } else { _%>
         this.webTestClient = WebTestClient.bindToApplicationContext(this.context)
             .apply(springSecurity())
             .configureClient()
             .build();
-    <%_ } _%>
+<%_ } _%>
     }
 
     @Test
     void getLogoutInformation() <% if (!reactive) { %>throws Exception <% } %>{
-    <%_ if (!reactive) { _%>
+        final String ORIGIN_URL = "http://localhost:8080";
+<%_ if (!reactive) { _%>
         String logoutUrl = this.registrations.findByRegistrationId("oidc").getProviderDetails()
             .getConfigurationMetadata().get("end_session_endpoint").toString();
-        restLogoutMockMvc.perform(post("/api/logout"))
+        logoutUrl = logoutUrl + "?id_token_hint=" + ID_TOKEN + "&post_logout_redirect_uri=" + ORIGIN_URL;
+        restLogoutMockMvc.perform(post("http://localhost:8080/api/logout").header(HttpHeaders.ORIGIN, ORIGIN_URL))
             .andExpect(status().isOk())
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
-            .andExpect(jsonPath("$.logoutUrl").value(logoutUrl))
-            .andExpect(jsonPath("$.idToken").value(ID_TOKEN));
-    <%_ } else { _%>
+            .andExpect(jsonPath("$.logoutUrl").value(logoutUrl));
+<%_ } else { _%>
         String logoutUrl = this.registrations.findByRegistrationId("oidc")
             .map(oidc -> oidc.getProviderDetails().getConfigurationMetadata()
                 .get("end_session_endpoint").toString()).block();
-
+        logoutUrl = logoutUrl + "?id_token_hint=" + ID_TOKEN + "&post_logout_redirect_uri=" + ORIGIN_URL;
         this.webTestClient.mutateWith(csrf())
-            .mutateWith(mockAuthentication(TestUtil.authenticationToken(idToken)))
-            .post().uri("/api/logout").exchange()
+            .mutateWith(mockAuthentication(registerAuthenticationToken(authorizedClientService, clientRegistration, authenticationToken(claims))))
+            .post().uri("http://localhost:8080/api/logout").header(HttpHeaders.ORIGIN, ORIGIN_URL).exchange()
             .expectStatus().isOk()
             .expectHeader().contentType(MediaType.APPLICATION_JSON_VALUE)
             .expectBody()
-            .jsonPath("$.logoutUrl").isEqualTo(logoutUrl.toString())
-            .jsonPath("$.idToken").isEqualTo(ID_TOKEN);
-    <%_ } _%>
+            .jsonPath("$.logoutUrl").isEqualTo(logoutUrl);
+<%_ } _%>
     }
 }