Merge branch 'firebase:master' into gregfenton-patch-issue-221

Author: gregfenton

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 12.x
+          - 14.x
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1

analytics-next/index.js

@@ -27,8 +27,7 @@ function logEventParams() {
   const analytics = getAnalytics();
   logEvent(analytics, 'select_content', {
     content_type: 'image',
-    content_id: 'P12453',
-    items: [{ name: 'Kittens' }]
+    content_id: 'P12453'
   });
   // [END analytics_log_event_params]
 }

analytics-next/package.json

@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.8"
+    "firebase": "^9.12.1"
   }
 }

analytics/package.json

@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^8.9.1"
+    "firebase": "^8.10.0"
   }
 }

appcheck-next/package.json

@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.8"
+    "firebase": "^9.12.1"
   }
 }

appcheck/package.json

@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^8.9.1"
+    "firebase": "^8.10.0"
   }
 }

auth-next/apple.js

@@ -38,14 +38,15 @@ function appleSignInPopup(provider) {
       const accessToken = credential.accessToken;
       const idToken = credential.idToken;
 
+      // IdP data available using getAdditionalUserInfo(result)
       // ...
     })
     .catch((error) => {
       // Handle Errors here.
       const errorCode = error.code;
       const errorMessage = error.message;
       // The email of the user's account used.
-      const email = error.email;
+      const email = error.customData.email;
       // The credential that was used.
       const credential = OAuthProvider.credentialFromError(error);
 
@@ -85,7 +86,7 @@ function appleSignInRedirectResult() {
       const errorCode = error.code;
       const errorMessage = error.message;
       // The email of the user's account used.
-      const email = error.email;
+      const email = error.customData.email;
       // The credential that was used.
       const credential = OAuthProvider.credentialFromError(error);
 
@@ -123,7 +124,7 @@ function appleReauthenticatePopup() {
       const errorCode = error.code;
       const errorMessage = error.message;
       // The email of the user's account used.
-      const email = error.email;
+      const email = error.customData.email;
       // The credential that was used.
       const credential = OAuthProvider.credentialFromError(error);
 
@@ -169,7 +170,7 @@ function appleNonceNode() {
       crypto.randomFillSync(buf);
       nonce = decoder.write(buf);
     }
-    return nonce.substr(0, length);
+    return nonce.slice(0, length);
   };
 
   const unhashedNonce = generateNonce(10);

auth-next/cordova.js

@@ -5,15 +5,15 @@
 
 function createGoogleProvider() {
   // [START auth_create_google_provider]
-  const { GoogleAuthProvider } = require("firebase/auth");
+  const { GoogleAuthProvider } = require("firebase/auth/cordova");
 
   const provider = new GoogleAuthProvider();
   // [END auth_create_google_provider]
 }
 
 function cordovaSignInRedirect() {
   // [START auth_cordova_sign_in_redirect]
-  const { getAuth, signInWithRedirect, getRedirectResult, GoogleAuthProvider } = require("firebase/auth");
+  const { getAuth, signInWithRedirect, getRedirectResult, GoogleAuthProvider } = require("firebase/auth/cordova");
 
   const auth = getAuth();
   signInWithRedirect(auth, new GoogleAuthProvider())
@@ -40,7 +40,7 @@ function cordovaSignInRedirect() {
 
 function cordovaRedirectResult() {
   // [START auth_cordova_redirect_result]
-  const { getAuth, getRedirectResult, GoogleAuthProvider } = require("firebase/auth");
+  const { getAuth, getRedirectResult, GoogleAuthProvider } = require("firebase/auth/cordova");
 
   const auth = getAuth();
   getRedirectResult(auth)

auth-next/custom-dependencies.js

@@ -0,0 +1,58 @@
+// [SNIPPET_REGISTRY disabled]
+// [SNIPPETS_SEPARATION enabled]
+
+// Docs: https://source.corp.google.com/piper///depot/google3/third_party/devsite/firebase/en/docs/auth/web/custom-dependencies.md
+
+function getAuthEquivalent() {
+  // [START auth_get_auth_equivalent]
+  const {initializeAuth, browserLocalPersistence, browserPopupRedirectResolver, browserSessionPersistence, indexedDBLocalPersistence} = require("firebase/auth");
+  const {initializeApp} = require("firebase/app");
+
+  const app = initializeApp({/** Your app config */});
+  const auth = initializeAuth(app, {
+    persistence: [indexedDBLocalPersistence, browserLocalPersistence, browserSessionPersistence],
+    popupRedirectResolver: browserPopupRedirectResolver,
+  });
+  // [END auth_get_auth_equivalent]
+}
+
+function onlyBrowserLocal() {
+  // [START auth_only_browser_local]
+  const {initializeAuth, browserLocalPersistence} = require("firebase/auth");
+  const {initializeApp} = require("firebase/app");
+
+  const app = initializeApp({/** Your app config */});
+  const auth = initializeAuth(app, {
+    persistence: browserLocalPersistence,
+    // No popupRedirectResolver defined
+  });
+  // [END auth_only_browser_local]
+}
+
+function onlyIndexedDB() {
+  // [START auth_only_indexed_db]
+  const {initializeAuth, indexedDBLocalPersistence} = require("firebase/auth");
+  const {initializeApp} = require("firebase/app");
+
+  const app = initializeApp({/** Your app config */});
+  const auth = initializeAuth(app, {
+    persistence: indexedDBLocalPersistence,
+    // No popupRedirectResolver defined
+  });
+  // [END auth_only_indexed_db]
+}
+
+function signInRedirectManualDeps() {
+  // [START auth_sign_in_redirect_manual_deps]
+  const {initializeAuth, browserLocalPersistence, browserPopupRedirectResolver, indexedDBLocalPersistence, signInWithRedirect, GoogleAuthProvider} = require("firebase/auth");
+  const {initializeApp} = require("firebase/app");
+
+  const app = initializeApp({/** Your app config */});
+  const auth = initializeAuth(app, {
+    persistence: [indexedDBLocalPersistence, browserLocalPersistence],
+  });
+
+  // Later
+  signInWithRedirect(auth, new GoogleAuthProvider(), browserPopupRedirectResolver);
+  // [END auth_sign_in_redirect_manual_deps]
+}

auth-next/facebook.js

@@ -33,14 +33,15 @@ function facebookSignInPopup(provider) {
       const credential = FacebookAuthProvider.credentialFromResult(result);
       const accessToken = credential.accessToken;
 
+      // IdP data available using getAdditionalUserInfo(result)
       // ...
     })
     .catch((error) => {
       // Handle Errors here.
       const errorCode = error.code;
       const errorMessage = error.message;
       // The email of the user's account used.
-      const email = error.email;
+      const email = error.customData.email;
       // The AuthCredential type that was used.
       const credential = FacebookAuthProvider.credentialFromError(error);
 
@@ -61,12 +62,14 @@ function facebookSignInRedirectResult() {
       const token = credential.accessToken;
 
       const user = result.user;
+      // IdP data available using getAdditionalUserInfo(result)
+      // ...
     }).catch((error) => {
       // Handle Errors here.
       const errorCode = error.code;
       const errorMessage = error.message;
       // The email of the user's account used.
-      const email = error.email;
+      const email = error.customData.email;
       // AuthCredential type that was used.
       const credential = FacebookAuthProvider.credentialFromError(error);
       // ...
@@ -102,7 +105,7 @@ function checkLoginState_wrapper() {
               const errorCode = error.code;
               const errorMessage = error.message;
               // The email of the user's account used.
-              const email = error.email;
+              const email = error.customData.email;
               // The AuthCredential type that was used.
               const credential = FacebookAuthProvider.credentialFromError(error);
               // ...
@@ -156,10 +159,19 @@ function authWithCredential(credential) {
       const errorCode = error.code;
       const errorMessage = error.message;
       // The email of the user's account used.
-      const email = error.email;
+      const email = error.customData.email;
       // The AuthCredential type that was used.
       const credential = FacebookAuthProvider.credentialFromError(error);
       // ...
     });
   // [END auth_facebook_signin_credential]
 }
+
+function facebookProviderCredential(accessToken) {
+  // [START auth_facebook_provider_credential]
+  const { FacebookAuthProvider } = require("firebase/auth");
+
+  const credential = FacebookAuthProvider.credential(accessToken);
+  // [END auth_facebook_provider_credential]
+}
+