Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

Fix: Admin/user login state collision causes 403s and crashes the home page #20409 (#21320)

balibabuf3755211bb90
diff --git a/web/src/constants/authorization.ts b/web/src/constants/authorization.ts
index b9c65403a9..9733adfe6c 100644
--- a/web/src/constants/authorization.ts
+++ b/web/src/constants/authorization.ts
@@ -18,3 +18,10 @@ export const Authorization = 'Authorization';
export const Token = 'token';
export const UserInfo = 'userInfo';
export const ThinkingLevel = 'thinkingLevel';
+
+// The admin interface stores credentials under its own keys: localStorage is
+// origin-wide, so sharing these keys with /login let each session silently
+// overwrite the other.
+export const AdminAuthorization = 'AdminAuthorization';
+export const AdminToken = 'AdminToken';
+export const AdminUserInfo = 'AdminUserInfo';
diff --git a/web/src/hooks/auth-hooks.ts b/web/src/hooks/auth-hooks.ts
index 3f34c74c6f..d65334103e 100644
--- a/web/src/hooks/auth-hooks.ts
+++ b/web/src/hooks/auth-hooks.ts
@@ -15,7 +15,9 @@
*/
import message from '@/components/ui/message';
-import authorizationUtil from '@/utils/authorization-util';
+import authorizationUtil, {
+ type CredentialStorage,
+} from '@/utils/authorization-util';
import { useEffect, useMemo, useState } from 'react';
import { useNavigate, useSearchParams } from 'react-router';
@@ -58,13 +60,15 @@ export const useOAuthCallback = () => {
return currentQueryParameters.get('auth');
};
-export const useAuth = () => {
+export const useAuth = (
+ credentialStorage: CredentialStorage = authorizationUtil,
+) => {
const auth = useOAuthCallback();
const [isLogin, setIsLogin] = useState<Nullable<boolean>>(null);
useEffect(() => {
- setIsLogin(!!authorizationUtil.getAuthorization() || !!auth);
- }, [auth]);
+ setIsLogin(!!credentialStorage.getAuthorization() || !!auth);
+ }, [auth, credentialStorage]);
return { isLogin };
};
diff --git a/web/src/hooks/use-login-request.ts b/web/src/hooks/use-login-request.ts
index 716b9f85f0..b279280eb0 100644
--- a/web/src/hooks/use-login-request.ts
+++ b/web/src/hooks/use-login-request.ts
@@ -91,10 +91,10 @@ export const useLogin = () => {
name: data.nickname,
email: data.email,
};
- authorizationUtil.setItems({
- Authorization: authorization,
+ authorizationUtil.saveLoginCredentials({
+ authorization,
+ token,
userInfo: JSON.stringify(userInfo),
- Token: token,
});
}
return res.code;
diff --git a/web/src/pages/admin/layouts/authorized-layout.tsx b/web/src/pages/admin/layouts/authorized-layout.tsx
index 357928a1d7..bc1d2b5dce 100644
--- a/web/src/pages/admin/layouts/authorized-layout.tsx
+++ b/web/src/pages/admin/layouts/authorized-layout.tsx
@@ -2,12 +2,12 @@ import { useContext } from 'react';
import { Navigate, Outlet } from 'react-router';
import { Routes } from '@/routes';
-import authorizationUtil from '@/utils/authorization-util';
+import { adminStorage } from '@/utils/authorization-util';
import { CurrentUserInfoContext } from './root-layout';
export default function AdminAuthorizedLayout() {
const [{ userInfo }] = useContext(CurrentUserInfoContext);
- const isLoggedIn = !!authorizationUtil.getAuthorization() && userInfo;
+ const isLoggedIn = !!adminStorage.getAuthorization() && userInfo;
return isLoggedIn ? <Outlet /> : <Navigate to={Routes.Admin} />;
}
diff --git a/web/src/pages/admin/layouts/navigation-layout.tsx b/web/src/pages/admin/layouts/navigation-layout.tsx
index af5d11402c..07dd800d25 100644
--- a/web/src/pages/admin/layouts/navigation-layout.tsx
+++ b/web/src/pages/admin/layouts/navigation-layout.tsx
@@ -18,7 +18,7 @@ import { cn } from '@/lib/utils';
import { Routes } from '@/routes';
import { getSystemVersion, logout } from '@/services/admin-service';
-import authorizationUtil from '@/utils/authorization-util';
+import { adminStorage } from '@/utils/authorization-util';
import ThemeSwitch from '../../../components/theme-switch';
import { IS_ENTERPRISE } from '../utils';
@@ -78,7 +78,7 @@ const AdminNavigationLayout = () => {
mutationKey: ['adminLogout'],
mutationFn: async () => {
await logout();
- authorizationUtil.removeAll();
+ adminStorage.removeAll();
navigate(Routes.Admin);
setCurrentUserInfo({
userInfo: null,
diff --git a/web/src/pages/admin/layouts/root-layout.tsx b/web/src/pages/admin/layouts/root-layout.tsx
index 86a5352859..92a8895d13 100644
--- a/web/src/pages/admin/layouts/root-layout.tsx
+++ b/web/src/pages/admin/layouts/root-layout.tsx
@@ -2,7 +2,7 @@ import { createContext, Dispatch, SetStateAction, useState } from 'react';
import { Outlet } from 'react-router';
import type { IUserInfo } from '@/interfaces/database/user-setting';
-import authorizationUtil from '@/utils/authorization-util';
+import { adminStorage } from '@/utils/authorization-util';
type LocalStoragePersistedUserInfo = {
avatar: unknown;
@@ -25,7 +25,7 @@ export type CurrentUserInfo =
};
const getLocalStorageUserInfo = (): CurrentUserInfo => {
- const userInfo = authorizationUtil.getUserInfoObject();
+ const userInfo = adminStorage.getUserInfoObject();
return userInfo
? {
diff --git a/web/src/pages/admin/login.tsx b/web/src/pages/admin/login.tsx
index efa0c4169b..795c6cb16a 100644
--- a/web/src/pages/admin/login.tsx
+++ b/web/src/pages/admin/login.tsx
@@ -29,7 +29,7 @@ import { useAuth } from '@/hooks/auth-hooks';
import { cn } from '@/lib/utils';
import { Routes } from '@/routes';
import { rsaPsw } from '@/utils';
-import authorizationUtil from '@/utils/authorization-util';
+import { adminStorage } from '@/utils/authorization-util';
import { login } from '@/services/admin-service';
@@ -42,7 +42,7 @@ function AdminLogin() {
const navigate = useNavigate();
const [, setCurrentUserInfo] = useContext(CurrentUserInfoContext);
const { t } = useTranslation('translation', { keyPrefix: 'login' });
- const { isLogin } = useAuth();
+ const { isLogin } = useAuth(adminStorage);
const loginMutation = useMutation({
mutationKey: ['adminLogin'],
@@ -68,9 +68,9 @@ function AdminLogin() {
source: 'serverRequest',
});
- authorizationUtil.setItems({
- Authorization: authorization as string,
- Token: token,
+ adminStorage.saveLoginCredentials({
+ authorization: authorization as string,
+ token,
userInfo: JSON.stringify({
...req.data,
name: req.data.nickname,
diff --git a/web/src/pages/home/chat-list.tsx b/web/src/pages/home/chat-list.tsx
index c6d5661a38..486b1f62c2 100644
--- a/web/src/pages/home/chat-list.tsx
+++ b/web/src/pages/home/chat-list.tsx
@@ -33,7 +33,7 @@ export function ChatList({
}, [data, setListLength, loading, setLoading]);
return (
<>
- {data.chats.slice(0, 10).map((x) => (
+ {(data?.chats ?? []).slice(0, 10).map((x) => (
<HomeCard
key={x.id}
data={{
diff --git a/web/src/services/admin-service.ts b/web/src/services/admin-service.ts
index 9ff5f75e49..5416da71b1 100644
--- a/web/src/services/admin-service.ts
+++ b/web/src/services/admin-service.ts
@@ -22,9 +22,7 @@ import { Authorization } from '@/constants/authorization';
import i18n from '@/locales/config';
import { Routes } from '@/routes';
import api from '@/utils/api';
-import authorizationUtil, {
- getAuthorization,
-} from '@/utils/authorization-util';
+import { adminStorage } from '@/utils/authorization-util';
import { convertTheKeysOfTheObjectToSnake } from '@/utils/common-util';
import { ResultCode, RetcodeMessage } from '@/utils/request';
import {
@@ -45,7 +43,7 @@ request.interceptors.request.use((config) => {
// @ts-ignore
if (!newConfig.skipToken) {
- newConfig.headers.set(Authorization, getAuthorization());
+ newConfig.headers.set(Authorization, adminStorage.getAuthorization());
}
return newConfig;
@@ -66,7 +64,7 @@ request.interceptors.response.use(
description: data?.message,
});
- authorizationUtil.removeAll();
+ adminStorage.removeAll();
history.push(Routes.Admin);
window.location.reload();
} else if (data?.code && data.code !== 0) {
@@ -96,7 +94,7 @@ request.interceptors.response.use(
duration: 3,
});
- authorizationUtil.removeAll();
+ adminStorage.removeAll();
history.push(Routes.Admin);
window.location.reload();
} else if (data?.code && data.code !== 0) {
@@ -208,15 +206,13 @@ export const deleteUser = (email: string) =>
export const listServices = async () => {
const { data } =
- await request.get<
- ResponseData<AdminService.ListServicesItem[] | GoServiceStatus[]>
- >(adminListServices);
+ await request.get<ResponseData<GoServiceStatus[]>>(adminListServices);
return data.code === 0 ? adaptServiceList(data.data) : [];
};
export const showServiceDetails = async (serviceId: number | string) => {
- const { data } = await request.get<
- ResponseData<AdminService.ServiceDetail | GoServiceStatus>
- >(adminShowServiceDetails(encodeURIComponent(String(serviceId))));
+ const { data } = await request.get<ResponseData<GoServiceStatus>>(
+ adminShowServiceDetails(encodeURIComponent(String(serviceId))),
+ );
return data.code === 0 ? adaptServiceDetail(data.data) : undefined;
};
diff --git a/web/src/utils/authorization-util.ts b/web/src/utils/authorization-util.ts
index 86abe7a7d8..c14ae8ffe2 100644
--- a/web/src/utils/authorization-util.ts
+++ b/web/src/utils/authorization-util.ts
@@ -15,51 +15,66 @@
*/
import {
+ AdminAuthorization,
+ AdminToken,
+ AdminUserInfo,
Authorization,
ThinkingLevel,
Token,
UserInfo,
} from '@/constants/authorization';
import { getSearchValue } from './common-util';
-const KeySet = [Authorization, Token, UserInfo];
-const storage = {
- getAuthorization: () => {
- return localStorage.getItem(Authorization);
- },
- getToken: () => {
- return localStorage.getItem(Token);
- },
- getUserInfo: () => {
- return localStorage.getItem(UserInfo);
- },
+type CredentialKeys = {
+ authorization: string;
+ token: string;
+ userInfo: string;
+};
+
+const UserCredentialKeys: CredentialKeys = {
+ authorization: Authorization,
+ token: Token,
+ userInfo: UserInfo,
+};
+
+const AdminCredentialKeys: CredentialKeys = {
+ authorization: AdminAuthorization,
+ token: AdminToken,
+ userInfo: AdminUserInfo,
+};
+
+type LoginCredentials = {
+ authorization: string;
+ token: string;
+ userInfo: string;
+};
+
+const createCredentialStorage = (keys: CredentialKeys) => ({
+ getAuthorization: (): string =>
+ localStorage.getItem(keys.authorization) ?? '',
getUserInfoObject: () => {
- const userInfoStr = localStorage.getItem(UserInfo);
+ const userInfoStr = localStorage.getItem(keys.userInfo);
return userInfoStr ? JSON.parse(userInfoStr) : null;
},
setAuthorization: (value: string) => {
- localStorage.setItem(Authorization, value);
- },
- setToken: (value: string) => {
- localStorage.setItem(Token, value);
- },
- setUserInfo: (value: string | Record<string, unknown>) => {
- const valueStr = typeof value !== 'string' ? JSON.stringify(value) : value;
- localStorage.setItem(UserInfo, valueStr);
- },
- setItems: (pairs: Record<string, string>) => {
- Object.entries(pairs).forEach(([key, value]) => {
- localStorage.setItem(key, value);
- });
+ localStorage.setItem(keys.authorization, value);
},
- removeAuthorization: () => {
- localStorage.removeItem(Authorization);
+ saveLoginCredentials: (credentials: LoginCredentials) => {
+ localStorage.setItem(keys.authorization, credentials.authorization);
+ localStorage.setItem(keys.token, credentials.token);
+ localStorage.setItem(keys.userInfo, credentials.userInfo);
},
removeAll: () => {
- KeySet.forEach((x) => {
- localStorage.removeItem(x);
+ Object.values(keys).forEach((key) => {
+ localStorage.removeItem(key);
});
},
+});
+
+export type CredentialStorage = ReturnType<typeof createCredentialStorage>;
+
+const storage = {
+ ...createCredentialStorage(UserCredentialKeys),
setLanguage: (lng: string) => {
localStorage.setItem('lng', lng);
},
@@ -78,11 +93,11 @@ const storage = {
},
};
+export const adminStorage = createCredentialStorage(AdminCredentialKeys);
+
export const getAuthorization = () => {
const auth = getSearchValue('auth');
- const authorization = auth
- ? 'Bearer ' + auth
- : storage.getAuthorization() || '';
+ const authorization = auth ? 'Bearer ' + auth : storage.getAuthorization();
return authorization;
};