Merge pull request #19431 from mozilla/password-change-jwt

feat(jwt): Add unified password change endpoint using JWT

Author: vbudhram

packages/functional-tests/tests/key-stretching-v2/changePassword.spec.ts

@@ -80,6 +80,8 @@ test.describe('severity-2 #smoke', () => {
       await settings.goto(changeVersion.query);
       await settings.clickChangePassword();
 
+      await settings.confirmMfaGuard(email);
+
       await expect(changePassword.changePasswordHeading).toBeVisible();
 
       await changePassword.currentPasswordTextbox.fill(password);
@@ -134,6 +136,8 @@ test.describe('severity-2 #smoke', () => {
       await settings.goto(changeVersion.query);
       await settings.clickChangePassword();
 
+      await settings.confirmMfaGuard(email);
+
       await expect(changePassword.changePasswordHeading).toBeVisible();
 
       await changePassword.currentPasswordTextbox.fill(password);

packages/functional-tests/tests/resetPassword/resetPasswordRecoveryKey.spec.ts

@@ -185,6 +185,9 @@ test.describe('severity-1 #smoke', () => {
 
       // Change password
       await settings.password.changeButton.click();
+
+      await settings.confirmMfaGuard(credentials.email);
+
       await changePassword.fillOutChangePassword(
         credentials.password,
         newPassword

packages/functional-tests/tests/settings/changeEmail.spec.ts

@@ -69,9 +69,13 @@ test.describe('severity-1 #smoke', () => {
         settings,
         changePassword,
         initialPassword,
-        newPassword
+        newPassword,
+        target,
+        credentials.email
       );
 
+      credentials.password = newPassword;
+
       await settings.signOut();
 
       // Sign in with old password
@@ -113,9 +117,13 @@ test.describe('severity-1 #smoke', () => {
         settings,
         changePassword,
         initialPassword,
-        newPassword
+        newPassword,
+        target,
+        credentials.email
       );
 
+      credentials.password = newPassword;
+
       await settings.signOut();
 
       // Sign in with new password
@@ -124,7 +132,7 @@ test.describe('severity-1 #smoke', () => {
 
       // Change back the primary email again
       await settings.secondaryEmail.makePrimaryButton.click();
-      await settings.confirmMfaGuard(secondEmail);
+      await settings.confirmMfaGuard(credentials.email);
       await settings.signOut();
 
       // Login with primary email and new password
@@ -133,6 +141,7 @@ test.describe('severity-1 #smoke', () => {
 
       await expect(settings.settingsHeading).toBeVisible();
 
+      console.log('credentials.password', credentials.password);
       // Update which password to use the account cleanup
       credentials.password = newPassword;
     });
@@ -263,9 +272,14 @@ async function setNewPassword(
   settings: SettingsPage,
   changePassword: ChangePasswordPage,
   oldPassword: string,
-  newPassword: string
+  newPassword: string,
+  target: BaseTarget,
+  email: string,
 ): Promise<void> {
   await settings.password.changeButton.click();
+
+  await settings.confirmMfaGuard(email);
+
   await changePassword.fillOutChangePassword(oldPassword, newPassword);
 
   await expect(settings.settingsHeading).toBeVisible();

packages/functional-tests/tests/settings/changePassword.spec.ts

@@ -20,6 +20,9 @@ test.describe('severity-1 #smoke', () => {
 
       // Enter incorrect old password and verify the tooltip error
       await settings.password.changeButton.click();
+
+      await settings.confirmMfaGuard(credentials.email);
+
       await changePassword.fillOutChangePassword(
         'Incorrect Password',
         newPassword
@@ -40,6 +43,9 @@ test.describe('severity-1 #smoke', () => {
 
       // Enter the correct old password and verify that change password is successful
       await settings.password.changeButton.click();
+
+      await settings.confirmMfaGuard(credentials.email);
+
       await changePassword.fillOutChangePassword(initialPassword, newPassword);
 
       await expect(settings.settingsHeading).toBeVisible();
@@ -56,32 +62,6 @@ test.describe('severity-1 #smoke', () => {
       credentials.password = newPassword;
     });
 
-    test('change password with short password tooltip shows, cancel and try to change password again, tooltip is not shown', async ({
-      target,
-      pages: { page, changePassword, settings, signin },
-      testAccountTracker,
-    }) => {
-      const credentials = await testAccountTracker.signUp();
-      await signInAccount(target, page, settings, signin, credentials);
-
-      await settings.goto();
-      await settings.password.changeButton.click();
-
-      await expect(changePassword.changePasswordHeading).toBeVisible();
-
-      await changePassword.newPasswordTextbox.fill('short');
-
-      await expect(changePassword.passwordLengthInvalidIcon).toBeVisible();
-
-      await changePassword.cancelButton.click();
-
-      await expect(settings.settingsHeading).toBeVisible();
-
-      await settings.password.changeButton.click();
-
-      await expect(changePassword.passwordLengthUnsetIcon).toBeVisible();
-    });
-
     test('reset password via settings works', async ({
       target,
       pages: { page, changePassword, resetPassword, settings, signin },
@@ -94,6 +74,8 @@ test.describe('severity-1 #smoke', () => {
 
       await settings.password.changeButton.click();
 
+      await settings.confirmMfaGuard(credentials.email);
+
       await expect(changePassword.changePasswordHeading).toBeVisible();
 
       await changePassword.forgotPasswordLink.click();

packages/functional-tests/tests/settings/changePasswordValidation.spec.ts

@@ -41,6 +41,8 @@ test.describe('severity-1 #smoke', () => {
         await settings.goto();
         await settings.password.changeButton.click();
 
+        await settings.confirmMfaGuard(credentials.email);
+
         await expect(changePassword.changePasswordHeading).toBeVisible();
 
         await changePassword.newPasswordTextbox.fill(password);
@@ -67,6 +69,8 @@ test.describe('severity-1 #smoke', () => {
       await settings.goto();
       await settings.password.changeButton.click();
 
+      await settings.confirmMfaGuard(credentials.email);
+
       await expect(changePassword.changePasswordHeading).toBeVisible();
 
       await changePassword.newPasswordTextbox.fill(credentials.email);

packages/functional-tests/tests/signin/redirect.spec.ts

@@ -63,18 +63,22 @@ test.describe('severity-2 #smoke', () => {
 
     test('allows valid redirect_to parameter', async ({
       target,
-      pages: { page, changePassword, signin },
+      pages: { page, changePassword, signin, settings },
       testAccountTracker,
     }) => {
       const credentials = await testAccountTracker.signUp();
 
       // set a redirect url that is not the usual navigation target after signin
       const redirectTo = `${target.contentServerUrl}/settings/change_password`;
       await page.goto(`${target.contentServerUrl}/?redirect_to=${redirectTo}`);
+
       await signin.fillOutEmailFirstForm(credentials.email);
       await signin.fillOutPasswordForm(credentials.password);
 
       await expect(page).toHaveURL(redirectTo);
+
+      await settings.confirmMfaGuard(credentials.email);
+
       await expect(changePassword.changePasswordHeading).toBeVisible();
     });
   });

packages/functional-tests/tests/syncV3/settings.spec.ts

@@ -58,6 +58,9 @@ test.describe('severity-2 #smoke', () => {
 
       //Change password
       await settings.password.changeButton.click();
+
+      await settings.confirmMfaGuard(credentials.email);
+
       await changePassword.fillOutChangePassword(
         credentials.password,
         newPassword
@@ -76,7 +79,7 @@ test.describe('severity-2 #smoke', () => {
         settings,
         signin,
         signinTokenCode,
-        page,
+        page
       },
       testAccountTracker,
       storageState,
@@ -117,6 +120,9 @@ test.describe('severity-2 #smoke', () => {
 
       //Change password
       await settings.password.changeButton.click();
+
+      await settings.confirmMfaGuard(credentials.email);
+
       await changePassword.fillOutChangePassword(
         credentials.password,
         newPassword