diff --git a/core/core-frontend/src/utils/logout.ts b/core/core-frontend/src/utils/logout.ts index d69b27833f..4dce91b431 100644 --- a/core/core-frontend/src/utils/logout.ts +++ b/core/core-frontend/src/utils/logout.ts @@ -3,7 +3,6 @@ import router from '@/router' import { usePermissionStoreWithOut } from '@/store/modules/permission' import { interactiveStoreWithOut } from '@/store/modules/interactive' import { useCache } from '@/hooks/web/useCache' -import request from '@/config/axios' const { wsCache } = useCache() const permissionStore = usePermissionStoreWithOut() @@ -11,12 +10,6 @@ const userStore = useUserStoreWithOut() const interactiveStore = interactiveStoreWithOut() export const logoutHandler = (justClean?: boolean) => { - const idToken = wsCache.get('oauth2-id-token') - if (idToken) { - request.get({ url: `/oauth2/logout/${idToken}` }).finally(() => { - wsCache.delete('oauth2-id-token') - }) - } userStore.clear() userStore.$reset() permissionStore.clear() diff --git a/de-xpack b/de-xpack index d883d74073..4b1d708155 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit d883d74073867950a4347dc50b417c3093298e60 +Subproject commit 4b1d7081554441fd75b18bef9b02779389076b16 diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackOauth2Api.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackOauth2Api.java index 94e6da6cb2..353298f858 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackOauth2Api.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/settings/XpackOauth2Api.java @@ -6,7 +6,6 @@ import io.dataease.api.xpack.settings.vo.XpackOauthAuthVO; import io.dataease.api.xpack.settings.vo.XpackOauthTokenVO; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -20,6 +19,4 @@ public interface XpackOauth2Api { @PostMapping("/token") XpackOauthTokenVO oauth2Token(@RequestBody XpackOauth2TokenRequest request); - @GetMapping("/logout/{idToken}") - void logout(@PathVariable("idToken") String idToken); }