Repository: openmeetings Updated Branches: refs/heads/master a2d59114e -> 04bd73450
no jira: reset password dialog is fixed, warnings are eliminated Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/04bd7345 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/04bd7345 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/04bd7345 Branch: refs/heads/master Commit: 04bd7345076e805ecf9c446e39c57099be4be68e Parents: a2d5911 Author: Maxim Solodovnik <[email protected]> Authored: Wed May 24 11:35:59 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed May 24 11:36:26 2017 +0700 ---------------------------------------------------------------------- .../apache/openmeetings/web/common/Captcha.java | 10 +-- .../web/pages/auth/ResetPasswordDialog.java | 90 +++++++++++--------- .../openmeetings/webservice/UserWebService.java | 4 +- 3 files changed, 56 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/04bd7345/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java index 4283f68..8e2ae78 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java @@ -53,6 +53,11 @@ public class Captcha extends Panel { super(id); setOutputMarkupId(true); add(captcha.setOutputMarkupId(true)); + } + + @Override + protected void onInitialize() { + super.onInitialize(); add(captchaText.setLabel(Model.of(getString("captcha.text"))).add(new IValidator<String>() { private static final long serialVersionUID = 1L; @@ -63,11 +68,6 @@ public class Captcha extends Panel { } } })); - } - - @Override - protected void onInitialize() { - super.onInitialize(); add(new AjaxLink<String>("refresh") { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/04bd7345/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java index 05efde5..f5fcc28 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java @@ -48,7 +48,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel; public class ResetPasswordDialog extends NonClosableDialog<String> { private static final long serialVersionUID = 1L; private DialogButton resetBtn = new DialogButton("reset", Application.getString(327)); - private Form<String> form; + private Form<String> form = new ResetForm("form"); private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); private PasswordTextField password; private final User user; @@ -62,46 +62,7 @@ public class ResetPasswordDialog extends NonClosableDialog<String> { @Override protected void onInitialize() { super.onInitialize(); - add(form = new Form<String>("form") { - private static final long serialVersionUID = 1L; - private TextField<String> login; - private PasswordTextField confirmPassword; - { - add(feedback.setOutputMarkupId(true)); - add(login = new TextField<>("login", Model.of(user.getLogin()))); - login.setOutputMarkupId(true); - add(password = new PasswordTextField("password", new Model<String>())); - password.setLabel(Model.of(getString("328"))).setOutputMarkupId(true); - ConfigurationDao cfgDao = getBean(ConfigurationDao.class); - password.setRequired(false).add(new StrongPasswordValidator(getMinPasswdLength(cfgDao), user)); - add(confirmPassword = new PasswordTextField("confirmPassword", new Model<String>())); - confirmPassword.setLabel(Model.of(getString("329"))).setOutputMarkupId(true); - - add(new AjaxButton("submit") { // FAKE button so "submit-on-enter" works as expected - private static final long serialVersionUID = 1L; - - @Override - protected void onSubmit(AjaxRequestTarget target) { - ResetPasswordDialog.this.onSubmit(target); - } - - @Override - protected void onError(AjaxRequestTarget target) { - ResetPasswordDialog.this.onError(target); - } - }); - } - - @Override - protected void onValidate() { - String pass = password.getConvertedInput(); - if (pass != null && !pass.isEmpty() && !pass.equals(confirmPassword.getConvertedInput())) { - error(getString("232")); - } - super.onValidate(); - } - - }); + add(form); confirmReset = new NonClosableMessageDialog("confirmReset", getString("325"), getString("332")) { private static final long serialVersionUID = 1L; @@ -156,4 +117,51 @@ public class ResetPasswordDialog extends NonClosableDialog<String> { setResponsePage(Application.get().getSignInPageClass()); } } + + private class ResetForm extends Form<String> { + private static final long serialVersionUID = 1L; + private TextField<String> login; + private PasswordTextField confirmPassword; + + private ResetForm(String id) { + super(id); + } + + @Override + protected void onInitialize() { + super.onInitialize(); + add(feedback.setOutputMarkupId(true)); + add(login = new TextField<>("login", Model.of(user.getLogin()))); + login.setOutputMarkupId(true); + add(password = new PasswordTextField("password", new Model<String>())); + password.setLabel(Model.of(getString("328"))).setOutputMarkupId(true); + ConfigurationDao cfgDao = getBean(ConfigurationDao.class); + password.setRequired(false).add(new StrongPasswordValidator(getMinPasswdLength(cfgDao), user)); + add(confirmPassword = new PasswordTextField("confirmPassword", new Model<String>())); + confirmPassword.setLabel(Model.of(getString("329"))).setOutputMarkupId(true); + + add(new AjaxButton("submit") { // FAKE button so "submit-on-enter" works as expected + private static final long serialVersionUID = 1L; + + @Override + protected void onSubmit(AjaxRequestTarget target) { + ResetPasswordDialog.this.onSubmit(target); + } + + @Override + protected void onError(AjaxRequestTarget target) { + ResetPasswordDialog.this.onError(target); + } + }); + } + + @Override + protected void onValidate() { + String pass = password.getConvertedInput(); + if (pass != null && !pass.isEmpty() && !pass.equals(confirmPassword.getConvertedInput())) { + error(getString("232")); + } + super.onValidate(); + } + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/04bd7345/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java index 2297d57..de7c538 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.webservice; import static org.apache.openmeetings.db.dto.basic.ServiceResult.NO_PERMISSION; +import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.apache.openmeetings.webservice.Constants.TNS; import static org.apache.openmeetings.webservice.Constants.USER_SERVICE_NAME; @@ -60,7 +61,6 @@ import org.apache.openmeetings.db.entity.user.Address; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; import org.apache.openmeetings.db.util.AuthLevelUtil; -import org.apache.openmeetings.db.util.UserHelper; import org.apache.openmeetings.util.OmException; import org.apache.openmeetings.util.OpenmeetingsVariables; import org.apache.openmeetings.webservice.cluster.UserService; @@ -177,7 +177,7 @@ public class UserWebService implements UserService { if (user.getLanguageId() == null) { user.setLanguageId(1L); } - IValidator<String> passValidator = new StrongPasswordValidator(true, UserHelper.getMinPasswdLength(cfgDao), user.get(userDao)); + IValidator<String> passValidator = new StrongPasswordValidator(true, getMinPasswdLength(cfgDao), user.get(userDao)); Validatable<String> passVal = new Validatable<>(user.getPassword()); passValidator.validate(passVal); if (!passVal.isValid()) {
