fix(verify): manual check if email is verified (#1582)

* fix(email): add missing await * fix(verify): add manuall check for email verified on user
entur · Jul 12, 2024 · 053a7c0 · 053a7c0
1 parent 82457a7
commit 053a7c0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/next-tavla/app/(admin)/components/Login/Email.tsx b/next-tavla/app/(admin)/components/Login/Email.tsx
@@ -45,7 +45,7 @@ function Email() {
             const uid = await credential.user.getIdToken()
             const error = await login(uid)
             if (error && auth.currentUser) {
-                sendEmailVerification(auth.currentUser)
+                await sendEmailVerification(auth.currentUser)
                 return getFormFeedbackForError(error)
             }
         } catch (e: unknown) {

diff --git a/next-tavla/app/verify/[oob]/page.tsx b/next-tavla/app/verify/[oob]/page.tsx
@@ -7,12 +7,30 @@ import { FirebaseError } from 'firebase/app'
 
 async function Verify({ params }: { params: { oob: string } }) {
     let message = 'E-postadressen din er nå verifisert!'
+    const app = await getClientApp()
+    const auth = getAuth(app)
+
     try {
-        const app = await getClientApp()
-        const auth = getAuth(app)
         await applyActionCode(auth, params.oob)
     } catch (e) {
-        if (e instanceof FirebaseError) {
+        // Check manually if email is verified
+        const url = `https://identitytoolkit.googleapis.com/v1/accounts:update?key=${app.options.apiKey}`
+        const response = await fetch(url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                oobCode: params.oob,
+            }),
+        })
+        let emailVerified = false
+        if (response.ok) {
+            const data = await response.json()
+            emailVerified = data.emailVerified
+        }
+
+        if (e instanceof FirebaseError && !emailVerified) {
             switch (e.code) {
                 case 'auth/expired-action-code':
                     message =
@@ -25,8 +43,10 @@ async function Verify({ params }: { params: { oob: string } }) {
                         'Kontoen din er deaktivert og kunne ikke verifiseres.'
                 case 'auth/user-not-found':
                     message = 'Fant ingen bruker som samsvarte med lenken.'
+                default:
+                    message = 'Noe gikk galt, prøv igjen senere.'
             }
-        } else message = 'Noe gikk galt, prøv igjen senere.'
+        }
     }
     return (
         <main className="container mx-auto pt-8 pb-20 text-center">