fix: show error snackbars when non-LoginError exceptions occur duri…

…ng login process
thu-info-community · Nov 4, 2024 · 59c56f3 · 59c56f3
1 parent 169161d
commit 59c56f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/apps/thu-info-app/src/redux/store.ts b/apps/thu-info-app/src/redux/store.ts
@@ -48,6 +48,7 @@ import {
 	CampusCardState,
 	defaultCampusCard,
 } from "./slices/campusCard";
+import { LoginError } from "@thu-info/lib/src/utils/error";
 
 export const helper = new InfoHelper();
 
@@ -258,7 +259,7 @@ export const navigationRef = createNavigationContainerRef<{
 }>();
 
 helper.loginErrorHook = (e) => {
-	if (navigationRef.isReady()) {
+	if (e instanceof LoginError && navigationRef.isReady()) {
 		navigationRef.navigate("Login");
 	}
 	setTimeout(

diff --git a/packages/thu-info-lib/src/lib/core.ts b/packages/thu-info-lib/src/lib/core.ts
@@ -180,9 +180,7 @@ export const login = async (
                     await roam(helper, "id", "10000ea055dd8d81d09d5a1ba55d39ad");
                     outstandingLoginPromise = undefined;
                 })().then(resolve, (e: any) => {
-                    if (e instanceof LoginError) {
-                        helper.loginErrorHook && helper.loginErrorHook(e);
-                    }
+                    helper.loginErrorHook && helper.loginErrorHook(e);
                     outstandingLoginPromise = undefined;
                     reject(e);
                 });