litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed the user experience

Browse source
This commit is contained in:
AsimA 2018-05-23 11:25:58 +02:00
parent fcaf315549
commit fea33a456a
5 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
View file

@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import com.mysql.cj.api.x.core.Warning;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -354,8 +355,10 @@ public class Authenticate extends VitroHttpServlet {
return;
}
else {
user.setPasswordChangeRequired(true);
user.setMd5Password("");
user.setPasswordChangeRequired(true);
user.setMd5Password("");
bean.setMessage(request, ERROR,
"password_system_has_changed");
}
}

1
api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java
View file

@ -83,6 +83,7 @@ public class UserAccountsSelectorTest extends AbstractTestClass {
assertEquals("lastName", "Caruso", acct.getLastName());
assertEquals("md5password", "garbage", acct.getMd5Password());
assertEquals("argon2password", "betterGarbage", acct.getArgon2Password());
assertEquals("expires", 1100234965897L, acct.getPasswordLinkExpires());
assertEquals("loginCount", 50, acct.getLoginCount());
assertEquals("lastLogin", 1020304050607080L, acct.getLastLoginTime());
assertEquals("status", UserAccount.Status.ACTIVE, acct.getStatus());