feat: better error handling of webauthn (#159)

alist-org · Mar 10, 2024 · e52e8f4 · e52e8f4
1 parent 0946e6a
commit e52e8f4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
@@ -144,17 +144,25 @@ const Login = () => {
       }
       const resp = await getauthntemp(username())
       handleResp(resp, async (data) => {
-        const options = parseRequestOptionsFromJSON(data.options)
-        const credentials = await get(options)
-        const resp = await postauthnlogin(data.session, credentials, username())
-        handleRespWithoutNotify(resp, (data) => {
-          notify.success(t("login.success"))
-          changeToken(data.token)
-          to(
-            decodeURIComponent(searchParams.redirect || base_path || "/"),
-            true,
+        try {
+          const options = parseRequestOptionsFromJSON(data.options)
+          const credentials = await get(options)
+          const resp = await postauthnlogin(
+            data.session,
+            credentials,
+            username(),
           )
-        })
+          handleRespWithoutNotify(resp, (data) => {
+            notify.success(t("login.success"))
+            changeToken(data.token)
+            to(
+              decodeURIComponent(searchParams.redirect || base_path || "/"),
+              true,
+            )
+          })
+        } catch (error: unknown) {
+          if (error instanceof Error) notify.error(error.message)
+        }
       })
     }
   }

diff --git a/src/pages/manage/users/Profile.tsx b/src/pages/manage/users/Profile.tsx
@@ -282,7 +282,7 @@ const Profile = () => {
               return
             }
             const resp = await getauthntemp()
-            handleRespWithoutNotify(resp, async (data) => {
+            handleResp(resp, async (data) => {
               const options = parseCreationOptionsFromJSON(data.options)
               const session = data.session
               try {