feat: Added same username/password validation

bundles/org.eclipse.kura.web2/META-INF/MANIFEST.MF

@@ -8,6 +8,10 @@ Bundle-License: Eclipse Public License v2.0
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
 Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .,
+ lib/gwtbootstrap3.jar,
+ lib/gwt-servlet-jakarta.jar,
+ lib/gwt-user.jar
 Import-Package: com.eclipsesource.json;version="0.9.5",
  com.google.gson;version="2.7.0",
  jakarta.servlet;version="5.0.0",
@@ -91,4 +95,3 @@ Import-Package: com.eclipsesource.json;version="0.9.5",
  org.slf4j;version="1.6.4",
  org.w3c.dom,
  org.xml.sax
-Require-Bundle: com.gwt.user;bundle-version="[2.0,3.0)"

bundles/org.eclipse.kura.web2/build.properties

@@ -17,12 +17,14 @@ bin.includes = .,\
                OSGI-INF/,\
                about.html,\
                about_files/,\
-
-output.. = target/classes/
+               lib/gwtbootstrap3.jar,\
+               lib/gwt-servlet-jakarta.jar,\
+               lib/gwt-user.jar
 source.. = src/main/java/,\
            src/main/resources/,\
            target/generated-sources/gwt
 jars.extra.classpath = lib/gwtbootstrap3.jar,\
-                       lib/gwt-user.jar
+                       lib/gwt-user.jar,\
+                       lib/gwt-servlet-jakarta.jar
 additional.bundles = org.osgi.service.component.annotations,\
-                     org.osgi.service.metatype.annotations
+                     org.osgi.service.metatype.annotations

bundles/org.eclipse.kura.web2/pom.xml

@@ -45,6 +45,11 @@
             <artifactId>gwt-user</artifactId>
             <version>${gwt.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.gwtproject</groupId>
+            <artifactId>gwt-servlet-jakarta</artifactId>
+            <version>${gwt.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -82,6 +87,11 @@
                                     <artifactId>gwt-user</artifactId>
                                     <version>${gwt.version}</version>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.gwtproject</groupId>
+                                    <artifactId>gwt-servlet-jakarta</artifactId>
+                                    <version>${gwt.version}</version>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                         <goals>

bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/EntryClassUi.java

@@ -850,7 +850,7 @@ private void changePassword() {
         loadPasswordStrengthRequirements(passwordStrengthRequirements -> {
             final PasswordChangeModal passwordChangeModal = new PasswordChangeModal();
 
-            passwordChangeModal.pickPassword(passwordStrengthRequirements, this::setNewPassword);
+            passwordChangeModal.pickPassword(Optional.empty(), passwordStrengthRequirements, this::setNewPassword);
         });
     }
 

bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/NewPasswordInput.java

@@ -16,6 +16,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 import org.eclipse.kura.web.client.ui.validator.GwtValidators;
 import org.eclipse.kura.web.shared.model.GwtPasswordStrenghtRequirements;
@@ -60,10 +61,10 @@ public List<EditorError> validate(final Editor<String> editor, final String valu
         });
     }
 
