Merge branch 'master' into Fixing-interdependency-in-mfa-totp-Integra…

…tion-tests-ax
firebase · Jun 12, 2023 · c114277 · c114277
2 parents 51ab498 + e522056
commit c114277
Show file tree

Hide file tree

Showing 46 changed files with 116 additions and 74 deletions.
diff --git a/.changeset/giant-bees-clean.md b/.changeset/giant-bees-clean.md
diff --git a/.changeset/shaggy-donkeys-know.md b/.changeset/shaggy-donkeys-know.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report_v2.yaml b/.github/ISSUE_TEMPLATE/bug_report_v2.yaml
@@ -1,7 +1,7 @@
 name: 🐞 Bug Report
 description: File a bug report
 title: 'Title for the bug'
-labels: 'new, type: question'
+labels: 'question, new'
 body:
   - type: markdown
     id: before-you-start

diff --git a/integration/compat-interop/package.json b/integration/compat-interop/package.json
@@ -8,8 +8,8 @@
     "test:debug": "karma start --browsers Chrome --auto-watch"
   },
   "dependencies": {
-    "@firebase/app": "0.9.11",
-    "@firebase/app-compat": "0.2.11",
+    "@firebase/app": "0.9.12",
+    "@firebase/app-compat": "0.2.12",
     "@firebase/analytics": "0.10.0",
     "@firebase/analytics-compat": "0.2.6",
     "@firebase/auth": "0.23.2",

diff --git a/integration/firebase/package.json b/integration/firebase/package.json
@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
   },
   "devDependencies": {
-    "firebase": "9.22.1",
+    "firebase": "9.22.2",
     "@types/chai": "4.3.4",
     "@types/mocha": "9.1.1",
     "chai": "4.3.7",

diff --git a/integration/firestore/package.json b/integration/firestore/package.json
@@ -15,8 +15,8 @@
     "test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
   },
   "dependencies": {
-    "@firebase/app": "0.9.11",
-    "@firebase/firestore": "3.12.1"
+    "@firebase/app": "0.9.12",
+    "@firebase/firestore": "3.12.2"
   },
   "devDependencies": {
     "@types/mocha": "9.1.1",

diff --git a/integration/messaging/package.json b/integration/messaging/package.json
@@ -9,7 +9,7 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "9.22.1",
+    "firebase": "9.22.2",
     "chai": "4.3.7",
     "chromedriver": "98.0.1",
     "express": "4.18.2",

diff --git a/packages/analytics-compat/package.json b/packages/analytics-compat/package.json
@@ -24,7 +24,7 @@
     "@firebase/app-compat": "0.x"
   },
   "devDependencies": {
-    "@firebase/app-compat": "0.2.11",
+    "@firebase/app-compat": "0.2.12",
     "rollup": "2.79.1",
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.31.2",

diff --git a/packages/analytics/package.json b/packages/analytics/package.json
@@ -48,7 +48,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.9.11",
+    "@firebase/app": "0.9.12",
     "rollup": "2.79.1",
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",

diff --git a/packages/app-check-compat/package.json b/packages/app-check-compat/package.json
@@ -44,7 +44,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app-compat": "0.2.11",
+    "@firebase/app-compat": "0.2.12",
     "rollup": "2.79.1",
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",

diff --git a/packages/app-check/package.json b/packages/app-check/package.json
@@ -45,7 +45,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.9.11",
+    "@firebase/app": "0.9.12",
     "rollup": "2.79.1",
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",

diff --git a/packages/app-compat/CHANGELOG.md b/packages/app-compat/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @firebase/app-compat
 
+## 0.2.12
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @firebase/app@0.9.12
+
 ## 0.2.11
 
 ### Patch Changes

diff --git a/packages/app-compat/package.json b/packages/app-compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/app-compat",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "The primary entrypoint to the Firebase JS SDK",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -40,7 +40,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@firebase/app": "0.9.11",
+    "@firebase/app": "0.9.12",
     "@firebase/util": "1.9.3",
     "@firebase/logger": "0.4.0",
     "@firebase/component": "0.6.4",

diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @firebase/app
 
+## 0.9.12
+
+### Patch Changes
+
+- Update SDK_VERSION.
+
 ## 0.9.11
 
 ### Patch Changes

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/app",
-  "version": "0.9.11",
+  "version": "0.9.12",
   "description": "The primary entrypoint to the Firebase JS SDK",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",

diff --git a/packages/auth-compat/package.json b/packages/auth-compat/package.json
@@ -59,7 +59,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app-compat": "0.2.11",
+    "@firebase/app-compat": "0.2.12",
     "@rollup/plugin-json": "4.1.0",
     "rollup": "2.79.1",
     "rollup-plugin-replace": "2.2.0",

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -119,7 +119,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.9.11",
+    "@firebase/app": "0.9.12",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-strip": "2.1.0",
     "chromedriver": "98.0.1",

diff --git a/packages/auth/src/mfa/assertions/totp.test.ts b/packages/auth/src/mfa/assertions/totp.test.ts
@@ -38,6 +38,8 @@ import { MultiFactorAssertionImpl } from '../mfa_assertion';
 
 use(chaiAsPromised);
 
+const fakeUid: string = 'uid';
+
 describe('core/mfa/assertions/totp/TotpMultiFactorGenerator', () => {
   let auth: TestAuth;
   let session: MultiFactorSessionImpl;
@@ -82,7 +84,7 @@ describe('core/mfa/assertions/totp/TotpMultiFactorGenerator', () => {
     });
     afterEach(mockFetch.tearDown);
 
-    it('should throw error if auth instance is not found in mfaSession', async () => {
+    it('should throw error if user instance is not found in mfaSession', async () => {
       try {
         session = MultiFactorSessionImpl._fromIdtoken(
           'enrollment-id-token',
@@ -100,9 +102,10 @@ describe('core/mfa/assertions/totp/TotpMultiFactorGenerator', () => {
       );
 
       auth = await testAuth();
+      const user = await testUser(auth, fakeUid);
       session = MultiFactorSessionImpl._fromIdtoken(
         'enrollment-id-token',
-        auth
+        user
       );
       const secret = await TotpMultiFactorGenerator.generateSecret(session);
       expect(mock.calls[0].request).to.eql({
@@ -159,10 +162,11 @@ describe('core/mfa/totp/assertions/TotpMultiFactorAssertionImpl', () => {
   afterEach(mockFetch.tearDown);
 
   describe('enroll', () => {
+    const user = testUser(auth, fakeUid);
     beforeEach(() => {
       session = MultiFactorSessionImpl._fromIdtoken(
         'enrollment-id-token',
-        auth
+        user
       );
     });
 
@@ -180,7 +184,8 @@ describe('core/mfa/totp/assertions/TotpMultiFactorAssertionImpl', () => {
           sessionInfo: 'verification-id'
         }
       });
-      expect(session.auth).to.eql(auth);
+      expect(session.user).to.not.be.undefined;
+      expect(session.user).to.eql(user);
     });
 
     context('with display name', () => {
@@ -203,7 +208,8 @@ describe('core/mfa/totp/assertions/TotpMultiFactorAssertionImpl', () => {
             sessionInfo: 'verification-id'
           }
         });
-        expect(session.auth).to.eql(auth);
+        expect(session.user).to.not.be.undefined;
+        expect(session.user).to.eql(user);
       });
     });
   });
@@ -299,7 +305,7 @@ describe('core/mfa/assertions/totp/TotpSecret', async () => {
   describe('generateQrCodeUrl', () => {
     beforeEach(async () => {
       await auth.updateCurrentUser(
-        testUser(_castAuth(auth), 'uid', fakeEmail, true)
+        testUser(_castAuth(auth), fakeUid, fakeEmail, true)
       );
     });
 

diff --git a/packages/auth/src/mfa/assertions/totp.ts b/packages/auth/src/mfa/assertions/totp.ts
@@ -91,16 +91,16 @@ export class TotpMultiFactorGenerator {
   ): Promise<TotpSecret> {
     const mfaSession = session as MultiFactorSessionImpl;
     _assert(
-      typeof mfaSession.auth !== 'undefined',
+      typeof mfaSession.user?.auth !== 'undefined',
       AuthErrorCode.INTERNAL_ERROR
     );
-    const response = await startEnrollTotpMfa(mfaSession.auth, {
+    const response = await startEnrollTotpMfa(mfaSession.user.auth, {
       idToken: mfaSession.credential,
       totpEnrollmentInfo: {}
     });
     return TotpSecret._fromStartTotpMfaEnrollmentResponse(
       response,
-      mfaSession.auth
+      mfaSession.user.auth
     );
   }
 

diff --git a/packages/auth/src/mfa/mfa_session.ts b/packages/auth/src/mfa/mfa_session.ts
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { AuthInternal } from '../model/auth';
+
+import { UserInternal } from '../model/user';
 import { MultiFactorSession } from '../model/public_types';
 
 export const enum MultiFactorSessionType {
@@ -33,17 +34,17 @@ export class MultiFactorSessionImpl implements MultiFactorSession {
   private constructor(
     readonly type: MultiFactorSessionType,
     readonly credential: string,
-    readonly auth?: AuthInternal
+    readonly user?: UserInternal
   ) {}
 
   static _fromIdtoken(
     idToken: string,
-    auth?: AuthInternal
+    user?: UserInternal
   ): MultiFactorSessionImpl {
     return new MultiFactorSessionImpl(
       MultiFactorSessionType.ENROLL,
       idToken,
-      auth
+      user
     );
   }
 

diff --git a/packages/auth/src/mfa/mfa_user.test.ts b/packages/auth/src/mfa/mfa_user.test.ts
@@ -88,7 +88,7 @@ describe('core/mfa/mfa_user/MultiFactorUser', () => {
       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);
+      expect(mfaSession.user?.auth).to.eq(auth);
     });
   });
 

diff --git a/packages/auth/src/mfa/mfa_user.ts b/packages/auth/src/mfa/mfa_user.ts
@@ -50,7 +50,7 @@ export class MultiFactorUserImpl implements MultiFactorUser {
   async getSession(): Promise<MultiFactorSession> {
     return MultiFactorSessionImpl._fromIdtoken(
       await this.user.getIdToken(),
-      this.user.auth
+      this.user
     );
   }
 

diff --git a/packages/auth/src/platform_browser/mfa/assertions/phone.test.ts b/packages/auth/src/platform_browser/mfa/assertions/phone.test.ts
@@ -20,7 +20,11 @@ import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 
 import { mockEndpoint } from '../../../../test/helpers/api/helper';
-import { testAuth, TestAuth } from '../../../../test/helpers/mock_auth';
+import {
+  testAuth,
+  TestAuth,
+  testUser
+} from '../../../../test/helpers/mock_auth';
 import * as mockFetch from '../../../../test/helpers/mock_fetch';
 import { Endpoint } from '../../../api';
 import { FinalizeMfaResponse } from '../../../api/authentication/mfa';
@@ -57,10 +61,11 @@ describe('platform_browser/mfa/phone', () => {
   afterEach(mockFetch.tearDown);
 
   describe('enroll', () => {
+    const user = testUser(auth, 'uid');
     beforeEach(() => {
       session = MultiFactorSessionImpl._fromIdtoken(
         'enrollment-id-token',
-        auth
+        user
       );
     });
 
@@ -78,7 +83,8 @@ describe('platform_browser/mfa/phone', () => {
           sessionInfo: 'verification-id'
         }
       });
-      expect(session.auth).to.eql(auth);
+      expect(session.user).to.not.be.undefined;
+      expect(session.user).to.eql(user);
     });
 
     context('with display name', () => {
@@ -101,7 +107,8 @@ describe('platform_browser/mfa/phone', () => {
             sessionInfo: 'verification-id'
           }
         });
-        expect(session.auth).to.eql(auth);
+        expect(session.user).to.not.be.undefined;
+        expect(session.user).to.eql(user);
       });
     });
   });
@@ -124,7 +131,7 @@ describe('platform_browser/mfa/phone', () => {
           sessionInfo: 'verification-id'
         }
       });
-      expect(session.auth).to.eql(undefined);
+      expect(session.user).to.be.undefined;
     });
   });
 });

diff --git a/packages/database-compat/package.json b/packages/database-compat/package.json
@@ -58,7 +58,7 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "@firebase/app-compat": "0.2.11",
+    "@firebase/app-compat": "0.2.12",
     "typescript": "4.7.4"
   },
   "repository": {

diff --git a/packages/database/package.json b/packages/database/package.json
@@ -57,7 +57,7 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "@firebase/app": "0.9.11",
+    "@firebase/app": "0.9.12",
     "rollup": "2.79.1",
     "rollup-plugin-typescript2": "0.31.2",
     "typescript": "4.7.4"

diff --git a/packages/firebase/CHANGELOG.md b/packages/firebase/CHANGELOG.md
@@ -1,5 +1,17 @@
 # firebase
 
+## 9.22.2
+
+### Patch Changes
+
+- [`4a86f4eb0`](https://github.com/firebase/firebase-js-sdk/commit/4a86f4eb0c606443ac01d99a9169e4074d5d21dc) [#7294](https://github.com/firebase/firebase-js-sdk/pull/7294) (fixes [#7279](https://github.com/firebase/firebase-js-sdk/issues/7279)) - Fixed the types path for `compat/app`.
+
+- Updated dependencies [[`fe7da7ec3`](https://github.com/firebase/firebase-js-sdk/commit/fe7da7ec3c83c200d7a0c7b90bb6bd27654309ee)]:
+  - @firebase/app@0.9.12
+  - @firebase/firestore@3.12.2
+  - @firebase/app-compat@0.2.12
+  - @firebase/firestore-compat@0.3.11
+
 ## 9.22.1
 
 ### Patch Changes