Merge pull request #18396 from mozilla/FXA-11166

fix(recovery-phone): Don't strip nationalFormat number after successful setup

Author: LZoog

packages/fxa-auth-server/lib/routes/recovery-phone.ts

@@ -302,7 +302,9 @@ class RecoveryPhoneHandler {
 
         try {
           const { phoneNumber, nationalFormat } =
-            await this.recoveryPhoneService.hasConfirmed(uid, 4);
+            // User has successfully set up a recovery phone. Give back the
+            // full nationalFormat (don't strip it).
+            await this.recoveryPhoneService.hasConfirmed(uid);
           await this.mailer.sendPostAddRecoveryPhoneEmail(
             account.emails,
             account,

packages/fxa-auth-server/test/local/routes/recovery-phone.js

@@ -355,6 +355,9 @@ describe('/recovery_phone', () => {
 
       assert.isDefined(resp);
       assert.equal(resp.status, 'success');
+      // Gives back the full national format as the user just successfully
+      // confirmed the code
+      assert.equal(resp.nationalFormat, nationalFormat);
       assert.equal(mockRecoveryPhoneService.confirmSetupCode.callCount, 1);
       assert.equal(
         mockRecoveryPhoneService.confirmSetupCode.getCall(0).args[0],