generator-jhipster 7.1.0 → 7.4.0

package/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs

@@ -18,13 +18,12 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (authenticationType === 'oauth2') { _%>
-    <%_ if (reactive) { _%>
+<%_ if (authenticationTypeOauth2) { _%>
+  <%_ if (reactive) { _%>
 import <%= packageName %>.security.SecurityUtils;
-    <%_ } _%>
+  <%_ } _%>
 import <%= packageName %>.service.UserService;
 import <%= packageName %>.service.dto.<%= asDto('AdminUser') %>;
-import <%= packageName %>.service.dto.<%= asDto('User') %>;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -89,42 +88,43 @@ public class AccountResource {
      * @return the login if the user is authenticated.
      */
     @GetMapping("/authenticate")
-    <%_ if (reactive) { _%>
+<%_ if (reactive) { _%>
     public Mono<String> isAuthenticated(ServerWebExchange request) {
         log.debug("REST request to check if the current user is authenticated");
         return request.getPrincipal().map(Principal::getName);
-    <%_ } else { _%>
+<%_ } else { _%>
     public String isAuthenticated(HttpServletRequest request) {
         log.debug("REST request to check if the current user is authenticated");
         return request.getRemoteUser();
-    <%_ } _%>
+<%_ } _%>
     }
 }
-<%_ } else if (skipUserManagement) { // not oauth, skipUserManagement _%>
-<%_ if (!reactive) { _%>
+<%_ } else if (skipUserManagement) { /* not oauth, skipUserManagement */ _%>
+  <%_ if (!reactive) { _%>
 import <%= packageName %>.security.SecurityUtils;
 
-<%_ } _%>
+  <%_ } _%>
 import com.fasterxml.jackson.annotation.JsonCreator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.GrantedAuthority;
-<%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
 import org.springframework.security.core.context.SecurityContextHolder;
-<%_ } else { _%>
+  <%_ } else { _%>
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.userdetails.UserDetails;
-<%_ } _%>
+  <%_ } _%>
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-<%_ if (reactive) { _%>
+  <%_ if (reactive) { _%>
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
-<%_ } else { _%>
+import java.security.Principal;
+  <%_ } else { _%>
 import javax.servlet.http.HttpServletRequest;
-<%_ } _%>
+  <%_ } _%>
 
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -145,7 +145,7 @@ public class AccountResource {
      * @throws AccountResourceException {@code 500 (Internal Server Error)} if the user couldn't be returned.
      */
     @GetMapping("/account")
-    <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
     public UserVM getAccount() {
         String login = SecurityUtils.getCurrentUserLogin()
             .orElseThrow(AccountResourceException::new);
@@ -153,7 +153,7 @@ public class AccountResource {
             .map(GrantedAuthority::getAuthority)
             .collect(Collectors.toSet());
         return new UserVM(login, authorities);
-    <%_ } else { _%>
+  <%_ } else { _%>
     public Mono<UserVM> getAccount() {
         return ReactiveSecurityContextHolder.getContext()
             .map(SecurityContext::getAuthentication)
@@ -172,7 +172,7 @@ public class AccountResource {
                 return new UserVM(login, authorities);
             })
             .switchIfEmpty(Mono.error(new AccountResourceException()));
-    <%_ } _%>
+  <%_ } _%>
     }
 
     /**
@@ -182,15 +182,15 @@ public class AccountResource {
      * @return the login if the user is authenticated.
      */
     @GetMapping("/authenticate")
-    <%_ if (reactive) { _%>
+  <%_ if (reactive) { _%>
     public Mono<String> isAuthenticated(ServerWebExchange request) {
         log.debug("REST request to check if the current user is authenticated");
         return request.getPrincipal().map(Principal::getName);
-    <%_ } else { _%>
+  <%_ } else { _%>
     public String isAuthenticated(HttpServletRequest request) {
         log.debug("REST request to check if the current user is authenticated");
         return request.getRemoteUser();
-    <%_ } _%>
+  <%_ } _%>
     }
 
     private static class UserVM {
@@ -216,21 +216,20 @@ public class AccountResource {
         }
     }
 }
-<%_ } else {  // not oauth, not skipUserManagement _%>
-<%_ if (authenticationType === 'session' && !reactive) { _%>
+<%_ } else {  /* not oauth, not skipUserManagement */ _%>
+  <%_ if (authenticationTypeSession && !reactive) { _%>
 import <%= packageName %>.domain.PersistentToken;
 import <%= packageName %>.repository.PersistentTokenRepository;
-<%_ } _%>
-<%_ if (!reactive) { _%>
+  <%_ } _%>
+  <%_ if (!reactive) { _%>
 import <%= packageName %>.domain.<%= asEntity('User') %>;
-<%_ } _%>
+  <%_ } _%>
 import <%= packageName %>.repository.UserRepository;
 import <%= packageName %>.security.SecurityUtils;
 import <%= packageName %>.service.MailService;
 import <%= packageName %>.service.UserService;
 import <%= packageName %>.service.dto.PasswordChangeDTO;
 import <%= packageName %>.service.dto.<%= asDto('AdminUser') %>;
-import <%= packageName %>.service.dto.<%= asDto('User') %>;
 import <%= packageName %>.web.rest.errors.*;
 import <%= packageName %>.web.rest.vm.KeyAndPasswordVM;
 import <%= packageName %>.web.rest.vm.ManagedUserVM;
@@ -240,26 +239,26 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
-<%_ if (reactive) { _%>
+  <%_ if (reactive) { _%>
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
-<%_ } _%>
+  <%_ } _%>
 
-<%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
 import javax.servlet.http.HttpServletRequest;
-<%_ } _%>
+  <%_ } _%>
 import javax.validation.Valid;
