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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/pom.xml
View file

@ -61,7 +61,7 @@
<dependency> <dependency>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-dependencies</artifactId> <artifactId>vitro-dependencies</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.10.0-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
<dependency> <dependency>

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.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.mysql.cj.api.x.core.Warning;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -354,8 +355,10 @@ public class Authenticate extends VitroHttpServlet {
return; return;
} }
else { else {
user.setPasswordChangeRequired(true); user.setPasswordChangeRequired(true);
user.setMd5Password(""); 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("lastName", "Caruso", acct.getLastName());
assertEquals("md5password", "garbage", acct.getMd5Password()); assertEquals("md5password", "garbage", acct.getMd5Password());
assertEquals("argon2password", "betterGarbage", acct.getArgon2Password()); assertEquals("argon2password", "betterGarbage", acct.getArgon2Password());
assertEquals("expires", 1100234965897L, acct.getPasswordLinkExpires());
assertEquals("loginCount", 50, acct.getLoginCount()); assertEquals("loginCount", 50, acct.getLoginCount());
assertEquals("lastLogin", 1020304050607080L, acct.getLastLoginTime()); assertEquals("lastLogin", 1020304050607080L, acct.getLastLoginTime());
assertEquals("status", UserAccount.Status.ACTIVE, acct.getStatus()); assertEquals("status", UserAccount.Status.ACTIVE, acct.getStatus());

6
webapp/pom.xml
View file

@ -7,13 +7,13 @@
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-webapp</artifactId> <artifactId>vitro-webapp</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.10.0-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<parent> <parent>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-project</artifactId> <artifactId>vitro-project</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.10.0-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
@ -41,7 +41,7 @@
<dependency> <dependency>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-api</artifactId> <artifactId>vitro-api</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.10.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
webapp/src/main/webapp/i18n/all.properties
View file

@ -123,6 +123,8 @@ error_no_new_password = Please enter your new password.
error_passwords_dont_match = The passwords entered do not match. error_passwords_dont_match = The passwords entered do not match.
error_password_length = Please enter a password between {0} and {1} characters in length. error_password_length = Please enter a password between {0} and {1} characters in length.
error_previous_password = Your new password cannot match the current one. error_previous_password = Your new password cannot match the current one.
password_system_has_changed = Our password system has been upgraded to make it more secure. \
Please enter a new password.
search_accounts_button = Search accounts search_accounts_button = Search accounts
accounts_search_results = Search results for accounts_search_results = Search results for