Skip to content

Commit 83258a8

Browse files
authored
validate passwordLength and add fields to validator manager (ITISFoundation#2478)
1 parent 8a42137 commit 83258a8

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

services/web/client/source/class/osparc/auth/core/Utils.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ qx.Class.define("osparc.auth.core.Utils", {
2020

2121
statics:
2222
{
23+
passwordLengthValidator: function(value, item) {
24+
const valid = value != null && value.length > 3;
25+
if (!valid) {
26+
item.setInvalidMessage("Please enter a password at with least 4 characters.");
27+
}
28+
return valid;
29+
},
30+
2331
checkSamePasswords: function(passwordField1, passwordField2) {
2432
const isValid = passwordField1.getValue() == passwordField2.getValue();
2533
if (!isValid) {

services/web/client/source/class/osparc/auth/ui/RegistrationView.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ qx.Class.define("osparc.auth.ui.RegistrationView", {
3131
*/
3232

3333
members: {
34-
__email: null,
3534
__submitBtn: null,
3635
__cancelBtn: null,
3736

@@ -48,7 +47,6 @@ qx.Class.define("osparc.auth.ui.RegistrationView", {
4847
});
4948
this.add(email);
5049
osparc.utils.Utils.setIdToWidget(email, "registrationEmailFld");
51-
this.__email = email;
5250
this.addListener("appear", () => {
5351
email.focus();
5452
email.activate();
@@ -78,9 +76,9 @@ qx.Class.define("osparc.auth.ui.RegistrationView", {
7876

7977
// validation
8078
validator.add(email, qx.util.Validate.email());
81-
validator.setValidator(function(_itemForms) {
82-
return osparc.auth.core.Utils.checkSamePasswords(pass1, pass2);
83-
});
79+
validator.add(pass1, osparc.auth.core.Utils.passwordLengthValidator);
80+
validator.add(pass2, osparc.auth.core.Utils.passwordLengthValidator);
81+
validator.setValidator(() => osparc.auth.core.Utils.checkSamePasswords(pass1, pass2));
8482

8583
// submit & cancel buttons
8684
const grp = new qx.ui.container.Composite(new qx.ui.layout.HBox(10));

services/web/client/source/class/osparc/auth/ui/ResetPassView.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ qx.Class.define("osparc.auth.ui.ResetPassView", {
5656
});
5757
this.add(code);
5858

59+
validator.add(password, osparc.auth.core.Utils.passwordLengthValidator);
60+
validator.add(confirm, osparc.auth.core.Utils.passwordLengthValidator);
5961
validator.setValidator(function(_itemForms) {
6062
return osparc.auth.core.Utils.checkSamePasswords(password, confirm);
6163
});

services/web/client/source/class/osparc/desktop/preferences/pages/SecurityPage.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ qx.Class.define("osparc.desktop.preferences.pages.SecurityPage", {
5757
box.add(confirm);
5858

5959
const manager = new qx.ui.form.validation.Manager();
60+
manager.add(newPassword, osparc.auth.core.Utils.passwordLengthValidator);
61+
manager.add(confirm, osparc.auth.core.Utils.passwordLengthValidator);
6062
manager.setValidator(function(_itemForms) {
6163
return osparc.auth.core.Utils.checkSamePasswords(newPassword, confirm);
6264
});

0 commit comments

Comments
 (0)