Merge branch '@invertase/v7-development' of https://github.com/firebase/firebaseui-web into @invertase/provider-strategy

Author: Ehesp

examples/react/src/firebase/firebase.ts

@@ -19,15 +19,17 @@
 import { initializeApp, getApps } from "firebase/app";
 import { firebaseConfig } from "./config";
 import { connectAuthEmulator, getAuth } from "firebase/auth";
-import { autoAnonymousLogin, initializeUI } from "@firebase-ui/core";
+import { autoAnonymousLogin, initializeUI, oneTapSignIn } from "@firebase-ui/core";
 
 export const firebaseApp = getApps().length === 0 ? initializeApp(firebaseConfig) : getApps()[0];
 
 export const auth = getAuth(firebaseApp);
 
 export const ui = initializeUI({
   app: firebaseApp,
-  behaviors: [autoAnonymousLogin()],
+  behaviors: [autoAnonymousLogin(), oneTapSignIn({
+    clientId: '200312857118-lscdui98fkaq7ffr81446blafjn5o6r0.apps.googleusercontent.com',
+  })],
 });
 
 if (import.meta.env.MODE === "development") {

packages/core/package.json

@@ -52,6 +52,7 @@
     "zod": "catalog:"
   },
   "devDependencies": {
+    "@types/google-one-tap": "^1.2.6",
     "@types/jsdom": "catalog:",
     "firebase": "catalog:",
     "jsdom": "catalog:",
@@ -60,7 +61,7 @@
     "tsup": "catalog:",
     "typescript": "catalog:",
     "vite": "catalog:",
-    "vitest-tsconfig-paths": "catalog:",
-    "vitest": "catalog:"
+    "vitest": "catalog:",
+    "vitest-tsconfig-paths": "catalog:"
   }
 }

packages/core/src/auth.test.ts

@@ -21,15 +21,16 @@ import {
   sendSignInLinkToEmail as _sendSignInLinkToEmail,
   signInAnonymously as _signInAnonymously,
   signInWithPhoneNumber as _signInWithPhoneNumber,
+  signInWithCredential as _signInWithCredential,
   ActionCodeSettings,
   ApplicationVerifier,
   AuthProvider,
   ConfirmationResult,
   EmailAuthProvider,
   linkWithCredential,
   PhoneAuthProvider,
-  signInWithCredential,
   UserCredential,
+  AuthCredential,
 } from "firebase/auth";
 import { FirebaseUIConfiguration } from "./config";
 import { handleFirebaseError } from "./errors";
@@ -69,7 +70,7 @@ export async function signInWithEmailAndPassword(
     }
 
     ui.setState("pending");
-    const result = await signInWithCredential(ui.auth, credential);
+    const result = await _signInWithCredential(ui.auth, credential);
     return handlePendingCredential(ui, result);
   } catch (error) {
     handleFirebaseError(ui, error);
@@ -137,7 +138,7 @@ export async function confirmPhoneNumber(
     }
 
     ui.setState("pending");
-    const result = await signInWithCredential(ui.auth, credential);
+    const result = await _signInWithCredential(ui.auth, credential);
     return handlePendingCredential(ui, result);
   } catch (error) {
     handleFirebaseError(ui, error);
@@ -181,18 +182,27 @@ export async function signInWithEmailLink(
   email: string,
   link: string
 ): Promise<UserCredential> {
-  try {
-    const credential = EmailAuthProvider.credentialWithLink(email, link);
+  const credential = EmailAuthProvider.credentialWithLink(email, link);
+  return signInWithCredential(ui, credential);
+}
 
+export async function signInWithCredential(
+  ui: FirebaseUIConfiguration,
+  credential: AuthCredential
+): Promise<UserCredential> {
+  try {
     if (hasBehavior(ui, "autoUpgradeAnonymousCredential")) {
-      const result = await getBehavior(ui, "autoUpgradeAnonymousCredential")(ui, credential);
-      if (result) {
-        return handlePendingCredential(ui, result);
+      const userCredential = await getBehavior(ui, "autoUpgradeAnonymousCredential")(ui, credential);
+
+      // If they got here, they're either not anonymous or they've been linked.
+      // If the credential has been linked, we don't need to sign them in, so return early.
+      if (userCredential) {
+        return handlePendingCredential(ui, userCredential);
       }
     }
 
     ui.setState("pending");
-    const result = await signInWithCredential(ui.auth, credential);
+    const result = await _signInWithCredential(ui.auth, credential);
     return handlePendingCredential(ui, result);
   } catch (error) {
     handleFirebaseError(ui, error);

packages/core/src/auth.ts

@@ -4,6 +4,7 @@ import * as anonymousUpgradeHandlers from "./anonymous-upgrade";
 import * as autoAnonymousLoginHandlers from "./auto-anonymous-login";
 import * as recaptchaHandlers from "./recaptcha";
 import * as providerStrategyHandlers from "./provider-strategy";
+import * as oneTapSignInHandlers from "./one-tap";
 import {
   callableBehavior,
   initBehavior,
@@ -25,6 +26,7 @@ type Registry = {
   recaptchaVerification: CallableBehavior<(ui: FirebaseUIConfiguration, element: HTMLElement) => RecaptchaVerifier>;
   providerSignInStrategy: CallableBehavior<providerStrategyHandlers.ProviderSignInStrategyHandler>;
   providerLinkStrategy: CallableBehavior<providerStrategyHandlers.ProviderLinkStrategyHandler>;
+  oneTapSignIn: InitBehavior<(ui: FirebaseUIConfiguration) => ReturnType<typeof oneTapSignInHandlers.oneTapSignInHandler>>;
 };
 
 export type Behavior<T extends keyof Registry = keyof Registry> = Pick<Registry, T>;
@@ -72,6 +74,14 @@ export function providerPopupStrategy(): Behavior<"providerSignInStrategy" | "pr
   };
 }
 
+export type OneTapSignInOptions = oneTapSignInHandlers.OneTapSignInOptions;
+
+export function oneTapSignIn(options: OneTapSignInOptions): Behavior<"oneTapSignIn"> {
+  return {
+    oneTapSignIn: initBehavior((ui) => oneTapSignInHandlers.oneTapSignInHandler(ui, options)),
+  };
+}
+
 export function hasBehavior<T extends keyof Registry>(ui: FirebaseUIConfiguration, key: T): boolean {
   return !!ui.behaviors[key];
 }