-<%_ if (authenticationType === 'session' && !reactive) { _%>
-import java.io.UnsupportedEncodingException;
+  <%_ if (authenticationTypeSession && !reactive) { _%>
+import java.nio.charset.StandardCharsets;
 import java.net.URLDecoder;
-<%_ } _%>
-<%_ if (reactive) { _%>
+  <%_ } _%>
+  <%_ if (reactive) { _%>
 import java.security.Principal;
 import java.util.Objects;
-<%_ } _%>
-<%_ if (!reactive) { _%>
+  <%_ } _%>
+  <%_ if (!reactive) { _%>
 import java.util.*;
-<%_ } _%>
+  <%_ } _%>
 
 /**
  * REST controller for managing the current user's account.
@@ -281,19 +280,19 @@ public class AccountResource {
     private final UserService userService;
 
     private final MailService mailService;
-    <%_ if (authenticationType === 'session' && !reactive) { _%>
+  <%_ if (authenticationTypeSession && !reactive) { _%>
 
     private final PersistentTokenRepository persistentTokenRepository;
-    <%_ } _%>
+  <%_ } _%>
 
-    public AccountResource(UserRepository userRepository, UserService userService, MailService mailService<% if (authenticationType === 'session' && !reactive) { %>, PersistentTokenRepository persistentTokenRepository<% } %>) {
+    public AccountResource(UserRepository userRepository, UserService userService, MailService mailService<% if (authenticationTypeSession && !reactive) { %>, PersistentTokenRepository persistentTokenRepository<% } %>) {
 
         this.userRepository = userRepository;
         this.userService = userService;
         this.mailService = mailService;
-        <%_ if (authenticationType === 'session' && !reactive) { _%>
+  <%_ if (authenticationTypeSession && !reactive) { _%>
         this.persistentTokenRepository = persistentTokenRepository;
-        <%_ } _%>
+  <%_ } _%>
     }
 
     /**
@@ -310,14 +309,14 @@ public class AccountResource {
         if (isPasswordLengthInvalid(managedUserVM.getPassword())) {
             throw new InvalidPasswordException();
         }
-        <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
         <%= asEntity('User') %> user = userService.registerUser(managedUserVM, managedUserVM.getPassword());
         mailService.sendActivationEmail(user);
-        <%_ } else { _%>
+  <%_ } else { _%>
         return userService.registerUser(managedUserVM, managedUserVM.getPassword())
             .doOnSuccess(mailService::sendActivationEmail)
             .then();
-        <%_ } _%>
+  <%_ } _%>
     }
 
     /**
@@ -328,16 +327,16 @@ public class AccountResource {
      */
     @GetMapping("/activate")
     public <% if (reactive) { %>Mono<Void><% } else { %>void<% } %> activateAccount(@RequestParam(value = "key") String key) {
-        <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
         Optional<<%= asEntity('User') %>> user = userService.activateRegistration(key);
         if (!user.isPresent()) {
             throw new AccountResourceException("No user was found for this activation key");
         }
-        <%_ } else { _%>
+  <%_ } else { _%>
         return userService.activateRegistration(key)
             .switchIfEmpty(Mono.error(new AccountResourceException("No user was found for this activation key")))
             .then();
-        <%_ } _%>
+  <%_ } _%>
     }
 
     /**
@@ -347,15 +346,15 @@ public class AccountResource {
      * @return the login if the user is authenticated.
      */
     @GetMapping("/authenticate")
