Merge pull request #1180 from firebase/@invertase/align-core

Author: Ehesp

packages/core/package.json

@@ -27,10 +27,10 @@
     "format": "prettier --write \"src/**/*.ts\" \"tests/**/*.ts\"",
     "format:check": "prettier --check \"src/**/*.ts\" \"tests/**/*.ts\"",
     "clean": "rimraf dist",
-    "test:unit": "vitest run tests/unit",
-    "test:unit:watch": "vitest tests/unit",
-    "test:integration": "vitest run tests/integration",
-    "test:integration:watch": "vitest tests/integration",
+    "test:unit": "vitest run src",
+    "test:unit:watch": "vitest tests",
+    "test:integration": "vitest run tests",
+    "test:integration:watch": "vitest integration",
     "test": "vitest run",
     "publish:tags": "sh -c 'TAG=\"${npm_package_name}@${npm_package_version}\"; git tag --list \"$TAG\" | grep . || git tag \"$TAG\"; git push origin \"$TAG\"'",
     "release": "pnpm run build && pnpm pack --pack-destination --pack-destination ../../releases/"
@@ -60,6 +60,7 @@
     "tsup": "catalog:",
     "typescript": "catalog:",
     "vite": "catalog:",
+    "vitest-tsconfig-paths": "catalog:",
     "vitest": "catalog:"
   }
 }

packages/core/src/auth.test.ts

