Merge branch 'master' into sam-gc/cordova-snippets

sam-gc · web-flow · commit 87a86f2bef3d · 2021-10-05T09:45:24.000-07:00
diff --git a/analytics-next/package.json b/analytics-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0"
+    "firebase": "^9.1.0"
   }
 }
diff --git a/appcheck-next/package.json b/appcheck-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0"
+    "firebase": "^9.1.0"
   }
 }
diff --git a/auth-next/custom-dependencies.js b/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]
+}
diff --git a/auth-next/package.json b/auth-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0"
+    "firebase": "^9.1.0"
   }
 }
diff --git a/database-next/package.json b/database-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0"
+    "firebase": "^9.1.0"
   }
 }
diff --git a/firebaseapp-next/package.json b/firebaseapp-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0"
+    "firebase": "^9.1.0"
   }
 }
diff --git a/firestore-next/package.json b/firestore-next/package.json
@@ -6,7 +6,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0",
+    "firebase": "^9.1.0",
     "geofire-common": "^5.1.0"
   },
   "devDependencies": {
diff --git a/firestore/index.html b/firestore/index.html
@@ -12,8 +12,8 @@
 
   <script>mocha.setup('bdd')</script>
 
-  <script src="https://www.gstatic.com/firebasejs/9.0.2/firebase.js"></script>
-  <script src="https://www.gstatic.com/firebasejs/9.0.2/firebase-firestore.js"></script>
+  <script src="https://www.gstatic.com/firebasejs/8.10.0/firebase.js"></script>
+  <script src="https://www.gstatic.com/firebasejs/8.10.0/firebase-firestore.js"></script>
   <script src="test.firestore.js"></script>
   <script src="test.solution-arrays.js"></script>
   <script src="test.solution-counters.js"></script>
diff --git a/functions-next/package.json b/functions-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0"
+    "firebase": "^9.1.0"
   }
 }
diff --git a/messaging-next/package.json b/messaging-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0"
+    "firebase": "^9.1.0"
   }
 }
diff --git a/messaging/service-worker.js b/messaging/service-worker.js
@@ -10,8 +10,8 @@ function initInSw() {
   // Give the service worker access to Firebase Messaging.
   // Note that you can only use Firebase Messaging here. Other Firebase libraries
   // are not available in the service worker.
-  importScripts('https://www.gstatic.com/firebasejs/9.0.2/firebase-app.js');
-  importScripts('https://www.gstatic.com/firebasejs/9.0.2/firebase-messaging.js');
+  importScripts('https://www.gstatic.com/firebasejs/8.10.0/firebase-app.js');
+  importScripts('https://www.gstatic.com/firebasejs/8.10.0/firebase-messaging.js');
 
   // Initialize the Firebase app in the service worker by passing in
   // your app's Firebase config object.
diff --git a/perf-next/package.json b/perf-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0"
+    "firebase": "^9.1.0"
   }
 }
diff --git a/remoteconfig-next/package.json b/remoteconfig-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0"
+    "firebase": "^9.1.0"
   }
 }
diff --git a/snippets/auth-next/custom-dependencies/auth_get_auth_equivalent.js b/snippets/auth-next/custom-dependencies/auth_get_auth_equivalent.js
@@ -0,0 +1,16 @@
+// This snippet file was generated by processing the source file:
+// ./auth-next/custom-dependencies.js
+//
+// To update the snippets in this file, edit the source and then run
+// 'npm run snippets'.
+
+// [START auth_get_auth_equivalent_modular]
+import {initializeAuth, browserLocalPersistence, browserPopupRedirectResolver, browserSessionPersistence, indexedDBLocalPersistence} from "firebase/auth";
+import {initializeApp} from "firebase/app";
+
+const app = initializeApp({/** Your app config */});
+const auth = initializeAuth(app, {
+  persistence: [indexedDBLocalPersistence, browserLocalPersistence, browserSessionPersistence],
+  popupRedirectResolver: browserPopupRedirectResolver,
+});
+// [END auth_get_auth_equivalent_modular]
diff --git a/snippets/auth-next/custom-dependencies/auth_only_browser_local.js b/snippets/auth-next/custom-dependencies/auth_only_browser_local.js
@@ -0,0 +1,16 @@
+// This snippet file was generated by processing the source file:
+// ./auth-next/custom-dependencies.js
+//
+// To update the snippets in this file, edit the source and then run
+// 'npm run snippets'.
+
+// [START auth_only_browser_local_modular]
+import {initializeAuth, browserLocalPersistence} from "firebase/auth";
+import {initializeApp} from "firebase/app";
+
+const app = initializeApp({/** Your app config */});
+const auth = initializeAuth(app, {
+  persistence: browserLocalPersistence,
+  // No popupRedirectResolver defined
+});
+// [END auth_only_browser_local_modular]
diff --git a/snippets/auth-next/custom-dependencies/auth_only_indexed_db.js b/snippets/auth-next/custom-dependencies/auth_only_indexed_db.js
@@ -0,0 +1,16 @@
+// This snippet file was generated by processing the source file:
+// ./auth-next/custom-dependencies.js
+//
+// To update the snippets in this file, edit the source and then run
+// 'npm run snippets'.
+
+// [START auth_only_indexed_db_modular]
+import {initializeAuth, indexedDBLocalPersistence} from "firebase/auth";
+import {initializeApp} from "firebase/app";
+
+const app = initializeApp({/** Your app config */});
+const auth = initializeAuth(app, {
+  persistence: indexedDBLocalPersistence,
+  // No popupRedirectResolver defined
+});
+// [END auth_only_indexed_db_modular]
diff --git a/snippets/auth-next/custom-dependencies/auth_sign_in_redirect_manual_deps.js b/snippets/auth-next/custom-dependencies/auth_sign_in_redirect_manual_deps.js
@@ -0,0 +1,18 @@
+// This snippet file was generated by processing the source file:
+// ./auth-next/custom-dependencies.js
+//
+// To update the snippets in this file, edit the source and then run
+// 'npm run snippets'.
+
+// [START auth_sign_in_redirect_manual_deps_modular]
+import {initializeAuth, browserLocalPersistence, browserPopupRedirectResolver, indexedDBLocalPersistence, signInWithRedirect, GoogleAuthProvider} from "firebase/auth";
+import {initializeApp} from "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_modular]
diff --git a/storage-next/package.json b/storage-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0"
+    "firebase": "^9.1.0"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`},`
`7`	`7`	`"license": "Apache-2.0",`
`8`	`8`	`"dependencies": {`
`9`		`- "firebase": "^9.0.0"`
	`9`	`+ "firebase": "^9.1.0"`
`10`	`10`	`}`
`11`	`11`	`}`