-    <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
     public String isAuthenticated(HttpServletRequest request) {
         log.debug("REST request to check if the current user is authenticated");
         return request.getRemoteUser();
-    <%_ } else { _%>
+  <%_ } else { _%>
     public Mono<String> isAuthenticated(ServerWebExchange request) {
         log.debug("REST request to check if the current user is authenticated");
         return request.getPrincipal().map(Principal::getName);
-    <%_ } _%>
+  <%_ } _%>
     }
 
     /**
@@ -368,11 +367,11 @@ public class AccountResource {
     public <% if (reactive) { %>Mono<<%= asDto('AdminUser') %>><% } else { %><%= asDto('AdminUser') %><% } %> getAccount() {
         return userService.getUserWithAuthorities()
             .map(<%= asDto('AdminUser') %>::new)
-            <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
             .orElseThrow(() -> new AccountResourceException("User could not be found"));
-            <%_ } else { _%>
+  <%_ } else { _%>
             .switchIfEmpty(Mono.error(new AccountResourceException("User could not be found")));
-            <%_ } _%>
+  <%_ } _%>
     }
 
     /**
@@ -383,7 +382,7 @@ public class AccountResource {
      * @throws RuntimeException {@code 500 (Internal Server Error)} if the user login wasn't found.
      */
     @PostMapping("/account")
-    <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
     public void saveAccount(@Valid @RequestBody <%= asDto('AdminUser') %> userDTO) {
         String userLogin = SecurityUtils.getCurrentUserLogin().orElseThrow(() -> new AccountResourceException("Current user login not found"));
         Optional<<%= asEntity('User') %>> existingUser = userRepository.findOneByEmailIgnoreCase(userDTO.getEmail());
@@ -395,8 +394,8 @@ public class AccountResource {
             throw new AccountResourceException("User could not be found");
         }
         userService.updateUser(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(),
-            userDTO.getLangKey()<% if (['sql', 'mongodb', 'couchbase', 'neo4j'].includes(databaseType)) { %>, userDTO.getImageUrl()<% } %>);
-    <%_ } else { _%>
+            userDTO.getLangKey()<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { %>, userDTO.getImageUrl()<% } %>);
+  <%_ } else { _%>
     public Mono<Void> saveAccount(@Valid @RequestBody <%= asDto('AdminUser') %> userDTO) {
         return SecurityUtils.getCurrentUserLogin()
             .switchIfEmpty(Mono.error(new AccountResourceException("Current user login not found")))
@@ -411,8 +410,8 @@ public class AccountResource {
                 }))
                 .switchIfEmpty(Mono.error(new AccountResourceException("User could not be found")))
                 .flatMap(user -> userService.updateUser(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(),
-                    userDTO.getLangKey()<% if (['sql', 'mongodb', 'couchbase', 'neo4j'].includes(databaseType)) { %>, userDTO.getImageUrl()<% } %>));
-    <%_ } _%>
+                    userDTO.getLangKey()<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { %>, userDTO.getImageUrl()<% } %>));
+  <%_ } _%>
     }
 
     /**
@@ -427,7 +426,8 @@ public class AccountResource {
             throw new InvalidPasswordException();
         }
         <% if (reactive) { %>return <% } %>userService.changePassword(passwordChangeDto.getCurrentPassword(), passwordChangeDto.getNewPassword());
-    }<% if (authenticationType === 'session' && !reactive) { %>
+    }
+  <%_ if (authenticationTypeSession && !reactive) { _%>
 
     /**
      * {@code GET  /account/sessions} : get the current open sessions.
@@ -458,24 +458,25 @@ public class AccountResource {
      *   cookie.
      *
      * @param series the series of an existing session.
-     * @throws UnsupportedEncodingException if the series couldn't be URL decoded.
+     * @throws IllegalArgumentException if the series couldn't be URL decoded.
      */
     @DeleteMapping("/account/sessions/{series}")
