From 0f00fd7a0827da004e9d512adfbac507baba292f Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 10 Jun 2011 16:14:14 +0000 Subject: [PATCH] NIHVIVO-2279 Setting the password via an email and a link will also remove the need to set it on next login. --- .../controller/accounts/user/UserAccountsCreatePasswordPage.java | 1 + .../controller/accounts/user/UserAccountsResetPasswordPage.java | 1 + 2 files changed, 2 insertions(+) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java index 07264f328..d134fd737 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java @@ -34,6 +34,7 @@ public class UserAccountsCreatePasswordPage extends public void createPassword() { userAccount.setMd5Password(Authenticator.applyMd5Encoding(newPassword)); userAccount.setPasswordLinkExpires(0L); + userAccount.setPasswordChangeRequired(false); userAccount.setStatus(Status.ACTIVE); userAccountsDao.updateUserAccount(userAccount); log.debug("Set password on '" + userAccount.getEmailAddress() diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java index 98bd350f0..7902cbe5b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java @@ -33,6 +33,7 @@ public class UserAccountsResetPasswordPage extends UserAccountsPasswordBasePage public void resetPassword() { userAccount.setMd5Password(Authenticator.applyMd5Encoding(newPassword)); userAccount.setPasswordLinkExpires(0L); + userAccount.setPasswordChangeRequired(false); userAccount.setStatus(Status.ACTIVE); userAccountsDao.updateUserAccount(userAccount); log.debug("Set password on '" + userAccount.getEmailAddress()