refactor: remember path before login
This commit is contained in:
@@ -26,11 +26,6 @@ const RequireAuth: FC<Props> = ({ children, redirectTo = "/login" }) => {
|
||||
if (checkingInitialized || !loginConfigSuccess) return <Loading fullscreen={true} />;
|
||||
// 未初始化 则先走setup 流程
|
||||
if (!initialized) return <Navigate to={`/onboarding`} replace />;
|
||||
// 开启guest 并且没token 而且是允许guest访问的路由 则先去过渡页登录
|
||||
if (loginConfig?.guest && !token && allowGuest) return <Navigate to={"/guest_login"} replace />;
|
||||
// 登陆者是guest,并且不允许访问
|
||||
if (token && guest && !allowGuest) return <Navigate to={"/"} replace />;
|
||||
// console.log("authhhhh", allowGuest, token, guest);
|
||||
if (!token) {
|
||||
// 记录下当前的路径,登录后跳转回来
|
||||
const ignorePath = `/setting/my_account`;
|
||||
@@ -40,6 +35,11 @@ const RequireAuth: FC<Props> = ({ children, redirectTo = "/login" }) => {
|
||||
);
|
||||
return <Navigate to={redirectTo} replace />;
|
||||
}
|
||||
// 开启guest 并且没token 而且是允许guest访问的路由 则先去过渡页登录
|
||||
if (loginConfig?.guest && !token && allowGuest) return <Navigate to={"/guest_login"} replace />;
|
||||
// 登陆者是guest,并且不允许访问
|
||||
if (token && guest && !allowGuest) return <Navigate to={"/"} replace />;
|
||||
// console.log("authhhhh", allowGuest, token, guest);
|
||||
const tryPath = localStorage.getItem(KEY_LOCAL_TRY_PATH);
|
||||
if (tryPath) {
|
||||
localStorage.removeItem(KEY_LOCAL_TRY_PATH);
|
||||
|
||||
Reference in New Issue
Block a user