fix: request twice when verify

GZTimeWalker · Sep 14, 2022 · fb93a6d · fb93a6d
1 parent a51a911
commit fb93a6d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/GZCTF/ClientApp/src/pages/account/Confirm.tsx b/GZCTF/ClientApp/src/pages/account/Confirm.tsx
@@ -1,4 +1,4 @@
-import { FC, useEffect } from 'react'
+import { FC, useEffect, useRef } from 'react'
 import { useNavigate, useLocation } from 'react-router-dom'
 import { Text } from '@mantine/core'
 import { showNotification } from '@mantine/notifications'
@@ -14,15 +14,16 @@ const Confirm: FC = () => {
   const sp = new URLSearchParams(location.search)
   const token = sp.get('token')
   const email = sp.get('email')
+  const runOnce = useRef(false);
 
   usePageTitle('邮箱验证')
 
   useEffect(() => {
-    if (token && email) {
+    if (token && email && !runOnce.current) {
+      runOnce.current = true
       api.account
         .accountMailChangeConfirm({ token, email })
         .then(() => {
-          navigate('/')
           showNotification({
             color: 'teal',
             title: '邮箱已验证',
@@ -40,8 +41,11 @@ const Confirm: FC = () => {
             disallowClose: true,
           })
         })
+        .finally(() => {
+          navigate('/')
+        })
     }
-  })
+  }, [])
 
   return (
     <AccountView>

diff --git a/GZCTF/ClientApp/src/pages/account/Register.tsx b/GZCTF/ClientApp/src/pages/account/Register.tsx
@@ -116,6 +116,7 @@ const Register: FC = () => {
           title: '遇到了问题',
           message: `${err.response.data.title}`,
           icon: <Icon path={mdiClose} size={1} />,
+          disallowClose: true,
         })
       })
       .finally(() => {

diff --git a/GZCTF/ClientApp/src/pages/account/Verify.tsx b/GZCTF/ClientApp/src/pages/account/Verify.tsx
@@ -1,4 +1,4 @@
-import { FC, useEffect } from 'react'
+import { FC, useEffect, useRef } from 'react'
 import { useNavigate, useLocation } from 'react-router-dom'
 import { Text } from '@mantine/core'
 import { showNotification } from '@mantine/notifications'
@@ -14,15 +14,16 @@ const Verify: FC = () => {
   const token = sp.get('token')
   const email = sp.get('email')
   const navigate = useNavigate()
+  const runOnce = useRef(false);
 
   usePageTitle('账户验证')
 
   useEffect(() => {
-    if (token && email) {
+    if (token && email && !runOnce.current ) {
+      runOnce.current = true
       api.account
         .accountVerify({ token, email })
         .then(() => {
-          navigate('/account/login')
           showNotification({
             color: 'teal',
             title: '账户已验证，请登录',
@@ -39,9 +40,11 @@ const Verify: FC = () => {
             icon: <Icon path={mdiClose} size={1} />,
             disallowClose: true,
           })
+        }).finally(() => {
+          navigate('/account/login')
         })
     }
-  })
+  }, [])
 
   return (
     <AccountView>