diff --git a/core/core-frontend/src/utils/logout.ts b/core/core-frontend/src/utils/logout.ts index 632a1747f6..9050024717 100644 --- a/core/core-frontend/src/utils/logout.ts +++ b/core/core-frontend/src/utils/logout.ts @@ -21,13 +21,21 @@ export const logoutHandler = (justClean?: boolean) => { if (router.currentRoute.value.fullPath) { queryRedirectPath = router.currentRoute.value.fullPath as string } + let pathname = window.location.pathname + if (pathname) { + if (pathname.includes('oidcbi/') || pathname.includes('casbi/')) { + pathname = pathname.replace('oidcbi/', '') + pathname = pathname.replace('casbi/', '') + } + pathname = pathname.substring(0, pathname.length - 1) + } if (wsCache.get('out_auth_platform') === 'cas') { const uri = window.location.href - window.location.href = '/casbi/cas/logout?service=' + uri + window.location.href = pathname + '/casbi/cas/logout?service=' + uri return } if (wsCache.get('out_auth_platform') === 'oidc') { - window.location.href = '/oidcbi/oidc/logout' + window.location.href = pathname + '/oidcbi/oidc/logout' return } if (wsCache.get('custom_auth_logout_url')) { diff --git a/de-xpack b/de-xpack index f0fde70871..d21daef323 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit f0fde70871bc17a8e3660c7c8563418e87cc8b87 +Subproject commit d21daef323ca920d8f2ca467b5a69f018d30384b