mirror of
https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git
synced 2025-06-04 11:24:00 +08:00
feat: set initial state of auth to null (#108)
This commit is contained in:
parent
cfc3b62e77
commit
b69b5dd4e5
@ -21,6 +21,7 @@ export default defineConfig({
|
|||||||
hack: `true; @import "~@/less/index.less";`,
|
hack: `true; @import "~@/less/index.less";`,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
devtool: 'source-map',
|
||||||
proxy: {
|
proxy: {
|
||||||
'/v1': {
|
'/v1': {
|
||||||
target: 'http://123.60.95.134:9380/',
|
target: 'http://123.60.95.134:9380/',
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
import authorizationUtil from '@/utils/authorizationUtil';
|
import authorizationUtil from '@/utils/authorizationUtil';
|
||||||
import { message } from 'antd';
|
import { message } from 'antd';
|
||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
|
import { Nullable } from 'typings';
|
||||||
import { useNavigate, useSearchParams } from 'umi';
|
import { useNavigate, useSearchParams } from 'umi';
|
||||||
|
|
||||||
export const useLoginWithGithub = () => {
|
export const useLoginWithGithub = () => {
|
||||||
@ -32,10 +33,10 @@ export const useLoginWithGithub = () => {
|
|||||||
|
|
||||||
export const useAuth = () => {
|
export const useAuth = () => {
|
||||||
const auth = useLoginWithGithub();
|
const auth = useLoginWithGithub();
|
||||||
const [isLogin, setIsLogin] = useState(true);
|
const [isLogin, setIsLogin] = useState<Nullable<boolean>>(null);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setIsLogin(!!auth || !!authorizationUtil.getAuthorization());
|
setIsLogin(!!authorizationUtil.getAuthorization() || !!auth);
|
||||||
}, [auth]);
|
}, [auth]);
|
||||||
|
|
||||||
return { isLogin };
|
return { isLogin };
|
||||||
|
@ -3,9 +3,11 @@ import { Navigate, Outlet } from 'umi';
|
|||||||
|
|
||||||
export default () => {
|
export default () => {
|
||||||
const { isLogin } = useAuth();
|
const { isLogin } = useAuth();
|
||||||
if (isLogin) {
|
if (isLogin === true) {
|
||||||
return <Outlet />;
|
return <Outlet />;
|
||||||
} else {
|
} else if (isLogin === false) {
|
||||||
return <Navigate to="/login" />;
|
return <Navigate to="/login" />;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return <></>;
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user