Merge branch 'mrschmidt/readtime' into mrschmidt/fieldindex

Author: schmidt-sebastian

.changeset/curvy-brooms-clean.md

@@ -0,0 +1,5 @@
+---
+"@firebase/auth": patch
+---
+
+Fix bug where `user.providerData` field was being improperly initialized

common/api-review/auth.api.md

@@ -601,6 +601,11 @@ export class PhoneMultiFactorGenerator {
     static FACTOR_ID: string;
 }
 
+// @public
+export interface PhoneMultiFactorInfo extends MultiFactorInfo {
+    readonly phoneNumber: string;
+}
+
 // @public
 export interface PhoneMultiFactorSignInInfoOptions {
     multiFactorHint?: MultiFactorInfo;

integration/compat-interop/package.json

@@ -8,14 +8,14 @@
     "test:debug": "karma start --browsers Chrome --auto-watch"
   },
   "dependencies": {
-    "@firebase/app": "0.7.14",
-    "@firebase/app-compat": "0.1.15",
+    "@firebase/app": "0.7.15",
+    "@firebase/app-compat": "0.1.16",
     "@firebase/analytics": "0.7.5",
     "@firebase/analytics-compat": "0.1.6",
-    "@firebase/auth": "0.19.6",
-    "@firebase/auth-compat": "0.2.6",
-    "@firebase/functions": "0.7.7",
-    "@firebase/functions-compat": "0.1.8",
+    "@firebase/auth": "0.19.7",
+    "@firebase/auth-compat": "0.2.7",
+    "@firebase/functions": "0.7.8",
+    "@firebase/functions-compat": "0.1.9",
     "@firebase/messaging": "0.9.7",
     "@firebase/messaging-compat": "0.1.7",
     "@firebase/performance": "0.5.5",

integration/firebase/package.json

@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
   },
   "devDependencies": {
-    "firebase": "9.6.4",
+    "firebase": "9.6.5",
     "@types/chai": "4.2.22",
     "@types/mocha": "9.0.0",
     "chai": "4.3.4",

integration/firestore/package.json

@@ -15,8 +15,8 @@
     "test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
   },
   "dependencies": {
-    "@firebase/app": "0.7.14",
-    "@firebase/firestore": "3.4.3"
+    "@firebase/app": "0.7.15",
+    "@firebase/firestore": "3.4.4"
   },
   "devDependencies": {
     "@types/mocha": "9.0.0",

integration/messaging/package.json

@@ -9,13 +9,13 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "9.6.4",
+    "firebase": "9.6.5",
     "chai": "4.3.4",
     "chromedriver": "94.0.0",
     "express": "4.17.1",
     "geckodriver": "2.0.4",
     "mocha": "9.1.1",
-    "node-fetch": "2.6.5",
+    "node-fetch": "2.6.7",
     "selenium-assistant": "6.1.0"
   }
 }

packages/analytics-compat/package.json

