fix(login): update login response handling (#478)

* fix(useFetch): add try/finally to resolve indefinite loading

Signed-off-by: MadDogOwner <xiaoran@xrgzs.top>

* fix(pages/login): replace handleRespWithoutNotify with handleRespWithoutAuthAndNotify

Signed-off-by: MadDogOwner <xiaoran@xrgzs.top>

---------

Signed-off-by: MadDogOwner <xiaoran@xrgzs.top>

Author: xrgzs

src/hooks/useFetch.ts

@@ -11,9 +11,11 @@ export const useLoading = <T>(
     loading,
     async (...arg: any[]) => {
       setLoading(true)
-      const data = await p(...arg)
-      setLoading(false)
-      return data
+      try {
+        return await p(...arg)
+      } finally {
+        setLoading(false)
+      }
     },
   ]
 }
@@ -35,9 +37,11 @@ const useListLoading = <T, K>(
     loading,
     async (key: K, ...arg: any[]) => {
       setLoading(() => key)
-      const data = await p(key, ...arg)
-      setLoading(undefined)
-      return data
+      try {
+        return await p(key, ...arg)
+      } finally {
+        setLoading(undefined)
+      }
     },
   ]
 }

src/pages/login/index.tsx

@@ -19,7 +19,7 @@ import {
   changeToken,
   r,
   notify,
-  handleRespWithoutNotify,
+  handleRespWithoutAuthAndNotify,
   base_path,
   handleResp,
   hashPwd,
@@ -154,14 +154,20 @@ const Login = () => {
           username_login,
           controller.signal,
         )
-        handleRespWithoutNotify(resp, (data) => {
-          notify.success(t("login.success"))
-          changeToken(data.token)
-          to(
-            decodeURIComponent(searchParams.redirect || base_path || "/"),
-            true,
-          )
-        })
+        handleRespWithoutAuthAndNotify(
+          resp,
+          (data) => {
+            notify.success(t("login.success"))
+            changeToken(data.token)
+            to(
+              decodeURIComponent(searchParams.redirect || base_path || "/"),
+              true,
+            )
+          },
+          (msg) => {
+            notify.error(msg)
+          },
+        )
       } catch (error: unknown) {
         if (error instanceof Error && error.name != "AbortError")
           notify.error(error.message)
@@ -190,7 +196,7 @@ const Login = () => {
         localStorage.removeItem("password")
       }
       const resp = await data()
-      handleRespWithoutNotify(
+      handleRespWithoutAuthAndNotify(
         resp,
         (data) => {
           notify.success(t("login.success"))