fixing security questions page while using for login auth; styles fixing

Evolveum · Mar 1, 2023 · 072e124 · 072e124
1 parent af501be
commit 072e124
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 28 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageSecurityQuestions.html b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageSecurityQuestions.html
@@ -13,26 +13,25 @@
 <wicket:extend>
     <form class="form-horizontal" action="ignore" wicket:id="mainForm">
         <wicket:enclosure child="username">
-            <label class="col-md-4 col-lg-4 control-label">
+            <label class="control-label">
                 <wicket:message key="PageLogin.username"/>
             </label>
 
-            <div class="col-md-8 col-lg-8">
-                <input name="username" type="text" class="form-control form-control-sm focus-username"
+            <input name="username" type="text" class="form-control form-control-sm focus-username login-panel-control"
                         wicket:message="placeholder:PageLogin.username" wicket:id="username">
-            </div>
 
             <div wicket:id="dynamicLayout">
                 <div wicket:id="dynamicForm"/>
             </div>
 
-            <div class="pull-right" wicket:id="firstLevelButtons">
-                <a class="btn btn-default" wicket:id="back1">
-                    <wicket:message key="PageBase.button.back"/>
-                </a>
-                <a class="btn btn-primary" wicket:id="showQuestions">
+            <div wicket:id="firstLevelButtons">
+                <a class="btn btn-primary login-panel-control mt-2" wicket:id="showQuestions">
                     <wicket:message key="PageSecurityQuestions.showQuestions"/>
                 </a>
+                <a class="text-center login-panel-control mt-2" style="display: inline-block;"  wicket:id="back1">
+                    <i class="fas fa-arrow-left mr-2"></i>
+                    <wicket:message key="PageEmailNonce.backButtonLabel"/>
+                </a>
             </div>
         </wicket:enclosure>
 

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageSecurityQuestions.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageSecurityQuestions.java
@@ -15,6 +15,8 @@
 
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 
+import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour;
+
 import com.github.openjson.JSONArray;
 import com.github.openjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
@@ -32,7 +34,6 @@
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.model.util.ListModel;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 
@@ -48,7 +49,6 @@
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.AjaxButton;
-import com.evolveum.midpoint.web.component.AjaxSubmitButton;
 import com.evolveum.midpoint.web.component.form.MidpointForm;
 import com.evolveum.midpoint.web.component.prism.DynamicFormPanel;
 import com.evolveum.midpoint.web.page.error.PageError;
@@ -179,20 +179,6 @@ protected void onUpdate(AjaxRequestTarget target) {
 
 
         questionsContainer.add(createBackButton(ID_BACK_2_BUTTON));
-//        AjaxButton back = new AjaxButton(ID_BACK_2_BUTTON) {
-//
-//            private static final long serialVersionUID = 1L;
-//
-//            @Override
-//            public void onClick(AjaxRequestTarget target) {
-//                userModel.detach();
-//                questionsModel.setObject(new ArrayList<SecurityQuestionDto>());
-//                getHiddenUsername().getModel().setObject(null);
-//                getHiddenAnswer().getModel().setObject(null);
-//                target.add(getMainForm());
-//            }
-//        };
-//        questionsContainer.add(back);
     }
 
     private String generateAnswer() {
@@ -216,12 +202,12 @@ private void initButtons(MidpointForm<?> form) {
         firstLevelButtonContainer.setOutputMarkupId(true);
         form.add(firstLevelButtonContainer);
 
-        AjaxSubmitButton showQuestion = new AjaxSubmitButton(ID_SHOW_QUESTIONS_BUTTON) {
+        AjaxButton showQuestion = new AjaxButton(ID_SHOW_QUESTIONS_BUTTON) {
 
             private static final long serialVersionUID = 1L;
 
             @Override
-            protected void onSubmit(AjaxRequestTarget target) {
+            public void onClick(AjaxRequestTarget target) {
                 showQuestions(target);
             }
         };
@@ -231,8 +217,9 @@ protected void onSubmit(AjaxRequestTarget target) {
     }
 
     private void initStaticLayout(MidpointForm<?> form) {
-        RequiredTextField<String> visibleUsername = new RequiredTextField<>(ID_USERNAME, new Model<>());
+        RequiredTextField<String> visibleUsername = new RequiredTextField<>(ID_USERNAME, Model.of());
         visibleUsername.setOutputMarkupId(true);
+        visibleUsername.add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
         visibleUsername.add(new VisibleBehaviour(() -> !isUserDefined() && !isDynamicForm()));
         form.add(visibleUsername);
     }
@@ -242,6 +229,7 @@ private boolean isUserDefined() {
     }
 
     private void showQuestions(AjaxRequestTarget target) {
+        userModel.detach();
         UserType user = userModel.getObject();
 
         if (user == null) {