-    public void invalidateSession(@PathVariable String series) throws UnsupportedEncodingException {
-        String decodedSeries = URLDecoder.decode(series, "UTF-8");
+    public void invalidateSession(@PathVariable String series) {
+        String decodedSeries = URLDecoder.decode(series, StandardCharsets.UTF_8);
         SecurityUtils.getCurrentUserLogin()
             .flatMap(userRepository::findOneByLogin)
             .ifPresent(u ->
                 persistentTokenRepository.findByUser(u).stream()
                     .filter(persistentToken -> StringUtils.equals(persistentToken.getSeries(), decodedSeries))
-                    <%_ if (databaseType === 'sql' || databaseType === 'mongodb') { _%>
+    <%_ if (databaseTypeSql || databaseTypeMongodb) { _%>
                     .findAny().ifPresent(t -> persistentTokenRepository.deleteById(decodedSeries)));
-                    <%_ } else if (databaseType === 'couchbase') { _%>
+    <%_ } else if (databaseTypeCouchbase) { _%>
                     .findAny().ifPresent(t -> persistentTokenRepository.deleteBySeries(decodedSeries)));
-                    <%_ } else { _%>
+    <%_ } else { _%>
                     .findAny().ifPresent(persistentTokenRepository::delete));
-                    <%_ } _%>
-    }<% } %>
+    <%_ } _%>
+    }
+  <%_ } _%>
 
     /**
      * {@code POST   /account/reset-password/init} : Send an email to reset the password of the user.
@@ -483,7 +484,7 @@ public class AccountResource {
      * @param mail the mail of the user.
      */
     @PostMapping(path = "/account/reset-password/init")
-    <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
     public void requestPasswordReset(@RequestBody String mail) {
         Optional<<%= asEntity('User') %>> user = userService.requestPasswordReset(mail);
         if (user.isPresent()) {
@@ -493,7 +494,7 @@ public class AccountResource {
             // but log that an invalid attempt has been made
             log.warn("Password reset requested for non existing mail");
         }
-    <%_ } else { _%>
+  <%_ } else { _%>
     public Mono<Void> requestPasswordReset(@RequestBody String mail) {
         return userService.requestPasswordReset(mail)
             .doOnSuccess(user -> {
@@ -506,7 +507,7 @@ public class AccountResource {
                 }
             })
             .then();
-    <%_ } _%>
+  <%_ } _%>
     }
 
     /**
@@ -521,18 +522,18 @@ public class AccountResource {
         if (isPasswordLengthInvalid(keyAndPassword.getNewPassword())) {
             throw new InvalidPasswordException();
         }
-        <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
         Optional<<%= asEntity('User') %>> user =
             userService.completePasswordReset(keyAndPassword.getNewPassword(), keyAndPassword.getKey());
 
         if (!user.isPresent()) {
             throw new AccountResourceException("No user was found for this reset key");
         }
-        <%_ } else { _%>
+  <%_ } else { _%>
         return userService.completePasswordReset(keyAndPassword.getNewPassword(), keyAndPassword.getKey())
             .switchIfEmpty(Mono.error(new AccountResourceException("No user was found for this reset key")))
             .then();
-        <%_ } _%>
+  <%_ } _%>
     }
 
     private static boolean isPasswordLengthInvalid(String password) {

package/generators/server/templates/src/main/java/package/web/rest/ClientForwardController.java.ejs

@@ -28,11 +28,11 @@ public class ClientForwardController {
      * Forwards any unmapped paths (except those containing a period) to the client {@code index.html}.
      * @return forward to client {@code index.html}.
      */
-    <%_ if (websocket === 'spring-websocket') { _%>
+<%_ if (communicationSpringWebsocket) { _%>
     @GetMapping(value = {"/{path:[^\\.]*}", "/{path:^(?!websocket).*}/**/{path:[^\\.]*}"})
-    <%_ } else { _%>
+<%_ } else { _%>
     @GetMapping(value = "/**/{path:[^\\.]*}")
-    <%_ } _%>
+<%_ } _%>
     public String forward() {
         return "forward:/";
     }

