LPS-124814 Use the user's time zone when displaying the next time the…

… user can change their password
jonathanmccann · Dec 11, 2020 · f1c019f · f1c019f
1 parent 6265d79
commit f1c019f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/modules/apps/users-admin/users-admin-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/users-admin/users-admin-web/src/main/resources/META-INF/resources/init.jsp
@@ -137,6 +137,7 @@ page import="com.liferay.portal.kernel.service.permission.UserPermissionUtil" %>
 page import="com.liferay.portal.kernel.util.CalendarFactoryUtil" %><%@
 page import="com.liferay.portal.kernel.util.CalendarUtil" %><%@
 page import="com.liferay.portal.kernel.util.Constants" %><%@
+page import="com.liferay.portal.kernel.util.FastDateFormatConstants" %><%@
 page import="com.liferay.portal.kernel.util.FastDateFormatFactoryUtil" %><%@
 page import="com.liferay.portal.kernel.util.GetterUtil" %><%@
 page import="com.liferay.portal.kernel.util.HashMapBuilder" %><%@
@@ -199,7 +200,8 @@ page import="java.util.HashMap" %><%@
 page import="java.util.LinkedHashMap" %><%@
 page import="java.util.List" %><%@
 page import="java.util.Map" %><%@
-page import="java.util.Set" %>
+page import="java.util.Set" %><%@
+page import="java.util.TimeZone" %>
 
 <%@ page import="javax.portlet.ActionRequest" %><%@
 page import="javax.portlet.PortletURL" %><%@

diff --git a/.../apps/users-admin/users-admin-web/src/main/resources/META-INF/resources/user/password.jsp b/.../apps/users-admin/users-admin-web/src/main/resources/META-INF/resources/user/password.jsp
@@ -117,9 +117,11 @@ else {
 
 	<%
 	UserPasswordException.MustNotBeChangedYet upe = (UserPasswordException.MustNotBeChangedYet)errorException;
+
+	Format dateFormat = FastDateFormatFactoryUtil.getDateTime(FastDateFormatConstants.SHORT, FastDateFormatConstants.LONG, locale, TimeZone.getTimeZone(upe.timeZoneId));
 	%>
 
-	<liferay-ui:message arguments="<%= String.valueOf(upe.changeableDate) %>" key="you-cannot-change-your-password-yet" translateArguments="<%= false %>" />
+	<liferay-ui:message arguments="<%= dateFormat.format(upe.changeableDate) %>" key="you-cannot-change-your-password-yet" translateArguments="<%= false %>" />
 </liferay-ui:error>
 
 <liferay-ui:error exception="<%= UserPasswordException.MustNotBeEqualToCurrent.class %>" message="your-new-password-cannot-be-the-same-as-your-old-password-please-enter-a-different-password" />

diff --git a/portal-impl/src/com/liferay/portal/security/pwd/PasswordPolicyToolkit.java b/portal-impl/src/com/liferay/portal/security/pwd/PasswordPolicyToolkit.java
@@ -196,7 +196,7 @@ public void validate(
 				!user.isPasswordReset()) {
 
 				throw new UserPasswordException.MustNotBeChangedYet(
-					userId, new Date(passwordModifiedDate.getTime() + minAge));
+					user, new Date(passwordModifiedDate.getTime() + minAge));
 			}
 		}
 

diff --git a/portal-kernel/src/com/liferay/portal/kernel/exception/UserPasswordException.java b/portal-kernel/src/com/liferay/portal/kernel/exception/UserPasswordException.java
@@ -15,9 +15,12 @@
 package com.liferay.portal.kernel.exception;
 
 import com.liferay.petra.string.StringPool;
+import com.liferay.portal.kernel.model.User;
+import com.liferay.portal.kernel.util.TimeZoneUtil;
 
 import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 /**
  * @author Brian Wing Shun Chan
@@ -194,17 +197,39 @@ public MustNotBeChanged(long userId) {
 
 	public static class MustNotBeChangedYet extends UserPasswordException {
 
+		/**
+		 * @deprecated As of Cavanaugh (7.4.x), replaced by {@link
+		 *             #MustNotBeChangedYet(User, Date)}
+		 */
+		@Deprecated
 		public MustNotBeChangedYet(long userId, Date changeableDate) {
 			super(
 				String.format(
 					"Password for user %s must not be changed until %s", userId,
 					changeableDate));
 
+			TimeZone timeZone = TimeZoneUtil.getDefault();
+
+			timeZoneId = timeZone.getID();
+
 			this.userId = userId;
 			this.changeableDate = changeableDate;
 		}
 
+		public MustNotBeChangedYet(User user, Date changeableDate) {
+			super(
+				String.format(
+					"Password for user %s must not be changed until %s",
+					user.getUserId(), changeableDate));
+
+			timeZoneId = user.getTimeZoneId();
+			userId = user.getUserId();
+
+			this.changeableDate = changeableDate;
+		}
+
 		public final Date changeableDate;
+		public String timeZoneId;
 		public long userId;
 
 	}