Merge master into release

google-oss-bot · web-flow · commit 48ad58455036 · 2022-09-14T12:43:10.000-04:00
diff --git a/.changeset/curly-mirrors-occur.md b/.changeset/curly-mirrors-occur.md
@@ -0,0 +1,5 @@
+---
+'@firebase/auth': patch
+---
+
+Included a reference to AuthInternal in MultiFactorSessionImpl.
diff --git a/.changeset/eleven-moons-shave.md b/.changeset/eleven-moons-shave.md
@@ -0,0 +1,8 @@
+---
+"@firebase/firestore": minor
+"@firebase/webchannel-wrapper": minor
+---
+
+Enable encodeInitMessageHeaders. This transitions the Firestore client from encoding HTTP Headers via the Query Param to the request's POST payload. 
+
+Requires Cloud Firestore Emulator v1.14.4 or newer.
diff --git a/.changeset/spotty-pillows-applaud.md b/.changeset/spotty-pillows-applaud.md
@@ -0,0 +1,5 @@
+---
+"@firebase/auth": patch
+---
+
+Update custom claim type of `ParsedToken` to be `any`
diff --git a/common/api-review/auth.api.md b/common/api-review/auth.api.md
@@ -538,7 +538,7 @@ export function parseActionCodeURL(link: string): ActionCodeURL | null;
 
 // @public
 export interface ParsedToken {
-    [key: string]: string | object | undefined;
+    [key: string]: any;
     'auth_time'?: string;
     'exp'?: string;
     'firebase'?: {
diff --git a/packages/auth/karma.conf.js b/packages/auth/karma.conf.js
@@ -54,10 +54,10 @@ function getTestFiles(argv) {
 }
 
 function getTestBrowsers(argv) {
-  let browsers = ["ChromeHeadless"]; 
+  let browsers = ['ChromeHeadless'];
   if (process.env?.BROWSERS && argv.unit) {
     browsers = process.env?.BROWSERS?.split(',');
-  } 
+  }
   return browsers;
 }
 
diff --git a/packages/auth/src/api/account_management/mfa.test.ts b/packages/auth/src/api/account_management/mfa.test.ts
@@ -52,7 +52,7 @@ describe('api/account_management/startEnrollPhoneMfa', () => {
   afterEach(mockFetch.tearDown);
 
   it('should POST to the correct endpoint', async () => {
-    const mock = mockEndpoint(Endpoint.START_PHONE_MFA_ENROLLMENT, {
+    const mock = mockEndpoint(Endpoint.START_MFA_ENROLLMENT, {
       phoneSessionInfo: {
         sessionInfo: 'session-info'
       }
@@ -72,7 +72,7 @@ describe('api/account_management/startEnrollPhoneMfa', () => {
 
   it('should handle errors', async () => {
     const mock = mockEndpoint(
-      Endpoint.START_PHONE_MFA_ENROLLMENT,
+      Endpoint.START_MFA_ENROLLMENT,
       {
         error: {
           code: 400,
@@ -116,7 +116,7 @@ describe('api/account_management/finalizeEnrollPhoneMfa', () => {
   afterEach(mockFetch.tearDown);
 
   it('should POST to the correct endpoint', async () => {
-    const mock = mockEndpoint(Endpoint.FINALIZE_PHONE_MFA_ENROLLMENT, {
+    const mock = mockEndpoint(Endpoint.FINALIZE_MFA_ENROLLMENT, {
       idToken: 'id-token',
       refreshToken: 'refresh-token'
     });
@@ -136,7 +136,7 @@ describe('api/account_management/finalizeEnrollPhoneMfa', () => {
 
   it('should handle errors', async () => {
     const mock = mockEndpoint(
-      Endpoint.FINALIZE_PHONE_MFA_ENROLLMENT,
+      Endpoint.FINALIZE_MFA_ENROLLMENT,
       {
         error: {
           code: 400,
diff --git a/packages/auth/src/api/account_management/mfa.ts b/packages/auth/src/api/account_management/mfa.ts
@@ -71,7 +71,7 @@ export function startEnrollPhoneMfa(
   >(
     auth,
     HttpMethod.POST,
-    Endpoint.START_PHONE_MFA_ENROLLMENT,
+    Endpoint.START_MFA_ENROLLMENT,
     _addTidIfNecessary(auth, request)
   );
 }
@@ -96,7 +96,7 @@ export function finalizeEnrollPhoneMfa(
   >(
     auth,
     HttpMethod.POST,
-    Endpoint.FINALIZE_PHONE_MFA_ENROLLMENT,
+    Endpoint.FINALIZE_MFA_ENROLLMENT,
     _addTidIfNecessary(auth, request)
   );
 }
diff --git a/packages/auth/src/api/authentication/mfa.test.ts b/packages/auth/src/api/authentication/mfa.test.ts
@@ -48,7 +48,7 @@ describe('api/authentication/startSignInPhoneMfa', () => {
   afterEach(mockFetch.tearDown);
 
   it('should POST to the correct endpoint', async () => {
-    const mock = mockEndpoint(Endpoint.START_PHONE_MFA_SIGN_IN, {
+    const mock = mockEndpoint(Endpoint.START_MFA_SIGN_IN, {
       phoneResponseInfo: {
         sessionInfo: 'session-info'
       }
@@ -68,7 +68,7 @@ describe('api/authentication/startSignInPhoneMfa', () => {
 
   it('should handle errors', async () => {
     const mock = mockEndpoint(
-      Endpoint.START_PHONE_MFA_SIGN_IN,
+      Endpoint.START_MFA_SIGN_IN,
       {
         error: {
           code: 400,
@@ -112,7 +112,7 @@ describe('api/authentication/finalizeSignInPhoneMfa', () => {
   afterEach(mockFetch.tearDown);
 
   it('should POST to the correct endpoint', async () => {
-    const mock = mockEndpoint(Endpoint.FINALIZE_PHONE_MFA_SIGN_IN, {
+    const mock = mockEndpoint(Endpoint.FINALIZE_MFA_SIGN_IN, {
       idToken: 'id-token',
       refreshToken: 'refresh-token'
     });
@@ -132,7 +132,7 @@ describe('api/authentication/finalizeSignInPhoneMfa', () => {
 
   it('should handle errors', async () => {
     const mock = mockEndpoint(
-      Endpoint.FINALIZE_PHONE_MFA_SIGN_IN,
+      Endpoint.FINALIZE_MFA_SIGN_IN,
       {
         error: {
           code: 400,
diff --git a/packages/auth/src/api/authentication/mfa.ts b/packages/auth/src/api/authentication/mfa.ts
@@ -68,7 +68,7 @@ export function startSignInPhoneMfa(
   >(
     auth,
     HttpMethod.POST,
-    Endpoint.START_PHONE_MFA_SIGN_IN,
+    Endpoint.START_MFA_SIGN_IN,
     _addTidIfNecessary(auth, request)
   );
 }
@@ -91,7 +91,7 @@ export function finalizeSignInPhoneMfa(
   >(
     auth,
     HttpMethod.POST,
-    Endpoint.FINALIZE_PHONE_MFA_SIGN_IN,
+    Endpoint.FINALIZE_MFA_SIGN_IN,
     _addTidIfNecessary(auth, request)
   );
 }
diff --git a/packages/auth/src/api/index.ts b/packages/auth/src/api/index.ts
@@ -60,10 +60,10 @@ export const enum Endpoint {
   SET_ACCOUNT_INFO = '/v1/accounts:update',
   GET_ACCOUNT_INFO = '/v1/accounts:lookup',
   GET_RECAPTCHA_PARAM = '/v1/recaptchaParams',
-  START_PHONE_MFA_ENROLLMENT = '/v2/accounts/mfaEnrollment:start',
-  FINALIZE_PHONE_MFA_ENROLLMENT = '/v2/accounts/mfaEnrollment:finalize',
-  START_PHONE_MFA_SIGN_IN = '/v2/accounts/mfaSignIn:start',
-  FINALIZE_PHONE_MFA_SIGN_IN = '/v2/accounts/mfaSignIn:finalize',
+  START_MFA_ENROLLMENT = '/v2/accounts/mfaEnrollment:start',
+  FINALIZE_MFA_ENROLLMENT = '/v2/accounts/mfaEnrollment:finalize',
+  START_MFA_SIGN_IN = '/v2/accounts/mfaSignIn:start',
+  FINALIZE_MFA_SIGN_IN = '/v2/accounts/mfaSignIn:finalize',
   WITHDRAW_MFA = '/v2/accounts/mfaEnrollment:withdraw',
   GET_PROJECT_CONFIG = '/v1/projects'
 }
diff --git a/packages/auth/src/core/util/version.test.ts b/packages/auth/src/core/util/version.test.ts
@@ -42,7 +42,9 @@ describe('core/util/_getClientVersion', () => {
     context('worker', () => {
       it('should set the correct version', () => {
         expect(_getClientVersion(ClientPlatform.WORKER)).to.eq(
-          `${_getBrowserName(getUA())}-Worker/JsCore/${SDK_VERSION}/FirebaseCore-web`
+          `${_getBrowserName(
+            getUA()
+          )}-Worker/JsCore/${SDK_VERSION}/FirebaseCore-web`
         );
       });
     });
diff --git a/packages/auth/src/mfa/mfa_resolver.test.ts b/packages/auth/src/mfa/mfa_resolver.test.ts
@@ -114,7 +114,7 @@ describe('core/mfa/mfa_resolver/MultiFactorResolver', () => {
       };
 
       beforeEach(() => {
-        mock = mockEndpoint(Endpoint.FINALIZE_PHONE_MFA_SIGN_IN, {
+        mock = mockEndpoint(Endpoint.FINALIZE_MFA_SIGN_IN, {
           idToken: finalIdToken,
           refreshToken: 'final-refresh-token'
         });
diff --git a/packages/auth/src/mfa/mfa_session.ts b/packages/auth/src/mfa/mfa_session.ts
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { AuthInternal } from '../model/auth';
 import { MultiFactorSession } from '../model/public_types';
 
 export const enum MultiFactorSessionType {
@@ -31,11 +32,19 @@ interface SerializedMultiFactorSession {
 export class MultiFactorSessionImpl implements MultiFactorSession {
   private constructor(
     readonly type: MultiFactorSessionType,
-    readonly credential: string
+    readonly credential: string,
+    readonly auth?: AuthInternal
   ) {}
 
-  static _fromIdtoken(idToken: string): MultiFactorSessionImpl {
-    return new MultiFactorSessionImpl(MultiFactorSessionType.ENROLL, idToken);
+  static _fromIdtoken(
+    idToken: string,
+    auth?: AuthInternal
+  ): MultiFactorSessionImpl {
+    return new MultiFactorSessionImpl(
+      MultiFactorSessionType.ENROLL,
+      idToken,
+      auth
+    );
   }
 
   static _fromMfaPendingCredential(
diff --git a/packages/auth/src/mfa/mfa_user.test.ts b/packages/auth/src/mfa/mfa_user.test.ts
@@ -84,6 +84,12 @@ describe('core/mfa/mfa_user/MultiFactorUser', () => {
       expect(mfaSession.type).to.eq(MultiFactorSessionType.ENROLL);
       expect(mfaSession.credential).to.eq('access-token');
     });
+    it('should contain a reference to auth', async () => {
+      const mfaSession = (await mfaUser.getSession()) as MultiFactorSessionImpl;
+      expect(mfaSession.type).to.eq(MultiFactorSessionType.ENROLL);
+      expect(mfaSession.credential).to.eq('access-token');
+      expect(mfaSession.auth).to.eq(auth);
+    });
   });
 
   describe('enroll', () => {
diff --git a/packages/auth/src/mfa/mfa_user.ts b/packages/auth/src/mfa/mfa_user.ts
@@ -49,7 +49,10 @@ export class MultiFactorUserImpl implements MultiFactorUser {
   }
 
   async getSession(): Promise<MultiFactorSession> {
-    return MultiFactorSessionImpl._fromIdtoken(await this.user.getIdToken());
+    return MultiFactorSessionImpl._fromIdtoken(
+      await this.user.getIdToken(),
+      this.user.auth
+    );
   }
 
   async enroll(
diff --git a/packages/auth/src/model/public_types.ts b/packages/auth/src/model/public_types.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
 import { FirebaseApp } from '@firebase/app';
 import {
   CompleteFn,
@@ -104,7 +106,7 @@ export interface ParsedToken {
     'identities'?: Record<string, string>;
   };
   /** Map of any additional custom claims. */
-  [key: string]: string | object | undefined;
+  [key: string]: any;
 }
 
 /**
diff --git a/packages/auth/src/platform_browser/mfa/assertions/phone.test.ts b/packages/auth/src/platform_browser/mfa/assertions/phone.test.ts
@@ -58,12 +58,15 @@ describe('platform_browser/mfa/phone', () => {
 
   describe('enroll', () => {
     beforeEach(() => {
-      session = MultiFactorSessionImpl._fromIdtoken('enrollment-id-token');
+      session = MultiFactorSessionImpl._fromIdtoken(
+        'enrollment-id-token',
+        auth
+      );
     });
 
     it('should finalize the MFA enrollment', async () => {
       const mock = mockEndpoint(
-        Endpoint.FINALIZE_PHONE_MFA_ENROLLMENT,
+        Endpoint.FINALIZE_MFA_ENROLLMENT,
         serverResponse
       );
       const response = await assertion._process(auth, session);
@@ -75,12 +78,13 @@ describe('platform_browser/mfa/phone', () => {
           sessionInfo: 'verification-id'
         }
       });
+      expect(session.auth).to.eql(auth);
     });
 
     context('with display name', () => {
       it('should set the display name', async () => {
         const mock = mockEndpoint(
-          Endpoint.FINALIZE_PHONE_MFA_ENROLLMENT,
+          Endpoint.FINALIZE_MFA_ENROLLMENT,
           serverResponse
         );
         const response = await assertion._process(
@@ -97,6 +101,7 @@ describe('platform_browser/mfa/phone', () => {
             sessionInfo: 'verification-id'
           }
         });
+        expect(session.auth).to.eql(auth);
       });
     });
   });
@@ -109,10 +114,7 @@ describe('platform_browser/mfa/phone', () => {
     });
 
     it('should finalize the MFA sign in', async () => {
-      const mock = mockEndpoint(
-        Endpoint.FINALIZE_PHONE_MFA_SIGN_IN,
-        serverResponse
-      );
+      const mock = mockEndpoint(Endpoint.FINALIZE_MFA_SIGN_IN, serverResponse);
       const response = await assertion._process(auth, session);
       expect(response).to.eql(serverResponse);
       expect(mock.calls[0].request).to.eql({
@@ -122,6 +124,7 @@ describe('platform_browser/mfa/phone', () => {
           sessionInfo: 'verification-id'
         }
       });
+      expect(session.auth).to.eql(undefined);
     });
   });
 });
diff --git a/packages/auth/src/platform_browser/persistence/session_storage.test.ts b/packages/auth/src/platform_browser/persistence/session_storage.test.ts
@@ -66,8 +66,8 @@ describe('platform_browser/persistence/session_storage', () => {
       afterEach(() => sinon.restore());
 
       it('should emit false if sessionStorage setItem throws', async () => {
-      sinon.stub(Storage.prototype, 'setItem').throws(new Error('nope'));
-      expect(await persistence._isAvailable()).to.be.false;
+        sinon.stub(Storage.prototype, 'setItem').throws(new Error('nope'));
+        expect(await persistence._isAvailable()).to.be.false;
       });
 
       it('should emit false if sessionStorage removeItem throws', async () => {
diff --git a/packages/auth/src/platform_browser/strategies/phone.test.ts b/packages/auth/src/platform_browser/strategies/phone.test.ts
@@ -323,7 +323,7 @@ describe('platform_browser/strategies/phone', () => {
       });
 
       it('works with an enrollment flow', async () => {
-        const endpoint = mockEndpoint(Endpoint.START_PHONE_MFA_ENROLLMENT, {
+        const endpoint = mockEndpoint(Endpoint.START_MFA_ENROLLMENT, {
           phoneSessionInfo: {
             sessionInfo: 'session-info'
           }
@@ -345,7 +345,7 @@ describe('platform_browser/strategies/phone', () => {
       });
 
       it('works when completing the sign in flow', async () => {
-        const endpoint = mockEndpoint(Endpoint.START_PHONE_MFA_SIGN_IN, {
+        const endpoint = mockEndpoint(Endpoint.START_MFA_SIGN_IN, {
           phoneResponseInfo: {
             sessionInfo: 'session-info'
           }
diff --git a/packages/auth/src/platform_cordova/popup_redirect/events.test.ts b/packages/auth/src/platform_cordova/popup_redirect/events.test.ts
@@ -73,8 +73,10 @@ describe('platform_cordova/popup_redirect/events', () => {
       const spy = sinon.spy(Storage.prototype, 'setItem');
       const event = _generateNewEvent(auth, AuthEventType.REAUTH_VIA_REDIRECT);
       await _savePartialEvent(auth, event);
-      expect(spy).to.have.been.calledWith('firebase:authEvent:test-api-key:test-app',
-      JSON.stringify(event));
+      expect(spy).to.have.been.calledWith(
+        'firebase:authEvent:test-api-key:test-app',
+        JSON.stringify(event)
+      );
     });
   });
 
diff --git a/packages/firestore/src/local/index_backfiller.ts b/packages/firestore/src/local/index_backfiller.ts
@@ -35,10 +35,10 @@ import { isIndexedDbTransactionError } from './simple_db';
 const LOG_TAG = 'IndexBackiller';
 
 /** How long we wait to try running index backfill after SDK initialization. */
-const INITIAL_BACKFILL_DELAY_MS = 15;
+const INITIAL_BACKFILL_DELAY_MS = 15 * 1000;
 
 /** Minimum amount of time between backfill checks, after the first one. */
-const REGULAR_BACKFILL_DELAY_MS = 1;
+const REGULAR_BACKFILL_DELAY_MS = 60 * 1000;
 
 /** The maximum number of documents to process each time backfill() is called. */
 const MAX_DOCUMENTS_TO_PROCESS = 50;
diff --git a/packages/firestore/src/platform/browser/webchannel_connection.ts b/packages/firestore/src/platform/browser/webchannel_connection.ts
diff --git a/packages/webchannel-wrapper/externs/overrides.js b/packages/webchannel-wrapper/externs/overrides.js
diff --git a/packages/webchannel-wrapper/package.json b/packages/webchannel-wrapper/package.json
diff --git a/packages/webchannel-wrapper/src/index.d.ts b/packages/webchannel-wrapper/src/index.d.ts
diff --git a/scripts/emulator-testing/emulators/firestore-emulator.ts b/scripts/emulator-testing/emulators/firestore-emulator.ts
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@firebase/auth': patch
 +---
++
 +Included a reference to AuthInternal in MultiFactorSessionImpl.
Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,10 @@ function getTestFiles(argv) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`function getTestBrowsers(argv) {`
`57`		`- let browsers = ["ChromeHeadless"];`
	`57`	`+ let browsers = ['ChromeHeadless'];`
`58`	`58`	`if (process.env?.BROWSERS && argv.unit) {`
`59`	`59`	`browsers = process.env?.BROWSERS?.split(',');`
`60`		`- }`
	`60`	`+ }`
`61`	`61`	`return browsers;`
`62`	`62`	`}`
`63`	`63`