Include a reference to Auth in TotpSecret

This is cleaner than looking up the app and auth instance with getApp and getAuth.

Author: prameshj

packages/auth/src/mfa/assertions/totp.test.ts

@@ -30,12 +30,9 @@ import {
   TotpMultiFactorGenerator,
   TotpSecret
 } from './totp';
-import { Auth, FactorId } from '../../model/public_types';
+import { FactorId } from '../../model/public_types';
 import { AuthErrorCode } from '../../core/errors';
-import { FirebaseApp, initializeApp } from '@firebase/app';
 import { AppName } from '../../model/auth';
-import { getAuth } from '../../platform_node';
-import { initializeAuth } from '../../core';
 import { _castAuth } from '../../core/auth/auth_impl';
 
 use(chaiAsPromised);
@@ -58,7 +55,7 @@ describe('core/mfa/assertions/totp/TotpMultiFactorGenerator', () => {
       auth = await testAuth();
       const secret = TotpSecret.fromStartTotpMfaEnrollmentResponse(
         startEnrollmentResponse,
-        auth.name
+        auth
       );
       const assertion = TotpMultiFactorGenerator.assertionForEnrollment(
         secret,
@@ -90,9 +87,7 @@ describe('core/mfa/assertions/totp/TotpMultiFactorGenerator', () => {
           'enrollment-id-token',
           undefined
         );
-        await TotpMultiFactorGenerator.generateSecret(
-          session
-        );
+        await TotpMultiFactorGenerator.generateSecret(session);
       } catch (e) {
         expect(e.code).to.eql(`auth/${AuthErrorCode.INTERNAL_ERROR}`);
       }
@@ -156,7 +151,7 @@ describe('core/mfa/totp/assertions/TotpMultiFactorAssertionImpl', () => {
     auth = await testAuth();
     secret = TotpSecret.fromStartTotpMfaEnrollmentResponse(
       startEnrollmentResponse,
-      auth.name
+      auth
     );
     assertion = TotpMultiFactorAssertionImpl._fromSecret(secret, '123456');
   });
@@ -213,7 +208,7 @@ describe('core/mfa/totp/assertions/TotpMultiFactorAssertionImpl', () => {
   });
 });
 
-describe('core/mfa/assertions/totp/TotpSecret', () => {
+describe('core/mfa/assertions/totp/TotpSecret', async () => {
   const serverResponse: StartTotpMfaEnrollmentResponse = {
     totpSessionInfo: {
       sharedSecretKey: 'key123',
@@ -224,11 +219,13 @@ describe('core/mfa/assertions/totp/TotpSecret', () => {
       finalizeEnrollmentTime: 1662586196
     }
   };
+  // this is the name used by the fake app in testAuth().
   const fakeAppName: AppName = 'test-app';
   const fakeEmail: string = 'user@email';
+  const auth = await testAuth();
   const secret = TotpSecret.fromStartTotpMfaEnrollmentResponse(
     serverResponse,
-    fakeAppName
+    auth
   );
 
   describe('fromStartTotpMfaEnrollmentResponse', () => {
@@ -240,19 +237,7 @@ describe('core/mfa/assertions/totp/TotpSecret', () => {
     });
   });
   describe('generateQrCodeUrl', () => {
-    let app: FirebaseApp;
-    let auth: Auth;
-
     beforeEach(async () => {
-      app = initializeApp(
-        {
-          apiKey: 'fake-key',
-          appId: 'fake-app-id',
-          authDomain: 'fake-auth-domain'
-        },
-        fakeAppName
-      );
-      auth = initializeAuth(app);
       await auth.updateCurrentUser(
         testUser(_castAuth(auth), 'uid', fakeEmail, true)
       );
@@ -266,8 +251,6 @@ describe('core/mfa/assertions/totp/TotpSecret', () => {
     });
     it('only accountName provided', () => {
       const url = secret.generateQrCodeUrl('user@myawesomeapp', '');
-      const auth2 = getAuth(app);
-      console.log('Current user is ' + auth2);
       expect(url).to.eq(
         `otpauth://totp/${fakeAppName}:user@myawesomeapp?secret=key123&issuer=${fakeAppName}&algorithm=SHA1&digits=6`
       );

packages/auth/src/mfa/assertions/totp.ts

@@ -19,7 +19,7 @@ import {
   MultiFactorSession,
   FactorId
 } from '../../model/public_types';
-import { AppName, AuthInternal } from '../../model/auth';
+import { AuthInternal } from '../../model/auth';
 import {
   finalizeEnrollTotpMfa,
   startEnrollTotpMfa,
@@ -31,8 +31,6 @@ import { MultiFactorAssertionImpl } from '../../mfa/mfa_assertion';
 import { MultiFactorSessionImpl } from '../mfa_session';
 import { AuthErrorCode } from '../../core/errors';
 import { _assert } from '../../core/util/assert';
-import { getApp } from '@firebase/app';
-import { getAuth } from '../../platform_node';
 
 /**
  * Provider for generating a {@link TotpMultiFactorAssertion}.
@@ -93,13 +91,13 @@ export class TotpMultiFactorGenerator {
       typeof mfaSession.auth !== 'undefined',
       AuthErrorCode.INTERNAL_ERROR
     );
-    const response = await startEnrollTotpMfa(mfaSession.auth!, {
+    const response = await startEnrollTotpMfa(mfaSession.auth, {
       idToken: mfaSession.credential,
       totpEnrollmentInfo: {}
     });
     return TotpSecret.fromStartTotpMfaEnrollmentResponse(
       response,
-      mfaSession.auth!.name
+      mfaSession.auth
     );
   }
 
@@ -193,12 +191,12 @@ export class TotpSecret {
     // This can be used by callers to show a countdown of when to enter OTP code by.
     private readonly finalizeEnrollmentBy: string,
     private readonly sessionInfo: string,
-    private readonly appName: AppName
+    private readonly auth: AuthInternal
   ) {}
 
   static fromStartTotpMfaEnrollmentResponse(
     response: StartTotpMfaEnrollmentResponse,
-    appName: AppName
+    auth: AuthInternal
   ): TotpSecret {
     return new TotpSecret(
       response.totpSessionInfo.sharedSecretKey,
@@ -207,7 +205,7 @@ export class TotpSecret {
       response.totpSessionInfo.periodSec,
       new Date(response.totpSessionInfo.finalizeEnrollmentTime).toUTCString(),
       response.totpSessionInfo.sessionInfo,
-      appName
+      auth
     );
   }
 
@@ -231,13 +229,11 @@ export class TotpSecret {
       useDefaults = true;
     }
     if (useDefaults) {
-      const app = getApp(this.appName);
-      const auth = getAuth(app);
       if (_isEmptyString(accountName)) {
-        accountName = auth.currentUser?.email || 'unknownuser';
+        accountName = this.auth.currentUser?.email || 'unknownuser';
       }
       if (_isEmptyString(issuer)) {
-        issuer = app.name;
+        issuer = this.auth.name;
       }
     }
     return `otpauth://totp/${issuer}:${accountName}?secret=${this.secretKey}&issuer=${issuer}&algorithm=${this.hashingAlgorithm}&digits=${this.codeLength}`;