fix: login api toast

src/app/services/base.query.js

@@ -1,28 +1,28 @@
-import { fetchBaseQuery } from '@reduxjs/toolkit/query';
+import { fetchBaseQuery } from "@reduxjs/toolkit/query";
-import toast from 'react-hot-toast';
+import toast from "react-hot-toast";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
-import { updateToken, resetAuthData } from '../slices/auth.data';
+import { updateToken, resetAuthData } from "../slices/auth.data";
-import BASE_URL, { tokenHeader } from '../config';
+import BASE_URL, { tokenHeader } from "../config";
 const whiteList = [
- 'login',
+  "login",
- 'register',
+  "register",
- 'checkInviteTokenValid',
+  "checkInviteTokenValid",
- 'getLoginConfig',
+  "getLoginConfig",
- 'getServer',
+  "getServer",
- 'getOpenid',
+  "getOpenid",
- 'getMetamaskNonce',
+  "getMetamaskNonce",
- 'renew'
+  "renew",
 ];
 const baseQuery = fetchBaseQuery({
   baseUrl: BASE_URL,
   prepareHeaders: (headers, { getState, endpoint }) => {
-  console.log('req', endpoint);
+    console.log("req", endpoint);
     const { token } = getState().authData;
     if (token && !whiteList.includes(endpoint)) {
       headers.set(tokenHeader, token);
     }
     return headers;
- }
+  },
 });
 let waitingForRenew = null;
 const baseQueryWithTokenCheck = async (args, api, extraOptions) => {
@@ -30,18 +30,25 @@ const baseQueryWithTokenCheck = async (args, api, extraOptions) => {
     await waitingForRenew;
   }
   // 先检查token是否过期，过期则renew
- const { token, refreshToken, expireTime = new Date().getTime() } = api.getState().authData;
+  const {
+    token,
+    refreshToken,
+    expireTime = new Date().getTime(),
+  } = api.getState().authData;
   let result = null;
- if (!whiteList.includes(api.endpoint) && dayjs().isAfter(new Date(expireTime - 20 * 1000))) {
+  if (
+    !whiteList.includes(api.endpoint) &&
+    dayjs().isAfter(new Date(expireTime - 20 * 1000))
+  ) {
     // 快过期了，renew
     waitingForRenew = baseQuery(
       {
-    url: '/token/renew',
+        url: "/token/renew",
-    method: 'POST',
+        method: "POST",
         body: {
           token,
-     refresh_token: refreshToken
+          refresh_token: refreshToken,
-    }
+        },
       },
       api,
       extraOptions
@@ -58,37 +65,38 @@ const baseQueryWithTokenCheck = async (args, api, extraOptions) => {
     result = await baseQuery(args, api, extraOptions);
   }
   if (result?.error) {
-  console.log('api error', result.error, api.endpoint);
+    console.log("api error", result.error, api.endpoint);
     switch (result.error.originalStatus || result.error.status) {
-   case 'FETCH_ERROR':
+      case "FETCH_ERROR":
         {
           toast.error(`${api.endpoint}: Failed to fetch`);
         }
         break;
       case 404:
         {
-     toast.error('Request Not Found');
+          toast.error("Request Not Found");
         }
         break;
       case 500:
         {
-     toast.error(result.error.data || 'server error');
+          toast.error(result.error.data || "server error");
         }
         break;
       case 401:
         {
-     // if (api.endpoint === "renew") {
+          if (api.endpoint !== "login") {
-     // toast.error("token expired, please login again");
             api.dispatch(resetAuthData());
-     location.href = '/#/login';
+            location.href = "/#/login";
+            toast.error("API Not Authenticated");
+          }
+          // toast.error("token expired, please login again");
           // } else {
-     toast.error('API Not Authenticated');
           // return;
           // }
         }
         break;
       case 403:
-    toast.error('Request Not Allowed');
+        toast.error("Request Not Allowed");
         break;
       default:
         break;