Supporting mustChangePassword for User templates

apache · Aug 9, 2023 · ba12ccd · ba12ccd
1 parent 6629542
commit ba12ccd
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/...repo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java b/...repo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
@@ -22,6 +22,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.ui.commons.ajax.markup.html.LabelInfo;
+import org.apache.syncope.client.ui.commons.markup.html.form.AjaxCheckBoxPanel;
 import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel;
 import org.apache.syncope.client.ui.commons.wicket.markup.html.bootstrap.tabs.Accordion;
 import org.apache.syncope.client.ui.commons.wizards.any.PasswordPanel;
@@ -43,25 +44,22 @@ public class UserDetails extends Details<UserTO> {
 
     private static final long serialVersionUID = 6592027822510220463L;
 
-    private static final String PASSWORD_CONTENT_PATH = "body:content";
-
-    protected final AjaxTextFieldPanel username;
-
-    protected final UserTO userTO;
-
     public UserDetails(
             final UserWrapper wrapper,
             final boolean templateMode,
             final boolean includeStatusPanel,
             final boolean showPasswordManagement,
             final PageReference pageRef) {
+
         super(wrapper, templateMode, includeStatusPanel, pageRef);
 
-        userTO = wrapper.getInnerObject();
+        UserTO userTO = wrapper.getInnerObject();
+
         // ------------------------
         // Username
         // ------------------------
-        username = new AjaxTextFieldPanel(Constants.USERNAME_FIELD_NAME, Constants.USERNAME_FIELD_NAME,
+        AjaxTextFieldPanel username = new AjaxTextFieldPanel(
+                Constants.USERNAME_FIELD_NAME, Constants.USERNAME_FIELD_NAME,
                 new PropertyModel<>(userTO, Constants.USERNAME_FIELD_NAME), false);
 
         if (wrapper.getPreviousUserTO() != null && StringUtils.compare(
@@ -78,6 +76,15 @@ public UserDetails(
         add(username);
         // ------------------------
 
+        // ------------------------
+        // mustChangePassword
+        // ------------------------
+        AjaxCheckBoxPanel mustChangePassword = new AjaxCheckBoxPanel(
+                "mustChangePassword", "mustChangePassword", new PropertyModel<>(userTO, "mustChangePassword"));
+
+        add(mustChangePassword.setOutputMarkupPlaceholderTag(true).setVisible(templateMode));
+        // ------------------------
+
         // ------------------------
         // Password
         // ------------------------
@@ -107,7 +114,7 @@ protected Component newTitle(final String markupId, final ITab tab, final Accord
                     @Override
                     public void onClick(final AjaxRequestTarget target) {
                         model.setObject(model.getObject() == 0 ? -1 : 0);
-                        Component passwordPanel = getParent().get(PASSWORD_CONTENT_PATH);
+                        Component passwordPanel = getParent().get("body:content");
                         passwordPanel.setEnabled(model.getObject() >= 0);
                         target.add(passwordPanel);
                     }
@@ -118,7 +125,7 @@ public void onClick(final AjaxRequestTarget target) {
         accordion.setOutputMarkupId(true);
         accordion.setVisible(showPasswordManagement);
         add(accordion);
-        // ------------------------        
+        // ------------------------
     }
 
     @Override
@@ -130,10 +137,7 @@ public static class EditUserPasswordPanel extends Panel {
 
         private static final long serialVersionUID = -8198836979773590078L;
 
-        public EditUserPasswordPanel(
-                final String id,
-                final UserWrapper wrapper,
-                final boolean templateMode) {
+        public EditUserPasswordPanel(final String id, final UserWrapper wrapper, final boolean templateMode) {
             super(id);
             setOutputMarkupId(true);
             add(new Label("warning", new ResourceModel("password.change.warning")));

diff --git a/...console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.html b/...console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.html
@@ -22,6 +22,10 @@
       <span wicket:id="username"/>
     </div>
 
+    <div class="form-group">
+      <span wicket:id="mustChangePassword"/>
+    </div>
+
     <div wicket:id="accordionPanel"></div>
   </wicket:extend>
 </html>
diff --git a/...ing-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/TemplateUtils.java b/...ing-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/TemplateUtils.java
@@ -176,6 +176,14 @@ public void apply(final RealmMember realmMember, final AnyTO template) {
                 }
             }
 
+            if (((UserTO) template).isMustChangePassword()) {
+                if (realmMember instanceof UserTO) {
+                    ((UserTO) realmMember).setMustChangePassword(true);
+                } else if (realmMember instanceof UserCR) {
+                    ((UserCR) realmMember).setMustChangePassword(true);
+                }
+            }
+
             fillRelationships((GroupableRelatableTO) realmMember, ((GroupableRelatableTO) template));
             fillMemberships((GroupableRelatableTO) realmMember, ((GroupableRelatableTO) template));