Austin/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2024-11-16 11:42:29 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: old webapp url still valid (#1643)

Browse Source
This commit is contained in:
crazywoola 2023-11-28 20:04:46 +08:00 committed by GitHub
parent c21e2063fe
commit cf0ba794d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/controllers/web/wraps.py
View File

@ -40,7 +40,7 @@ def decode_jwt_token():
site = db.session.query(Site).filter(Site.code == app_code).first()
if not app_model:
raise NotFound()
if not app_code and not site:
if not app_code or not site:
raise Unauthorized('Site URL is no longer valid.')
if app_model.enable_site is False:
raise Unauthorized('Site is disabled.')

37
web/service/base.ts
View File

@ -237,29 +237,24 @@ const baseFetch = <T>(
switch (res.status) {
case 401: {
if (isPublicAPI) {
Toast.notify({ type: 'error', message: 'Invalid token' })
return bodyJson.then((data: T) => Promise.reject(data))
return bodyJson.then((data: ResponseError) => {
Toast.notify({ type: 'error', message: data.message })
return Promise.reject(data)
})
}
const loginUrl = `${globalThis.location.origin}/signin`
if (IS_CE_EDITION) {
bodyJson.then((data: ResponseError) => {
if (data.code === 'not_setup') {
globalThis.location.href = `${globalThis.location.origin}/install`
}
else {
if (location.pathname === '/signin') {
bodyJson.then((data: ResponseError) => {
Toast.notify({ type: 'error', message: data.message })
})
}
else {
globalThis.location.href = loginUrl
}
}
})
return Promise.reject(Error('Unauthorized'))
}
globalThis.location.href = loginUrl
bodyJson.then((data: ResponseError) => {
if (data.code === 'not_setup' && IS_CE_EDITION)
globalThis.location.href = `${globalThis.location.origin}/install`
else if (location.pathname !== '/signin' || !IS_CE_EDITION)
globalThis.location.href = loginUrl
else
Toast.notify({ type: 'error', message: data.message })
}).catch(() => {
// Handle any other errors
globalThis.location.href = loginUrl
})
break
}
case 403: