fix: 修复portal跳转兔小巢在某些情况下直接跳转的问题

TRPGEngine · Feb 2, 2021 · 718273b · 718273b
1 parent 0e1d6e3
commit 718273b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/src/portal/routes/help/txc.tsx b/src/portal/routes/help/txc.tsx
@@ -11,19 +11,21 @@ import { useAsync } from 'react-use';
 
 const TXCFeedback: React.FC = TMemo(() => {
   const { loading } = useAsync(async () => {
-    await checkToken();
+    const isLogin = await checkToken();
 
-    // 跳转到兔小巢
-    const userInfo = await getJWTUserInfo();
-    openPostWindow({
-      url: config.url.txcUrl,
-      data: {
-        openid: userInfo.uuid,
-        nickname: userInfo.name,
-        avatar: userInfo.avatar,
-      },
-      target: '_self',
-    });
+    if (isLogin === true) {
+      // 跳转到兔小巢
+      const userInfo = await getJWTUserInfo();
+      openPostWindow({
+        url: config.url.txcUrl,
+        data: {
+          openid: userInfo.uuid,
+          nickname: userInfo.name,
+          avatar: userInfo.avatar,
+        },
+        target: '_self',
+      });
+    }
   });
 
   if (loading) {

diff --git a/src/portal/utils/auth.ts b/src/portal/utils/auth.ts
@@ -14,14 +14,15 @@ import { getJWTPayload, JWTUserInfoData } from '@shared/utils/jwt-helper';
  * 该检查一般用于表单填写页面防止填了一堆数据后提交失败跳转到登录页的挫败感
  * @param 是否自动跳转。如果为登录页则此值应该为false
  */
-export const checkToken = async (autoNav = true): Promise<void> => {
+export const checkToken = async (autoNav = true): Promise<boolean> => {
   try {
     await request.post('/player/sso/check');
+    return true;
   } catch (err) {
     if (autoNav) {
       // 如果出错则跳转到登录页面
       navToLoginPage();
-      return;
+      return false;
     }
     throw err;
   }