Merge pull request #18255 from mozilla/FXA-10374

feat(fxa-settings): Implement using recovery phone to sign in

Author: vpomerleau

libs/accounts/recovery-phone/src/index.ts

@@ -3,7 +3,7 @@ export * from './lib/recovery-phone.service';
 export * from './lib/recovery-phone.provider';
 export * from './lib/recovery-phone.service.config';
 export * from './lib/sms.manager';
-export * from './lib/sms.manger.config';
+export * from './lib/sms.manager.config';
 export * from './lib/twilio.config';
 export * from './lib/twilio.provider';
 export * from './lib/recovery-phone.errors';

libs/accounts/recovery-phone/src/lib/recovery-phone.provider.ts

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { ConfigService } from '@nestjs/config';
-import { SmsManagerConfig } from './sms.manger.config';
+import { SmsManagerConfig } from './sms.manager.config';
 import Redis from 'ioredis';
 import { RecoveryPhoneConfig } from './recovery-phone.service.config';
 

…overy-phone/src/lib/sms.manger.config.ts …very-phone/src/lib/sms.manager.config.tslibs/accounts/recovery-phone/src/lib/sms.manger.config.ts renamed to libs/accounts/recovery-phone/src/lib/sms.manager.config.ts libs/accounts/recovery-phone/src/lib/sms.manger.config.ts renamed to libs/accounts/recovery-phone/src/lib/sms.manager.config.ts

@@ -6,7 +6,7 @@ import { LOGGER_PROVIDER } from '@fxa/shared/log';
 import { StatsDService } from '@fxa/shared/metrics/statsd';
 import { Test, TestingModule } from '@nestjs/testing';
 import { SmsManager } from './sms.manager';
-import { SmsManagerConfig } from './sms.manger.config';
+import { SmsManagerConfig } from './sms.manager.config';
 import { TwilioProvider } from './twilio.provider';
 import { TwilioErrorCodes } from './recovery-phone.errors';
 

libs/accounts/recovery-phone/src/lib/sms.manager.spec.ts

@@ -8,7 +8,7 @@ import { Inject, Injectable, LoggerService } from '@nestjs/common';
 import { StatsD } from 'hot-shots';
 import { Twilio } from 'twilio';
 import { MessageInstance } from 'twilio/lib/rest/api/v2010/account/message';
-import { SmsManagerConfig } from './sms.manger.config';
+import { SmsManagerConfig } from './sms.manager.config';
 import { TwilioProvider } from './twilio.provider';
 import {
   RecoveryNumberInvalidFormatError,
@@ -70,6 +70,7 @@ export class SmsManager {
     retryCount: number
   ): Promise<MessageInstance> {
     const from = this.rotateFromNumber();
+
     try {
       const msg = await this.client.messages.create({
         to,

libs/accounts/recovery-phone/src/lib/sms.manager.ts

@@ -2338,7 +2338,7 @@ export default class AuthClient {
    * @param code The otp code sent to the user's phone
    * @param headers
    */
-  async recoveryPhoneSignInConfirm(
+  async recoveryPhoneSigninConfirm(
     sessionToken: string,
     code: string,
     headers?: Headers

packages/fxa-auth-client/lib/client.ts

@@ -19,6 +19,7 @@ const METHOD_TO_AMR = {
   'email-2fa': 'email',
   'totp-2fa': 'otp',
   'recovery-code': 'otp',
+  'sms-2fa': 'otp',
 };
 
 // Maps AMR values to the type of authenticator they represent, e.g.

packages/fxa-auth-server/lib/authMethods.js

@@ -1133,7 +1133,7 @@ export class AccountHandler {
         }
       }
 
-      // If they just went through the sigin-unblock flow, they have already verified their email.
+      // If they just went through the signin-unblock flow, they have already verified their email.
       // We don't need to force them to do that again, just make a verified session.
       if (didSigninUnblock) {
         needsVerificationId = false;

packages/fxa-auth-server/lib/routes/account.ts

@@ -781,14 +781,14 @@ const mocks = require('../mocks');
         })
         .then((emailData) => {
           assert.equal(emailData.headers['x-template-name'], 'verify');
-          const siginToken = emailData.headers['x-verify-code'];
+          const signinToken = emailData.headers['x-verify-code'];
           assert.notEqual(
             tokenCode,
-            siginToken,
+            signinToken,
             'login codes should not match'
           );
 
-          return client.verifyEmail(siginToken);
+          return client.verifyEmail(signinToken);
         })
         .then(() => {
           return client.emailStatus();
@@ -812,7 +812,5 @@ const mocks = require('../mocks');
           assert.ok(keys.wrapKb, 'has wrapKb keys');
         });
     });
-
-
   });
 });

packages/fxa-auth-server/test/remote/account_signin_verification_tests.js

@@ -112,7 +112,7 @@ describe(`#integration - recovery phone`, function () {
     await TestServer.stop(server);
   });
 
-  it('setups a recovery phone', async function () {
+  it('sets up a recovery phone', async function () {
     if (!isTwilioConfigured) {
       this.skip('Invalid twilio accountSid or authToken. Check env / config!');
     }
@@ -185,7 +185,7 @@ describe(`#integration - recovery phone`, function () {
     assert.isFalse(checkResp2.exists);
   });
 
-  it('fails to setup invalid phone number', async function () {
+  it('fails to set up invalid phone number', async function () {
     if (!isTwilioConfigured) {
       this.skip('Invalid twilio accountSid or authToken. Check env / config!');
     }