From fea33a456a8755efebaaf4737526a1487ade3608 Mon Sep 17 00:00:00 2001
From: AsimA <ahmad.asim@tib.eu>
Date: Wed, 23 May 2018 11:25:58 +0200
Subject: [PATCH] Fixed the user experience

---
 api/pom.xml                                                | 2 +-
 .../mannlib/vitro/webapp/controller/edit/Authenticate.java | 7 +++++--
 .../controller/accounts/UserAccountsSelectorTest.java      | 1 +
 webapp/pom.xml                                             | 6 +++---
 webapp/src/main/webapp/i18n/all.properties                 | 2 ++
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index a86d7b9ac..f000f3c29 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>org.vivoweb</groupId>
             <artifactId>vitro-dependencies</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>1.10.0-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
         <dependency>
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
index 8f19df8d5..3637c3f29 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
@@ -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");
 				}
 		}
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java
index a66c5998e..129442d44 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java
@@ -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());
diff --git a/webapp/pom.xml b/webapp/pom.xml
index f2e8afc94..b407d9cbf 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -7,13 +7,13 @@
 
     <groupId>org.vivoweb</groupId>
     <artifactId>vitro-webapp</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>1.10.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <parent>
         <groupId>org.vivoweb</groupId>
         <artifactId>vitro-project</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>1.10.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.vivoweb</groupId>
             <artifactId>vitro-api</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>1.10.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/webapp/src/main/webapp/i18n/all.properties b/webapp/src/main/webapp/i18n/all.properties
index b25b63184..47ea21baf 100644
--- a/webapp/src/main/webapp/i18n/all.properties
+++ b/webapp/src/main/webapp/i18n/all.properties
@@ -123,6 +123,8 @@ error_no_new_password = Please enter your new password.
 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_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
 accounts_search_results = Search results for