Merge pull request #18210 from mozilla/FXA-10946

task(auth): Improve recovery phone endpoint names

Author: dschom

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

@@ -2266,7 +2266,7 @@ export default class AuthClient {
     headers?: Headers
   ) {
     return this.sessionPost(
-      '/recovery-phone/create',
+      '/recovery_phone/create',
       sessionToken,
       { phoneNumber },
       headers
@@ -2275,7 +2275,7 @@ export default class AuthClient {
 
   async recoveryPhoneAvailable(sessionToken: string, headers?: Headers) {
     return this.sessionPost(
-      '/recovery-phone/available',
+      '/recovery_phone/available',
       sessionToken,
       {},
       headers
@@ -2288,7 +2288,7 @@ export default class AuthClient {
     headers?: Headers
   ) {
     return this.sessionPost(
-      '/recovery-phone/available',
+      '/recovery_phone/available',
       sessionToken,
       { code },
       headers
@@ -2297,15 +2297,15 @@ export default class AuthClient {
 
   async recoveryPhoneSendCode(sessionToken: string, headers?: Headers) {
     return this.sessionPost(
-      '/recovery-phone/send_code',
+      '/recovery_phone/signin/send_code',
       sessionToken,
       {},
       headers
     );
   }
 
   async recoveryPhoneDelete(sessionToken: string, headers?: Headers) {
-    return this.sessionDelete('/recovery-phone', sessionToken, {}, headers);
+    return this.sessionDelete('/recovery_phone', sessionToken, {}, headers);
   }
 
   protected async getPayloadV2({

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

@@ -275,7 +275,7 @@ export const recoveryPhoneRoutes = (
     // TODO: See blocked tasks for FXA-10354
     {
       method: 'POST',
-      path: '/recovery-phone/create',
+      path: '/recovery_phone/create',
       options: {
         auth: {
           strategies: ['sessionToken'],
@@ -292,7 +292,7 @@ export const recoveryPhoneRoutes = (
     },
     {
       method: 'POST',
-      path: '/recovery-phone/available',
+      path: '/recovery_phone/available',
       options: {
         auth: {
           strategies: ['sessionToken'],
@@ -304,7 +304,7 @@ export const recoveryPhoneRoutes = (
     },
     {
       method: 'POST',
-      path: '/recovery-phone/confirm',
+      path: '/recovery_phone/confirm',
       options: {
         auth: {
           strategies: ['sessionToken'],
@@ -321,7 +321,7 @@ export const recoveryPhoneRoutes = (
     },
     {
       method: 'POST',
-      path: '/recovery-phone/send_code',
+      path: '/recovery_phone/signin/send_code',
       options: {
         auth: {
           strategies: ['sessionToken'],
@@ -333,7 +333,7 @@ export const recoveryPhoneRoutes = (
     },
     {
       method: 'POST',
-      path: '/recovery-phone/signin/confirm',
+      path: '/recovery_phone/signin/confirm',
       options: {
         auth: {
           strategies: ['sessionToken'],
@@ -345,7 +345,7 @@ export const recoveryPhoneRoutes = (
     },
     {
       method: 'DELETE',
-      path: '/recovery-phone',
+      path: '/recovery_phone',
       options: {
         auth: {
           strategies: ['sessionToken'],
@@ -357,7 +357,7 @@ export const recoveryPhoneRoutes = (
     },
     {
       method: 'GET',
-      path: '/recovery-phone',
+      path: '/recovery_phone',
       options: {
         auth: {
           strategy: 'sessionToken',

packages/fxa-auth-server/lib/routes/totp.js

@@ -15,9 +15,7 @@ const TOTP_DOCS = require('../../docs/swagger/totp-api').default;
 const DESCRIPTION = require('../../docs/swagger/shared/descriptions').default;
 const { Container } = require('typedi');
 const { AccountEventsManager } = require('../account-events');
-const {
-  RecoveryPhoneService,
-} = require('../../../../libs/accounts/recovery-phone/src');
+const { RecoveryPhoneService } = require('@fxa/accounts/recovery-phone');
 
 const RECOVERY_CODE_SANE_MAX_LENGTH = 20;
 

packages/fxa-auth-server/test/client/api.js

@@ -951,7 +951,7 @@ module.exports = (config) => {
     const token = await tokens.SessionToken.fromHex(sessionTokenHex);
     return await this.doRequest(
       'POST',
-      `${this.baseURL}/recovery-phone/create`,
+      `${this.baseURL}/recovery_phone/create`,
       token,
       {
         phoneNumber,
@@ -965,7 +965,7 @@ module.exports = (config) => {
     const token = await tokens.SessionToken.fromHex(sessionTokenHex);
     return await this.doRequest(
       'POST',
-      `${this.baseURL}/recovery-phone/available`,
+      `${this.baseURL}/recovery_phone/available`,
       token,
       {}
     );
@@ -978,7 +978,7 @@ module.exports = (config) => {
     const token = await tokens.SessionToken.fromHex(sessionTokenHex);
     return await this.doRequest(
       'POST',
-      `${this.baseURL}/recovery-phone/confirm`,
+      `${this.baseURL}/recovery_phone/confirm`,
       token,
       {
         code,
@@ -993,7 +993,7 @@ module.exports = (config) => {
     const token = await tokens.SessionToken.fromHex(sessionTokenHex);
     return await this.doRequest(
       'POST',
-      `${this.baseURL}/recovery-phone/signin/confirm`,
+      `${this.baseURL}/recovery_phone/signin/confirm`,
       token,
       {
         code,
@@ -1007,7 +1007,7 @@ module.exports = (config) => {
     const token = await tokens.SessionToken.fromHex(sessionTokenHex);
     return await this.doRequest(
       'POST',
-      `${this.baseURL}/recovery-phone/send_code`,
+      `${this.baseURL}/recovery_phone/signin/send_code`,
       token,
       {}
     );
@@ -1019,7 +1019,7 @@ module.exports = (config) => {
     const token = await tokens.SessionToken.fromHex(sessionTokenHex);
     return await this.doRequest(
       'DELETE',
-      `${this.baseURL}/recovery-phone`,
+      `${this.baseURL}/recovery_phone`,
       token,
       {}
     );
@@ -1029,7 +1029,7 @@ module.exports = (config) => {
     const token = await tokens.SessionToken.fromHex(sessionTokenHex);
     return await this.doRequest(
       'GET',
-      `${this.baseURL}/recovery-phone`,
+      `${this.baseURL}/recovery_phone`,
       token,
       {}
     );