-    public void setValidatorsFrom(final GwtPasswordStrenghtRequirements userOptions) {
+    public void setValidatorsFrom(final Optional<String> identityName, final GwtPasswordStrenghtRequirements userOptions) {
         this.validators.clear();
 
-        for (final Validator<String> validator : GwtValidators.newPassword(userOptions)) {
+        for (final Validator<String> validator : GwtValidators.newPassword(identityName, userOptions)) {
             this.validators.add(validator);
         }
     }

bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/login/LoginUi.java

@@ -15,6 +15,7 @@
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -24,9 +25,9 @@
 import org.eclipse.kura.web.client.ui.AlertDialog.ConfirmListener;
 import org.eclipse.kura.web.shared.GwtKuraErrorCode;
 import org.eclipse.kura.web.shared.GwtKuraException;
-import org.eclipse.kura.web.shared.model.GwtPasswordStrenghtRequirements;
 import org.eclipse.kura.web.shared.model.GwtLoginInfo;
 import org.eclipse.kura.web.shared.model.GwtPasswordAuthenticationResult;
+import org.eclipse.kura.web.shared.model.GwtPasswordStrenghtRequirements;
 import org.eclipse.kura.web.shared.service.GwtLoginInfoService;
 import org.eclipse.kura.web.shared.service.GwtLoginInfoServiceAsync;
 import org.eclipse.kura.web.shared.service.GwtPasswordAuthenticationService;
@@ -370,7 +371,7 @@ private void setNewPassword(final String oldPassword, final String newPassword,
 
         private void changePassword(final Consumer<Void> onSuccess, final Consumer<Throwable> onFailure) {
 
-            getGwtConsoleUserOptions(options -> this.passwordChangeModal.pickPassword(options,
+            getGwtConsoleUserOptions(options -> this.passwordChangeModal.pickPassword(Optional.of(this.usernameInput.getValue()), options,
                     (oldPass, newPass) -> setNewPassword(oldPass, newPass, onSuccess, onFailure)), onFailure);
         }
 

bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/login/PasswordChangeModal.java

@@ -78,7 +78,7 @@ public int getPriority() {
 
             @Override
             public List<EditorError> validate(Editor<String> editor, String value) {
-                if (value == null || value.length() <= 0) {
+                if (value == null || value.trim().isEmpty()) {
                     return Collections
                             .singletonList(new BasicEditorError(editor, value, MSGS.loginEnterCurrentPassword()));
                 }
@@ -131,7 +131,7 @@ private void validate() {
     }
 
     @SuppressWarnings("unchecked")
-    private void setUserOptions(final GwtPasswordStrenghtRequirements options) {
+    private void setUserOptions(final Optional<String> identityName,  final GwtPasswordStrenghtRequirements options) {
         this.newPassword.setValidators(new Validator<String>() {
 
             @Override
@@ -143,7 +143,7 @@ public int getPriority() {
             public List<EditorError> validate(final Editor<String> editor, final String value) {
                 final List<EditorError> result = new ArrayList<>();
 
-                for (final Validator<String> validator : GwtValidators.newPassword(options)) {
+                for (final Validator<String> validator : GwtValidators.newPassword(identityName, options)) {
                     result.addAll(validator.validate(editor, value));
                 }
 
@@ -153,11 +153,11 @@ public List<EditorError> validate(final Editor<String> editor, final String valu
         });
     }
 
-    public void pickPassword(final GwtPasswordStrenghtRequirements options, final Callback callback) {
+    public void pickPassword(Optional<String> identityName, final GwtPasswordStrenghtRequirements options, final Callback callback) {
         this.oldPassword.setValue("");
         this.newPassword.setValue("");
         this.confirmNewPassword.setValue("");
-        setUserOptions(options);
+        setUserOptions(identityName, options);
         this.callback = Optional.of(callback);
 
         this.passwordChangeModal.show();

bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabWirelessUi.java

@@ -1287,7 +1287,7 @@ private void setPasswordValidation() {
                     || this.security.getSelectedItemText().contentEquals(WIFI_SECURITY_WPA_WPA2_MESSAGE)
                     || this.security.getSelectedItemText().contentEquals(WIFI_SECURITY_WPA2_WPA3_MESSAGE))) {
 
-                this.password.setValidatorsFrom(passwordStrengthRequirements);
+                this.password.setValidatorsFrom(Optional.empty(), passwordStrengthRequirements);
                 passwordStrengthRequirements.setPasswordMinimumLength(Math.min(passwordStrengthRequirements.getPasswordMinimumLength(), 63));
 
                 this.password
@@ -1297,12 +1297,12 @@ private void setPasswordValidation() {
 
                 passwordStrengthRequirements.setPasswordRequireSpecialChars(false);
                 passwordStrengthRequirements.setPasswordMinimumLength(Math.min(passwordStrengthRequirements.getPasswordMinimumLength(), 26));
-                this.password.setValidatorsFrom(passwordStrengthRequirements);
+                this.password.setValidatorsFrom(Optional.empty(), passwordStrengthRequirements);
                 this.password
                         .addValidator(GwtValidators.regex(REGEX_PASS_WEP, MSGS.netWifiWirelessInvalidWEPPassword()));
             } else {
                 passwordStrengthRequirements.allowAnyPassword();
-                this.password.setValidatorsFrom(passwordStrengthRequirements);
+                this.password.setValidatorsFrom(Optional.empty(), passwordStrengthRequirements);
             }
         });
 

bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/users/UserConfigUi.java

@@ -276,7 +276,8 @@ private void pickPassword() {
                     .setMessage(MSGS.usersDefineNewPassword()) //
                     .setInputCustomizer(input -> input.setType(InputType.PASSWORD)) //
                     .setOnCancel(onDismiss) //
-                    .setValidators(GwtValidators.newPassword(passwordStrengthRequirements)) //
+                    .setValidators(GwtValidators.newPassword(Optional.of(this.userData.getUserName()), //
+                            passwordStrengthRequirements)) //
                     .setOnPick(newPassword -> this.picker.builder() //
                             .setTitle(MSGS.usersConfirmPassword()) //
                             .setMessage(MSGS.usersRepeatPassword()) //