feat: 登录未过期跳转到 home

Author: coding-hui

src/app.tsx

@@ -10,7 +10,8 @@ import defaultSettings from '../config/defaultSettings';
 import { errorConfig } from './requestErrorConfig';
 import { App } from 'antd';
 import { isLoginPath, isSessionExpiredPath } from '@/utils/is';
-import { PageEnum } from '@/enums';
+import { PageEnum, TOKEN_KEY } from '@/enums';
+import { Session } from '@/utils/storage';
 
 const isDev = process.env.NODE_ENV === 'development';
 
@@ -27,6 +28,19 @@ const goLogin = () => {
   });
 };
 
+const goHome = () => {
+  const query = queryString.parse(history.location.search);
+  const { redirect } = query as { redirect: string };
+  history.push({
+    pathname: PageEnum.BASE_HOME,
+    search:
+      redirect &&
+      queryString.stringify({
+        redirect: redirect,
+      }),
+  });
+};
+
 /**
  * @see  https://umijs.org/zh-CN/plugins/plugin-initial-state
  * */
@@ -44,6 +58,9 @@ export async function getInitialState(): Promise<{
   const fetchUserInfo = async () => {
     return await queryCurrentUser().catch(() => undefined);
   };
+  if (Session.get(TOKEN_KEY)) {
+    goHome();
+  }
   return {
     fetchUserInfo,
     currentUser: isLoginPath() ? undefined : await fetchUserInfo(),

src/components/RightContent/AvatarDropdown.tsx

@@ -9,6 +9,7 @@ import React, { useCallback } from 'react';
 import { flushSync } from 'react-dom';
 import HeaderDropdown from '../HeaderDropdown';
 import { Session } from '@/utils/storage';
+import { PageEnum } from '@/enums';
 
 export type GlobalHeaderRightProps = {
   menu?: boolean;
@@ -27,14 +28,15 @@ export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu, childre
    */
   const loginOut = async () => {
     await outLogin();
+    Session.clear();
     const { search, pathname } = window.location;
     const urlParams = new URL(window.location.href).searchParams;
     /** 此方法会跳转到 redirect 参数所在的位置 */
     const redirect = urlParams.get('redirect');
     // Note: There may be security issues, please note
-    if (window.location.pathname !== '/login' && !redirect) {
+    if (window.location.pathname !== PageEnum.BASE_LOGIN && !redirect) {
       history.replace({
-        pathname: '/login',
+        pathname: PageEnum.BASE_LOGIN,
         search: stringify({
           redirect: pathname + search,
         }),

src/enums/pageEnum.ts

@@ -4,7 +4,7 @@ export enum PageEnum {
   // session expired
   SESSION_EXPIRED = '/session-expired',
   // basic home path
-  BASE_HOME = '/dashboard',
+  BASE_HOME = '/welcome',
   // error page path
   ERROR_PAGE = '/exception',
   // error log page path