@@ -23,7 +23,7 @@
     "@firebase/app-compat": "0.x"
   },
   "devDependencies": {
-    "@firebase/app-compat": "0.1.15",
+    "@firebase/app-compat": "0.1.16",
     "rollup": "2.57.0",
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.30.0",

packages/analytics/package.json

@@ -47,7 +47,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.7.14",
+    "@firebase/app": "0.7.15",
     "rollup": "2.57.0",
     "@rollup/plugin-commonjs": "21.0.0",
     "@rollup/plugin-json": "4.1.0",

packages/app-check-compat/package.json

@@ -42,7 +42,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app-compat": "0.1.15",
+    "@firebase/app-compat": "0.1.16",
     "rollup": "2.57.0",
     "@rollup/plugin-commonjs": "21.0.0",
     "@rollup/plugin-json": "4.1.0",

packages/app-check/package.json

@@ -44,7 +44,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.7.14",
+    "@firebase/app": "0.7.15",
     "rollup": "2.57.0",
     "@rollup/plugin-commonjs": "21.0.0",
     "@rollup/plugin-json": "4.1.0",

packages/app-compat/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @firebase/app-compat
 
+## 0.1.16
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @firebase/app@0.7.15
+
 ## 0.1.15
 
 ### Patch Changes

packages/app-compat/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/app-compat",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "The primary entrypoint to the Firebase JS SDK",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -39,7 +39,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@firebase/app": "0.7.14",
+    "@firebase/app": "0.7.15",
     "@firebase/util": "1.4.3",
     "@firebase/logger": "0.3.2",
     "@firebase/component": "0.5.10",

packages/app/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @firebase/app
 
+## 0.7.15
+
+### Patch Changes
+
+- Update SDK_VERSION.
+
 ## 0.7.14
 
 ### Patch Changes

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/app",
-  "version": "0.7.14",
+  "version": "0.7.15",
   "description": "The primary entrypoint to the Firebase JS SDK",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",

packages/auth-compat/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @firebase/auth-compat
 
+## 0.2.7
+
+### Patch Changes
+
+- [`4983f4d5a`](https://github.com/firebase/firebase-js-sdk/commit/4983f4d5a0dc385c5b3e042ace44c8204d3cce81) [#5923](https://github.com/firebase/firebase-js-sdk/pull/5923) - Fix errors in compatibility layer when cookies are fully disabled in Chrome
+
+* [`d612d6f6e`](https://github.com/firebase/firebase-js-sdk/commit/d612d6f6e4d3113d45427b7df68459c0a3e31a1f) [#5928](https://github.com/firebase/firebase-js-sdk/pull/5928) - Upgrade `node-fetch` dependency due to a security issue.
+
+* Updated dependencies [[`4983f4d5a`](https://github.com/firebase/firebase-js-sdk/commit/4983f4d5a0dc385c5b3e042ace44c8204d3cce81), [`d612d6f6e`](https://github.com/firebase/firebase-js-sdk/commit/d612d6f6e4d3113d45427b7df68459c0a3e31a1f), [`e04b7452b`](https://github.com/firebase/firebase-js-sdk/commit/e04b7452bae10e6525cfb9c551f76a1aa98f9078), [`2820674b8`](https://github.com/firebase/firebase-js-sdk/commit/2820674b848e918ab164e7d0ec9d5b838bbfa6e0)]:
+  - @firebase/auth@0.19.7
+
 ## 0.2.6
 
 ### Patch Changes

packages/auth-compat/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/auth-compat",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "FirebaseAuth compatibility package that uses API style compatible with Firebase@8 and prior versions",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
@@ -43,17 +43,17 @@
     "@firebase/app-compat": "0.x"
   },
   "dependencies": {
-    "@firebase/auth": "0.19.6",
+    "@firebase/auth": "0.19.7",
     "@firebase/auth-types": "0.11.0",
     "@firebase/component": "0.5.10",
     "@firebase/util": "1.4.3",
-    "node-fetch": "2.6.5",
+    "node-fetch": "2.6.7",
     "selenium-webdriver": "^4.0.0-beta.2",
     "tslib": "^2.1.0"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app-compat": "0.1.15",
+    "@firebase/app-compat": "0.1.16",
     "@rollup/plugin-json": "4.1.0",
     "rollup": "2.57.0",
     "rollup-plugin-replace": "2.2.0",

packages/auth-compat/src/auth.test.ts

@@ -23,9 +23,14 @@ import * as sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import { Auth } from './auth';
 import { CompatPopupRedirectResolver } from './popup_redirect';
+import * as platform from './platform';
 
 use(sinonChai);
 
+function delay(ms: number): Promise<void> {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
 // For the most part, the auth methods just call straight through. Some parts
 // of the auth compat layer are more complicated: these tests cover those
 describe('auth compat', () => {
@@ -45,7 +50,7 @@ describe('auth compat', () => {
     });
 
     afterEach(() => {
-      sinon.restore;
+      sinon.restore();
     });
 
     it('saves the persistence into session storage if available', async () => {
@@ -75,6 +80,40 @@ describe('auth compat', () => {
       }
     });
 
+    it('does not save persistence if property throws DOMException', async () => {
+      if (typeof self !== 'undefined') {
+        sinon.stub(platform, '_getSelfWindow').returns({
+          get sessionStorage(): Storage {
+            throw new DOMException('Nope!');
+          }
+        } as unknown as Window);
+        const setItemSpy = sinon.spy(sessionStorage, 'setItem');
+        sinon.stub(underlyingAuth, '_getPersistence').returns('TEST');
+        sinon
+          .stub(underlyingAuth, '_initializationPromise')
+          .value(Promise.resolve());
+        sinon.stub(
+          exp._getInstance<exp.PopupRedirectResolverInternal>(
+            CompatPopupRedirectResolver
+          ),
+          '_openRedirect'
+        );
+        providerStub.isInitialized.returns(true);
+        providerStub.getImmediate.returns(underlyingAuth);
+        const authCompat = new Auth(
+          app,
+          providerStub as unknown as Provider<'auth'>
+        );
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        await authCompat.signInWithRedirect(new exp.GoogleAuthProvider());
+        await delay(50);
+        expect(setItemSpy).not.to.have.been.calledWith(
+          'firebase:persistence:api-key:undefined',
+          'TEST'
+        );
+      }
+    });
+
     it('pulls the persistence and sets as the main persitsence if set', () => {
       if (typeof self !== 'undefined') {
         sessionStorage.setItem(
@@ -98,5 +137,35 @@ describe('auth compat', () => {
         });
       }
     });
+
+    it('does not die if sessionStorage errors', async () => {
+      if (typeof self !== 'undefined') {
+        sinon.stub(platform, '_getSelfWindow').returns({
+          get sessionStorage(): Storage {
+            throw new DOMException('Nope!');
+          }
+        } as unknown as Window);
+        sessionStorage.setItem(
+          'firebase:persistence:api-key:undefined',
+          'none'
+        );
+        providerStub.isInitialized.returns(false);
+        providerStub.initialize.returns(underlyingAuth);
+        new Auth(app, providerStub as unknown as Provider<'auth'>);
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        await delay(50);
+        expect(providerStub.initialize).to.have.been.calledWith({
+          options: {
+            popupRedirectResolver: CompatPopupRedirectResolver,
+            persistence: [
+              exp.indexedDBLocalPersistence,
+              exp.browserLocalPersistence,
+              exp.browserSessionPersistence,
+              exp.inMemoryPersistence
+            ]
+          }
+        });
+      }
+    });
   });
 });

packages/auth-compat/src/persistence.ts

@@ -17,7 +17,7 @@
 
 import * as exp from '@firebase/auth/internal';
 import { isIndexedDBAvailable, isNode, isReactNative } from '@firebase/util';
-import { _isWebStorageSupported, _isWorker } from './platform';
+import { _getSelfWindow, _isWebStorageSupported, _isWorker } from './platform';
 
 export const Persistence = {
   LOCAL: 'local',
@@ -84,29 +84,28 @@ export async function _savePersistenceForRedirect(
   auth: exp.AuthInternal
 ): Promise<void> {
   await auth._initializationPromise;
-
-  const win = getSelfWindow();
+  const session = getSessionStorageIfAvailable();
   const key = exp._persistenceKeyName(
     PERSISTENCE_KEY,
     auth.config.apiKey,
     auth.name
   );
-  if (win?.sessionStorage) {
-    win.sessionStorage.setItem(key, auth._getPersistence());
+  if (session) {
+    session.setItem(key, auth._getPersistence());
   }
 }
 
 export function _getPersistencesFromRedirect(
   apiKey: string,
   appName: string
 ): exp.Persistence[] {
-  const win = getSelfWindow();
-  if (!win?.sessionStorage) {
+  const session = getSessionStorageIfAvailable();
+  if (!session) {
     return [];
   }
 
   const key = exp._persistenceKeyName(PERSISTENCE_KEY, apiKey, appName);
-  const persistence = win.sessionStorage.getItem(key);
+  const persistence = session.getItem(key);
 
   switch (persistence) {
     case Persistence.NONE:
@@ -120,6 +119,11 @@ export function _getPersistencesFromRedirect(
   }
 }
 
-function getSelfWindow(): Window | null {
-  return typeof window !== 'undefined' ? window : null;
+/** Returns session storage, or null if the property access errors */
+function getSessionStorageIfAvailable(): Storage | null {
+  try {
+    return _getSelfWindow()?.sessionStorage || null;
+  } catch (e) {
+    return null;
+  }
 }

packages/auth-compat/src/platform.ts

@@ -171,3 +171,7 @@ export async function _isCordova(): Promise<boolean> {
     });
   });
 }
+
+export function _getSelfWindow(): Window | null {
+  return typeof window !== 'undefined' ? window : null;
+}

packages/auth/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @firebase/auth
 
+## 0.19.7
+
+### Patch Changes
+
+- [`4983f4d5a`](https://github.com/firebase/firebase-js-sdk/commit/4983f4d5a0dc385c5b3e042ace44c8204d3cce81) [#5923](https://github.com/firebase/firebase-js-sdk/pull/5923) - Fix errors in compatibility layer when cookies are fully disabled in Chrome
+
+* [`d612d6f6e`](https://github.com/firebase/firebase-js-sdk/commit/d612d6f6e4d3113d45427b7df68459c0a3e31a1f) [#5928](https://github.com/firebase/firebase-js-sdk/pull/5928) - Upgrade `node-fetch` dependency due to a security issue.
+
+- [`e04b7452b`](https://github.com/firebase/firebase-js-sdk/commit/e04b7452bae10e6525cfb9c551f76a1aa98f9078) [#5924](https://github.com/firebase/firebase-js-sdk/pull/5924) (fixes [#5922](https://github.com/firebase/firebase-js-sdk/issues/5922)) - Add missing PhoneMultiFactorInfo public interface
+
+* [`2820674b8`](https://github.com/firebase/firebase-js-sdk/commit/2820674b848e918ab164e7d0ec9d5b838bbfa6e0) [#5927](https://github.com/firebase/firebase-js-sdk/pull/5927) - Prevent React Native from logging a warning about deprecation of `AsyncStorage` if the developer has provided the non-deprecated version.
+
 ## 0.19.6
 
 ### Patch Changes