package/generators/server/templates/src/main/java/package/web/rest/KafkaResource.java.ejs

@@ -63,35 +63,35 @@ public class <%= upperFirstCamelCase(baseName) %>KafkaResource {
     private final Logger log = LoggerFactory.getLogger(<%= upperFirstCamelCase(baseName) %>KafkaResource.class);
 
     private final KafkaProperties kafkaProperties;
-    <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
     private KafkaProducer<String, String> producer;
     private ExecutorService sseExecutorService = Executors.newCachedThreadPool();
-    <%_ } else { _%>
+<%_ } else { _%>
     private KafkaSender<String, String> sender;
-    <%_ }  _%>
+<%_ }  _%>
 
     public <%= upperFirstCamelCase(baseName) %>KafkaResource(KafkaProperties kafkaProperties) {
         this.kafkaProperties = kafkaProperties;
-        <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
         this.producer = new KafkaProducer<>(kafkaProperties.getProducerProps());
-        <%_ } else { _%>
+<%_ } else { _%>
         this.sender = KafkaSender.create(SenderOptions.create(kafkaProperties.getProducerProps()));
-        <%_ }  _%>
+<%_ }  _%>
     }
 
     @PostMapping("/publish/{topic}")
     public <% if (!reactive) { %>PublishResult<% } else { %>Mono<PublishResult><% }  %> publish(@PathVariable String topic, @RequestParam String message, @RequestParam(required = false) String key)<% if (!reactive) { %> throws ExecutionException, InterruptedException<% } %> {
         log.debug("REST request to send to Kafka topic {} with key {} the message : {}", topic, key, message);
-        <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
         RecordMetadata metadata = producer.send(new ProducerRecord<>(topic, key, message)).get();
         return new PublishResult(metadata.topic(), metadata.partition(), metadata.offset(), Instant.ofEpochMilli(metadata.timestamp()));
-        <%_ } else { _%>
+<%_ } else { _%>
         return Mono.just(SenderRecord.create(topic, null, null, key, message, null))
             .as(sender::send)
             .next()
             .map(SenderResult::recordMetadata)
             .map(metadata -> new PublishResult(metadata.topic(), metadata.partition(), metadata.offset(), Instant.ofEpochMilli(metadata.timestamp())));
-        <%_ }  _%>
+<%_ }  _%>
     }
 
     @GetMapping("/consume")
