🪟 🐛 Force refresh of firebase token after verifying email (#21687)

airbytehq · Jan 23, 2023 · 0fbd3b2 · 0fbd3b2
1 parent dd0706e
commit 0fbd3b2
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/airbyte-webapp/src/packages/cloud/lib/auth/GoogleAuthService.ts b/airbyte-webapp/src/packages/cloud/lib/auth/GoogleAuthService.ts
@@ -20,6 +20,8 @@ import {
   signInWithPopup,
   GoogleAuthProvider,
   GithubAuthProvider,
+  getIdToken,
+  reload,
 } from "firebase/auth";
 
 import { Provider } from "config";
@@ -144,7 +146,13 @@ export class GoogleAuthService {
   }
 
   async confirmEmailVerify(code: string): Promise<void> {
-    return applyActionCode(this.auth, code);
+    await applyActionCode(this.auth, code);
+
+    // Reload the user and get a fresh token with email_verified: true
+    if (this.auth.currentUser) {
+      await reload(this.auth.currentUser);
+      await getIdToken(this.auth.currentUser, true);
+    }
   }
 
   async signInWithEmailLink(email: string): Promise<UserCredential> {