@@ -22,13 +22,12 @@ import {
   signInAnonymously as _signInAnonymously,
   signInWithPhoneNumber as _signInWithPhoneNumber,
   ActionCodeSettings,
+  ApplicationVerifier,
   AuthProvider,
   ConfirmationResult,
   EmailAuthProvider,
-  getAuth,
   linkWithCredential,
   PhoneAuthProvider,
-  RecaptchaVerifier,
   signInWithCredential,
   signInWithRedirect,
   UserCredential,
@@ -43,7 +42,7 @@ async function handlePendingCredential(ui: FirebaseUIConfiguration, user: UserCr
 
   try {
     const pendingCred = JSON.parse(pendingCredString);
-    ui.setState("linking");
+    ui.setState("pending");
     const result = await linkWithCredential(user.user, pendingCred);
     ui.setState("idle");
     window.sessionStorage.removeItem("pendingCred");
@@ -60,19 +59,18 @@ export async function signInWithEmailAndPassword(
   password: string
 ): Promise<UserCredential> {
   try {
-    const auth = getAuth(ui.app);
     const credential = EmailAuthProvider.credential(email, password);
 
     if (hasBehavior(ui, "autoUpgradeAnonymousCredential")) {
       const result = await getBehavior(ui, "autoUpgradeAnonymousCredential")(ui, credential);
-
+      
       if (result) {
         return handlePendingCredential(ui, result);
       }
     }
 
-    ui.setState("signing-in");
-    const result = await signInWithCredential(auth, credential);
+    ui.setState("pending");
+    const result = await signInWithCredential(ui.auth, credential);
     return handlePendingCredential(ui, result);
   } catch (error) {
     handleFirebaseError(ui, error);
@@ -87,7 +85,6 @@ export async function createUserWithEmailAndPassword(
   password: string
 ): Promise<UserCredential> {
   try {
-    const auth = getAuth(ui.app);
     const credential = EmailAuthProvider.credential(email, password);
 
     if (hasBehavior(ui, "autoUpgradeAnonymousCredential")) {
@@ -98,8 +95,8 @@ export async function createUserWithEmailAndPassword(
       }
     }
 
-    ui.setState("creating-user");
-    const result = await _createUserWithEmailAndPassword(auth, email, password);
+    ui.setState("pending");
+    const result = await _createUserWithEmailAndPassword(ui.auth, email, password);
     return handlePendingCredential(ui, result);
   } catch (error) {
     handleFirebaseError(ui, error);
@@ -111,12 +108,11 @@ export async function createUserWithEmailAndPassword(
 export async function signInWithPhoneNumber(
   ui: FirebaseUIConfiguration,
   phoneNumber: string,
-  recaptchaVerifier: RecaptchaVerifier
+  appVerifier: ApplicationVerifier
 ): Promise<ConfirmationResult> {
   try {
-    const auth = getAuth(ui.app);
-    ui.setState("signing-in");
-    return await _signInWithPhoneNumber(auth, phoneNumber, recaptchaVerifier);
+    ui.setState("pending");
+    return await _signInWithPhoneNumber(ui.auth, phoneNumber, appVerifier);
   } catch (error) {
     handleFirebaseError(ui, error);
   } finally {
@@ -130,8 +126,7 @@ export async function confirmPhoneNumber(
   verificationCode: string
 ): Promise<UserCredential> {
   try {
-    const auth = getAuth(ui.app);
-    const currentUser = auth.currentUser;
+    const currentUser = ui.auth.currentUser;
     const credential = PhoneAuthProvider.credential(confirmationResult.verificationId, verificationCode);
 
     if (currentUser?.isAnonymous && hasBehavior(ui, "autoUpgradeAnonymousCredential")) {
@@ -142,8 +137,8 @@ export async function confirmPhoneNumber(
       }
     }
 
-    ui.setState("signing-in");
-    const result = await signInWithCredential(auth, credential);
+    ui.setState("pending");
+    const result = await signInWithCredential(ui.auth, credential);
     return handlePendingCredential(ui, result);
   } catch (error) {
     handleFirebaseError(ui, error);
@@ -154,9 +149,8 @@ export async function confirmPhoneNumber(
 
 export async function sendPasswordResetEmail(ui: FirebaseUIConfiguration, email: string): Promise<void> {
   try {
-    const auth = getAuth(ui.app);
-    ui.setState("sending-password-reset-email");
-    await _sendPasswordResetEmail(auth, email);
+    ui.setState("pending");
+    await _sendPasswordResetEmail(ui.auth, email);
   } catch (error) {
     handleFirebaseError(ui, error);
   } finally {
@@ -166,16 +160,15 @@ export async function sendPasswordResetEmail(ui: FirebaseUIConfiguration, email:
 
 export async function sendSignInLinkToEmail(ui: FirebaseUIConfiguration, email: string): Promise<void> {
   try {
-    const auth = getAuth(ui.app);
-
     const actionCodeSettings = {
       url: window.location.href,
       // TODO(ehesp): Check this...
       handleCodeInApp: true,
     } satisfies ActionCodeSettings;
 
-    ui.setState("sending-sign-in-link-to-email");
-    await _sendSignInLinkToEmail(auth, email, actionCodeSettings);
+    ui.setState("pending");
+    await _sendSignInLinkToEmail(ui.auth, email, actionCodeSettings);
+    // TODO: Should this be a behavior ("storageStrategy")?
     window.localStorage.setItem("emailForSignIn", email);
   } catch (error) {
     handleFirebaseError(ui, error);
@@ -190,7 +183,6 @@ export async function signInWithEmailLink(
   link: string
 ): Promise<UserCredential> {
   try {
-    const auth = ui.getAuth();
     const credential = EmailAuthProvider.credentialWithLink(email, link);
 
     if (hasBehavior(ui, "autoUpgradeAnonymousCredential")) {
@@ -200,8 +192,8 @@ export async function signInWithEmailLink(
       }
     }
 
-    ui.setState("signing-in");
-    const result = await signInWithCredential(auth, credential);
+    ui.setState("pending");
+    const result = await signInWithCredential(ui.auth, credential);
     return handlePendingCredential(ui, result);
   } catch (error) {
     handleFirebaseError(ui, error);
@@ -212,9 +204,8 @@ export async function signInWithEmailLink(
 
 export async function signInAnonymously(ui: FirebaseUIConfiguration): Promise<UserCredential> {
   try {
-    const auth = getAuth(ui.app);
-    ui.setState("signing-in");
-    const result = await _signInAnonymously(auth);
+    ui.setState("pending");
+    const result = await _signInAnonymously(ui.auth);
     return handlePendingCredential(ui, result);
   } catch (error) {
     handleFirebaseError(ui, error);
@@ -223,18 +214,18 @@ export async function signInAnonymously(ui: FirebaseUIConfiguration): Promise<Us
   }
 }
 
-export async function signInWithOAuth(ui: FirebaseUIConfiguration, provider: AuthProvider): Promise<void> {
+export async function signInWithProvider(ui: FirebaseUIConfiguration, provider: AuthProvider): Promise<void> {
   try {
-    const auth = getAuth(ui.app);
-
     if (hasBehavior(ui, "autoUpgradeAnonymousProvider")) {
       await getBehavior(ui, "autoUpgradeAnonymousProvider")(ui, provider);
       // If we get to here, the user is not anonymous, otherwise they
       // have been redirected to the provider's sign in page.
     }
 
-    ui.setState("signing-in");
-    await signInWithRedirect(auth, provider);
+    ui.setState("pending");
+
+    // TODO(ehesp): Handle popup or redirect based on behavior
+    await signInWithRedirect(ui.auth, provider);
     // We don't modify state here since the user is redirected.
     // If we support popups, we'd need to modify state here.
   } catch (error) {
@@ -249,17 +240,16 @@ export async function completeEmailLinkSignIn(
   currentUrl: string
 ): Promise<UserCredential | null> {
   try {
-    const auth = ui.getAuth();
-    if (!_isSignInWithEmailLink(auth, currentUrl)) {
+    if (!_isSignInWithEmailLink(ui.auth, currentUrl)) {
       return null;
     }
 
     const email = window.localStorage.getItem("emailForSignIn");
     if (!email) return null;
 
-    ui.setState("signing-in");
+    ui.setState("pending");
     const result = await signInWithEmailLink(ui, email, currentUrl);
-    ui.setState("idle");
+    ui.setState("idle"); // TODO(ehesp): Do we need this here?
     return handlePendingCredential(ui, result);
   } catch (error) {
     handleFirebaseError(ui, error);