Merge branch 'master' into mc/count

Author: morganchen12

analytics-next/package.json

@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.12.1"
+    "firebase": "^10.0.0"
   }
 }

appcheck-next/package.json

@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.12.1"
+    "firebase": "^10.0.0"
   }
 }

auth-next/custom-email-handler.js

@@ -28,8 +28,8 @@ function handleUserManagementQueryParams() {
     // Configure the Firebase SDK.
     // This is the minimum configuration required for the API to be used.
     const config = {
-      'apiKey': "YOU_API_KEY" // Copy this key from the web initialization
-                              // snippet found in the Firebase console.
+      'apiKey': "YOUR_API_KEY" // Copy this key from the web initialization
+                               // snippet found in the Firebase console.
     };
     const app = initializeApp(config);
     const auth = getAuth(app);

auth-next/email-link-auth.js

@@ -19,7 +19,8 @@ function emailLinkActionCodeSettings() {
       installApp: true,
       minimumVersion: '12'
     },
-    dynamicLinkDomain: 'example.page.link'
+    // The domain must be configured in Firebase Hosting and owned by the project.
+    linkDomain: 'custom-domain.com'
   };
   // [END auth_email_link_actioncode_settings]
 }
@@ -68,11 +69,13 @@ function emailLinkComplete() {
       .then((result) => {
         // Clear email from storage.
         window.localStorage.removeItem('emailForSignIn');
-        // You can access the new user via result.user
-        // Additional user info profile not available via:
-        // result.additionalUserInfo.profile == null
+        // You can access the new user by importing getAdditionalUserInfo
+        // and calling it with result:
+        // getAdditionalUserInfo(result)
+        // You can access the user's profile via:
+        // getAdditionalUserInfo(result)?.profile
         // You can check if the user is new or existing:
-        // result.additionalUserInfo.isNewUser
+        // getAdditionalUserInfo(result)?.isNewUser
       })
       .catch((error) => {
         // Some error occurred, you can inspect the code: error.code

auth-next/email.js

@@ -32,7 +32,7 @@ function signUpWithEmailPassword() {
   const auth = getAuth();
   createUserWithEmailAndPassword(auth, email, password)
     .then((userCredential) => {
-      // Signed in 
+      // Signed up 
       const user = userCredential.user;
       // ...
     })

auth-next/emulator-suite.js

@@ -6,7 +6,7 @@ function emulatorConnect() {
   const { getAuth, connectAuthEmulator } = require("firebase/auth");
 
   const auth = getAuth();
-  connectAuthEmulator(auth, "http://localhost:9099");
+  connectAuthEmulator(auth, "http://127.0.0.1:9099");
   // [END auth_emulator_connect]
 }
 

auth-next/index.js

@@ -52,7 +52,7 @@ function authStateListener() {
   onAuthStateChanged(auth, (user) => {
     if (user) {
       // User is signed in, see docs for a list of available properties
-      // https://firebase.google.com/docs/reference/js/firebase.User
+      // https://firebase.google.com/docs/reference/js/v8/firebase.User
       const uid = user.uid;
       // ...
     } else {
@@ -72,7 +72,7 @@ function currentUser() {
 
   if (user) {
     // User is signed in, see docs for a list of available properties
-    // https://firebase.google.com/docs/reference/js/firebase.User
+    // https://firebase.google.com/docs/reference/js/v8/firebase.User
     // ...
   } else {
     // No user is signed in.
@@ -87,7 +87,7 @@ function setLanguageCode() {
   const auth = getAuth();
   auth.languageCode = 'it';
   // To apply the default browser preference instead of explicitly setting it.
-  // firebase.auth().useDeviceLanguage();
+  // auth.useDeviceLanguage();
   // [END auth_set_language_code]
 }
 

auth-next/link-multiple-accounts.js

@@ -182,3 +182,61 @@ function unlink(providerId) {
   });
   // [END auth_unlink_provider]
 }
+
+function accountExistsPopup(auth, facebookProvider, goToApp, promptUserForPassword, promptUserForSignInMethod, getProviderForProviderId) {
+  // [START account_exists_popup]
+  const { signInWithPopup, signInWithEmailAndPassword, linkWithCredential } = require("firebase/auth");
+
+  // User tries to sign in with Facebook.
+  signInWithPopup(auth, facebookProvider).catch((error) => {
+  // User's email already exists.
+  if (error.code === 'auth/account-exists-with-different-credential') {
+    // The pending Facebook credential.
+    const pendingCred = error.credential;
+    // The provider account's email address.
+    const email = error.customData.email;
+    
+    // Present the user with a list of providers they might have
+    // used to create the original account.
+    // Then, ask the user to sign in with the existing provider.
+    const method = promptUserForSignInMethod();
+      
+    if (method === 'password') {
+      // TODO: Ask the user for their password.
+      // In real scenario, you should handle this asynchronously.
+      const password = promptUserForPassword();
+      signInWithEmailAndPassword(auth, email, password).then((result) => {
+        return linkWithCredential(result.user, pendingCred);
+      }).then(() => {
+        // Facebook account successfully linked to the existing user.
+        goToApp();
+      });
+      return;
+    }
+      
+    // All other cases are external providers.
+    // Construct provider object for that provider.
+    // TODO: Implement getProviderForProviderId.
+    const provider = getProviderForProviderId(method);
+    // At this point, you should let the user know that they already have an
+    // account with a different provider, and validate they want to sign in
+    // with the new provider.
+    // Note: Browsers usually block popups triggered asynchronously, so in
+    // real app, you should ask the user to click on a "Continue" button
+    // that will trigger signInWithPopup().
+    signInWithPopup(auth, provider).then((result) => {
+      // Note: Identity Platform doesn't control the provider's sign-in
+      // flow, so it's possible for the user to sign in with an account
+      // with a different email from the first one.
+
+      // Link the Facebook credential. We have access to the pending
+      // credential, so we can directly call the link method.
+      linkWithCredential(result.user, pendingCred).then((userCred) => {
+        // Success.
+        goToApp();
+      });
+    });
+  }
+});
+// [END account_exists_popup]
+}

auth-next/package.json

@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.12.1"
+    "firebase": "^10.0.0"
   }
 }

auth-next/phone-auth.js

@@ -15,13 +15,13 @@ function recaptchaVerifierInvisible() {
   const { getAuth, RecaptchaVerifier } = require("firebase/auth");
 
   const auth = getAuth();
-  window.recaptchaVerifier = new RecaptchaVerifier('sign-in-button', {
+  window.recaptchaVerifier = new RecaptchaVerifier(auth, 'sign-in-button', {
     'size': 'invisible',
     'callback': (response) => {
       // reCAPTCHA solved, allow signInWithPhoneNumber.
       onSignInSubmit();
     }
-  }, auth);
+  });
   // [END auth_phone_recaptcha_verifier_invisible]
 }
 
@@ -30,7 +30,7 @@ function recaptchaVerifierVisible() {
   const { getAuth, RecaptchaVerifier } = require("firebase/auth");
 
   const auth = getAuth();
-  window.recaptchaVerifier = new RecaptchaVerifier('recaptcha-container', {
+  window.recaptchaVerifier = new RecaptchaVerifier(auth, 'recaptcha-container', {
     'size': 'normal',
     'callback': (response) => {
       // reCAPTCHA solved, allow signInWithPhoneNumber.
@@ -40,7 +40,7 @@ function recaptchaVerifierVisible() {
       // Response expired. Ask user to solve reCAPTCHA again.
       // ...
     }
-  }, auth);
+  });
   // [END auth_phone_recaptcha_verifier_visible]
 }
 
@@ -49,7 +49,7 @@ function recaptchaVerifierSimple() {
   const { getAuth, RecaptchaVerifier } = require("firebase/auth");
 
   const auth = getAuth();
-  window.recaptchaVerifier = new RecaptchaVerifier('recaptcha-container', {}, auth);
+  window.recaptchaVerifier = new RecaptchaVerifier(auth, 'recaptcha-container', {});
   // [END auth_phone_recaptcha_verifier_simple]
 }