fix test and form logic

Author: aromanovv

orcid-web/src/main/java/org/orcid/frontend/web/controllers/PasswordResetController.java

@@ -313,8 +313,6 @@ public ModelAndView resetPasswordEmail(HttpServletRequest request, @PathVariable
             oneTimeResetPasswordForm.setTwoFactorEnabled(true);
 
             if (oneTimeResetPasswordForm.getTwoFactorCode() == null && oneTimeResetPasswordForm.getTwoFactorRecoveryCode() == null) {
-                oneTimeResetPasswordForm.setPassword(null);
-                oneTimeResetPasswordForm.setRetypedPassword(null);
                 return oneTimeResetPasswordForm;
             } else {
                 if (oneTimeResetPasswordForm.getTwoFactorRecoveryCode() != null && !oneTimeResetPasswordForm.getTwoFactorRecoveryCode().isEmpty()) {
@@ -347,7 +345,7 @@ else if (oneTimeResetPasswordForm.getTwoFactorCode() != null && !oneTimeResetPas
         String redirectUrl = calculateRedirectUrl(request, response, false);
         oneTimeResetPasswordForm.setSuccessRedirectLocation(redirectUrl);
         // Remove credentials before return
-        oneTimeResetPasswordForm.setPassword(null);
+        oneTimeResetPasswordForm.setNewPassword(null);
         oneTimeResetPasswordForm.setRetypedPassword(null);
         return oneTimeResetPasswordForm;
     }

orcid-web/src/test/java/org/orcid/frontend/web/controllers/PasswordResetControllerTest.java

@@ -296,10 +296,6 @@ public void testSubmitPasswordResetV2_PromptsFor2FA() throws Exception {
 
         assertTrue(form.getErrors().isEmpty());
         assertTrue(form.isTwoFactorEnabled());
-
-        // Assert passwords are wiped when returning to prompt
-        org.junit.Assert.assertNull(form.getPassword());
-        org.junit.Assert.assertNull(form.getRetypedPassword());
     }
 
     @Test