From e34b661b99441ac0be35d758edbf757d1c802722 Mon Sep 17 00:00:00 2001
From: Gregory Ivo <gregorybivo@gmail.com>
Date: Tue, 28 Nov 2023 23:15:38 -0500
Subject: [PATCH] fix: unhide keystore field and add error correction that
 prevents ca-cert being filled and keystore being null

---
 .../org/eclipse/kura/web/client/ui/network/Tab8021xUi.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/Tab8021xUi.java b/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/Tab8021xUi.java
index 0fab4a68027..85706710dca 100644
--- a/kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/Tab8021xUi.java
+++ b/kura/org.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;