@@ -101,7 +101,7 @@ public class <%= upperFirstCamelCase(baseName) %>KafkaResource {
         consumerProps.putAll(consumerParams);
         consumerProps.remove("topic");
 
-        <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
         SseEmitter emitter = new SseEmitter(0L);
         sseExecutorService.execute(() -> {
             KafkaConsumer<String, String> consumer = new KafkaConsumer<>(consumerProps);
@@ -125,13 +125,13 @@ public class <%= upperFirstCamelCase(baseName) %>KafkaResource {
             emitter.complete();
         });
         return emitter;
-        <%_ } else { _%>
+<%_ } else { _%>
         ReceiverOptions<String, String> receiverOptions = ReceiverOptions.<String, String>create(consumerProps)
             .subscription(topics);
         return KafkaReceiver.create(receiverOptions)
             .receive()
             .map(ConsumerRecord::value);
-        <%_ }  _%>
+<%_ }  _%>
     }
 
     private static class PublishResult {

package/generators/server/templates/src/main/java/package/web/rest/LogoutResource.java.ejs

@@ -27,11 +27,12 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 <%_ if (!reactive) { _%>
 import javax.servlet.http.HttpServletRequest;
+import org.springframework.http.HttpHeaders;
 <%_ } else { _%>
 import org.springframework.web.server.WebSession;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import reactor.core.publisher.Mono;
 <%_ } _%>
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -48,39 +49,74 @@ public class LogoutResource {
     /**
      * {@code POST  /api/logout} : logout the current user.
      *
-    <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
      * @param request the {@link HttpServletRequest}.
-    <%_ } _%>
+<%_ } _%>
      * @param idToken the ID token.
-    <%_ if (reactive) { _%>
+<%_ if (reactive) { _%>
+     * @param request a {@link ServerHttpRequest} request.
      * @param session the current {@link WebSession}.
-    <%_ } _%>
-     * @return the {@link ResponseEntity} with status {@code 200 (OK)} and a body with a global logout URL and ID token.
+<%_ } _%>
+     * @return the {@link ResponseEntity} with status {@code 200 (OK)} and a body with a global logout URL.
      */
     @PostMapping("/api/logout")
 <%_ if (!reactive) { _%>
     public ResponseEntity<?> logout(HttpServletRequest request,
                                     @AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken) {
-        String logoutUrl = this.registration.getProviderDetails()
-            .getConfigurationMetadata().get("end_session_endpoint").toString();
+        StringBuilder logoutUrl = new StringBuilder();
+
+        String issuerUri = this.registration.getProviderDetails().getIssuerUri();
+        if (issuerUri.contains("auth0.com")) {
+            logoutUrl.append(issuerUri.endsWith("/") ? issuerUri + "v2/logout" : issuerUri + "/v2/logout");
+        } else {
+            logoutUrl.append(this.registration.getProviderDetails().getConfigurationMetadata().get("end_session_endpoint").toString());
+        }
+
+        String originUrl = request.getHeader(HttpHeaders.ORIGIN);
+
+        if (logoutUrl.indexOf("/protocol") > -1) {
+            logoutUrl.append("?redirect_uri=").append(originUrl);
+        } else if (logoutUrl.indexOf("auth0.com") > -1) {
+            // Auth0
+            logoutUrl.append("?client_id=").append(this.registration.getClientId()).append("&returnTo=").append(originUrl);
+        } else {
+            // Okta
+            logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl);
+        }
 
-        Map<String, String> logoutDetails = new HashMap<>();
-        logoutDetails.put("logoutUrl", logoutUrl);
-        logoutDetails.put("idToken", idToken.getTokenValue());
         request.getSession().invalidate();
-        return ResponseEntity.ok().body(logoutDetails);
+        return ResponseEntity.ok().body(Map.of("logoutUrl", logoutUrl.toString()));
     }
 <%_ } else { _%>
-    public Mono<Map<String, String>> logout(@AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken, WebSession session) {
-        return session.invalidate().then(
-            this.registration.map(oidc -> oidc.getProviderDetails().getConfigurationMetadata().get("end_session_endpoint").toString())
-                .map(logoutUrl -> {
-                    Map<String, String> logoutDetails = new HashMap<>();
-                    logoutDetails.put("logoutUrl", logoutUrl);
-                    logoutDetails.put("idToken", idToken.getTokenValue());
-                    return logoutDetails;
-                })
-        );
+    public Mono<Map<String, String>> logout(@AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken, ServerHttpRequest request, WebSession session) {
+        return session
+            .invalidate()
+            .then(
+                this.registration.map(oidc -> prepareLogoutUri(request, oidc, idToken))
+            );
     }
+
+    private Map<String, String> prepareLogoutUri(ServerHttpRequest request, ClientRegistration clientRegistration, OidcIdToken idToken) {
+        StringBuilder logoutUrl = new StringBuilder();
+        String issuerUri = clientRegistration.getProviderDetails().getIssuerUri();
+        if (issuerUri.contains("auth0.com")) {
+            logoutUrl.append(issuerUri.endsWith("/") ? issuerUri + "v2/logout" : issuerUri + "/v2/logout");
+        } else {
+            logoutUrl.append(clientRegistration.getProviderDetails().getConfigurationMetadata().get("end_session_endpoint").toString());
+        }
+
+        String originUrl = request.getHeaders().getOrigin();
+        if (logoutUrl.indexOf("/protocol") > -1) {
+            logoutUrl.append("?redirect_uri=").append(originUrl);
+        } else if (logoutUrl.indexOf("auth0.com") > -1) {
+            // Auth0
+            logoutUrl.append("?client_id=").append(clientRegistration.getClientId()).append("&returnTo=").append(originUrl);
+        } else {
+            // Okta
+            logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl);
+        }
+        return Map.of("logoutUrl", logoutUrl.toString());
+    }
+
 <%_ } _%>
 }