From a9770c88ccfc04be7149330fba514a238174a12b Mon Sep 17 00:00:00 2001
From: vdisk <vdisk@foxmail.com>
Date: Sat, 11 Feb 2023 21:42:09 +0800
Subject: [PATCH] fix oidc logout

---
 .../apollo/portal/spi/configuration/AuthConfiguration.java  | 1 +
 .../framework/apollo/portal/spi/oidc/OidcLogoutHandler.java | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java
index fec104b46c8..8c5950c37f4 100644
--- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java
+++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java
@@ -390,6 +390,7 @@ protected void configure(HttpSecurity http) throws Exception {
                   this.clientRegistrationRepository)));
       http.oauth2Client();
       http.logout(configure -> {
+        configure.logoutUrl("/user/logout");
         OidcClientInitiatedLogoutSuccessHandler logoutSuccessHandler = new OidcClientInitiatedLogoutSuccessHandler(
             this.clientRegistrationRepository);
         logoutSuccessHandler.setPostLogoutRedirectUri("{baseUrl}");
diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/oidc/OidcLogoutHandler.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/oidc/OidcLogoutHandler.java
index 652a0182e1b..6b6c1e2763d 100644
--- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/oidc/OidcLogoutHandler.java
+++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/oidc/OidcLogoutHandler.java
@@ -28,10 +28,6 @@ public class OidcLogoutHandler implements LogoutHandler {
 
   @Override
   public void logout(HttpServletRequest request, HttpServletResponse response) {
-    try {
-      response.sendRedirect(request.getContextPath() + "/logout");
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+    // do nothing here
   }
 }