Merge pull request #18381 from mozilla/FXA-11064

task(recovery-phone): Allow some operations when recovery phone config enabled is false

Author: dschom

libs/accounts/recovery-phone/src/lib/recovery-phone.service.spec.ts

@@ -535,24 +535,13 @@ describe('RecoveryPhoneService', () => {
       mockRecoveryPhoneConfig.enabled = true;
     });
     it('can disable', () => {
-      expect(service.available(uid, 'US')).rejects.toEqual(
-        new RecoveryPhoneNotEnabled()
-      );
+      expect(service.available(uid, 'US')).resolves.toEqual(false);
       expect(service.confirmSetupCode(uid, '000000')).rejects.toEqual(
         new RecoveryPhoneNotEnabled()
       );
       expect(service.confirmSigninCode(uid, '000000')).rejects.toEqual(
         new RecoveryPhoneNotEnabled()
       );
-      expect(service.hasConfirmed(uid)).rejects.toEqual(
-        new RecoveryPhoneNotEnabled()
-      );
-      expect(() => service.stripPhoneNumber('+15550005555')).toThrow(
-        new RecoveryPhoneNotEnabled()
-      );
-      expect(service.removePhoneNumber(uid)).rejects.toEqual(
-        new RecoveryPhoneNotEnabled()
-      );
       expect(service.sendCode(uid)).rejects.toEqual(
         new RecoveryPhoneNotEnabled()
       );

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

@@ -40,7 +40,7 @@ export class RecoveryPhoneService {
    */
   public async available(uid: string, region: string): Promise<boolean> {
     if (!this.config.enabled) {
-      throw new RecoveryPhoneNotEnabled();
+      return false;
     }
 
     if (!this.config.allowedRegions?.includes(region)) {
@@ -241,10 +241,6 @@ export class RecoveryPhoneService {
    * @returns True if successful
    */
   public async removePhoneNumber(uid: string) {
-    if (!this.config.enabled) {
-      throw new RecoveryPhoneNotEnabled();
-    }
-
     const hasRecoveryCodes = await this.recoveryPhoneManager.hasRecoveryCodes(
       uid
     );
@@ -279,10 +275,6 @@ export class RecoveryPhoneService {
     phoneNumber?: string;
     nationalFormat?: string;
   }> {
-    if (!this.config.enabled) {
-      throw new RecoveryPhoneNotEnabled();
-    }
-
     try {
       const { phoneNumber, nationalFormat } =
         await this.recoveryPhoneManager.getConfirmedPhoneNumber(uid);
@@ -316,9 +308,6 @@ export class RecoveryPhoneService {
    * @returns The last N number of digits of the phone number
    */
   public stripPhoneNumber(phoneNumber: string, lastN?: number) {
-    if (!this.config.enabled) {
-      throw new RecoveryPhoneNotEnabled();
-    }
     // No stripping needed, session is verified
     if (lastN === undefined) {
       return phoneNumber;