Merge 188c2cd into 57c32b9

Author: prameshj

packages/auth/src/api/authentication/mfa.ts

@@ -51,27 +51,13 @@ export interface StartPhoneMfaSignInRequest {
   };
   tenantId?: string;
 }
-export interface StartTotpMfaSignInRequest {
-  mfaPendingCredential: string;
-  mfaEnrollmentId: string;
-  totpSignInInfo: {
-    verificationCode: string;
-  };
-  tenantId?: string;
-}
 
 export interface StartPhoneMfaSignInResponse {
   phoneResponseInfo: {
     sessionInfo: string;
   };
 }
 
-export interface StartTotpMfaSignInResponse {
-  totpSignInInfo: {
-    verificationCode: string;
-  };
-}
-
 export function startSignInPhoneMfa(
   auth: Auth,
   request: StartPhoneMfaSignInRequest
@@ -87,27 +73,15 @@ export function startSignInPhoneMfa(
   );
 }
 
-export function startSignInTotpMfa(
-  auth: Auth,
-  request: StartTotpMfaSignInRequest
-): Promise<StartTotpMfaSignInResponse> {
-  return _performApiRequest<
-    StartTotpMfaSignInRequest,
-    StartTotpMfaSignInResponse
-  >(
-    auth,
-    HttpMethod.POST,
-    Endpoint.START_MFA_SIGN_IN,
-    _addTidIfNecessary(auth, request)
-  );
-}
-
 export interface FinalizePhoneMfaSignInRequest {
   mfaPendingCredential: string;
   phoneVerificationInfo: SignInWithPhoneNumberRequest;
   tenantId?: string;
 }
 
+// TOTP MFA Sign in only has a finalize phase. Phone MFA has a start phase to initiate sending an
+// SMS and a finalize phase to complete sign in. With TOTP, the user already has the OTP in the
+// TOTP/Authenticator app.
 export interface FinalizeTotpMfaSignInRequest {
   mfaPendingCredential: string;
   totpVerificationInfo: { verificationCode: string };

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

@@ -24,10 +24,7 @@ import * as mockFetch from '../../../test/helpers/mock_fetch';
 import { Endpoint } from '../../api';
 import { MultiFactorSessionImpl } from '../../mfa/mfa_session';
 import { StartTotpMfaEnrollmentResponse } from '../../api/account_management/mfa';
-import {
-  FinalizeMfaResponse,
-  StartTotpMfaSignInResponse
-} from '../../api/authentication/mfa';
+import { FinalizeMfaResponse } from '../../api/authentication/mfa';
 import {
   TotpMultiFactorAssertionImpl,
   TotpMultiFactorGenerator,
@@ -215,7 +212,6 @@ describe('core/mfa/totp/assertions/TotpMultiFactorAssertionImpl', () => {
 describe('Testing signin Flow', () => {
   let auth: TestAuth;
   let assertion: MultiFactorAssertionImpl;
-  let totpSignInResponse: StartTotpMfaSignInResponse;
   let session: MultiFactorSessionImpl;
   beforeEach(async () => {
     mockFetch.setUp();
@@ -227,24 +223,18 @@ describe('Testing signin Flow', () => {
   afterEach(mockFetch.tearDown);
 
   it('should finalize mfa signin for totp', async () => {
-    totpSignInResponse = {
-      verificationCode: '123456',
+    const mockResponse: FinalizeMfaResponse = {
       idToken: 'final-id-token',
       refreshToken: 'refresh-token'
-    } as any;
+    };
+    const mock = mockEndpoint(Endpoint.FINALIZE_MFA_SIGN_IN, mockResponse);
     assertion = TotpMultiFactorGenerator.assertionForSignIn(
       'enrollment-id',
       '123456'
     ) as any;
-
-    const mock = mockEndpoint(
-      Endpoint.FINALIZE_MFA_SIGN_IN,
-      totpSignInResponse
-    );
-
     const response = await assertion._process(auth, session);
 
-    expect(response).to.eql(totpSignInResponse);
+    expect(response).to.eql(mockResponse);
 
     expect(mock.calls[0].request).to.eql({
       mfaPendingCredential: 'mfa-pending-credential',
@@ -256,12 +246,6 @@ describe('Testing signin Flow', () => {
   });
 
   it('should throw Firebase Error if enrollment-id is undefined', async () => {
-    let _response: FinalizeMfaResponse;
-    totpSignInResponse = {
-      verificationCode: '123456',
-      idToken: 'final-id-token',
-      refreshToken: 'refresh-token'
-    } as any;
     assertion = TotpMultiFactorGenerator.assertionForSignIn(
       undefined as any,
       '123456'
@@ -273,12 +257,6 @@ describe('Testing signin Flow', () => {
   });
 
   it('should throw Firebase Error if otp is undefined', async () => {
-    let _response: FinalizeMfaResponse;
-    totpSignInResponse = {
-      verificationCode: '123456',
-      idToken: 'final-id-token',
-      refreshToken: 'refresh-token'
-    } as any;
     assertion = TotpMultiFactorGenerator.assertionForSignIn(
       'enrollment-id',
       undefined as any

packages/auth/src/mfa/mfa_info.ts

@@ -48,7 +48,6 @@ export abstract class MultiFactorInfoImpl implements MultiFactorInfo {
     if ('phoneInfo' in enrollment) {
       return PhoneMultiFactorInfoImpl._fromServerResponse(auth, enrollment);
     } else if ('totpInfo' in enrollment) {
-      // TODO(prameshj) ensure that this field is set by the backend once the tracking bug is fixed.
       return TotpMultiFactorInfoImpl._fromServerResponse(auth, enrollment);
     }
     return _fail(auth, AuthErrorCode.INTERNAL_ERROR);