yujunjun/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2025-12-25 17:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix/webapp loop login (#21092)

Browse Source
This commit is contained in:
NFish 2025-06-17 10:45:03 +08:00 committed by GitHub
parent 2440ac43b1
commit d7663159e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/app/(shareLayout)/layout.tsx
View File

@ -19,7 +19,7 @@ const Layout: FC<{
const [isLoading, setIsLoading] = useState(true)
useEffect(() => {
(async () => {
if (!systemFeatures.webapp_auth.enabled) {
if (!isGlobalPending && !systemFeatures.webapp_auth.enabled) {
setIsLoading(false)
return
}
@ -37,7 +37,7 @@ const Layout: FC<{
setWebAppAccessMode(ret?.accessMode || AccessMode.PUBLIC)
setIsLoading(false)
})()
}, [pathname, redirectUrl, setWebAppAccessMode])
}, [pathname, redirectUrl, setWebAppAccessMode, isGlobalPending, systemFeatures.webapp_auth.enabled])
if (isLoading || isGlobalPending) {
return <div className='flex h-full w-full items-center justify-center'>
<Loading />

4
web/service/base.ts
View File

@ -408,7 +408,7 @@ export const ssePost = async (
if (data.code === 'web_sso_auth_required') {
removeAccessToken()
requiredWebSSOLogin()
requiredWebSSOLogin(data.message, 401)
}
if (data.code === 'unauthorized') {
@ -492,7 +492,7 @@ export const request = async<T>(url: string, options = {}, otherOptions?: IOther
}
if (code === 'web_sso_auth_required') {
removeAccessToken()
requiredWebSSOLogin()
requiredWebSSOLogin(message, 401)
return Promise.reject(err)
}
if (code === 'unauthorized_and_force_logout') {