fix: unhide keystore field and add error correction that prevents ca-…

…cert being filled and keystore being null
eclipse-kura · Nov 29, 2023 · e34b661 · e34b661
1 parent 3488f31
commit e34b661
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...rg.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/Tab8021xUi.java b/...rg.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/Tab8021xUi.java
@@ -477,6 +477,11 @@ public boolean isValid() {
                 this.formgroupPassword.setValidationState(ValidationState.ERROR);
                 return false;
             }
+
+            if (this.keystorePid.getValue().isEmpty() && !this.caCertName.getValue().isEmpty()) {
+                this.identityKeystorePid.setValidationState(ValidationState.ERROR);
+                return false;
+            }
         }
 
         return true;
@@ -523,7 +528,6 @@ private void refreshFieldsBasedOnSelectedValues() {
         switch (Gwt8021xEap.valueOf(this.eap.getSelectedValue())) {
         case PEAP:
         case TTLS:
-            this.keystorePid.setEnabled(false);
             setInnerAuthTo(Gwt8021xInnerAuth.MSCHAPV2);
             this.publicPrivateKeyPairName.setEnabled(false);
             break;