Browse Source

Merge pull request #579 from ente-io/fix-two-fa-verify-redirect

fixes Cannot read properties of null (reading 'isTwoFactorEnabled')
Abhinav Kumar 3 years ago
parent
commit
8bbd09a742
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/pages/two-factor/verify/index.tsx

+ 3 - 3
src/pages/two-factor/verify/index.tsx

@@ -17,13 +17,13 @@ export default function Home() {
         const main = async () => {
         const main = async () => {
             router.prefetch(PAGES.CREDENTIALS);
             router.prefetch(PAGES.CREDENTIALS);
             const user: User = getData(LS_KEYS.USER);
             const user: User = getData(LS_KEYS.USER);
-            if (
+            if (!user?.email || !user.twoFactorSessionID) {
+                router.push(PAGES.ROOT);
+            } else if (
                 !user.isTwoFactorEnabled &&
                 !user.isTwoFactorEnabled &&
                 (user.encryptedToken || user.token)
                 (user.encryptedToken || user.token)
             ) {
             ) {
                 router.push(PAGES.CREDENTIALS);
                 router.push(PAGES.CREDENTIALS);
-            } else if (!user?.email || !user.twoFactorSessionID) {
-                router.push(PAGES.ROOT);
             } else {
             } else {
                 setSessionID(user.twoFactorSessionID);
                 setSessionID(user.twoFactorSessionID);
             }
             }