Skip to content

Commit

Permalink
fix: unhide keystore field and add error correction that prevents ca-…
Browse files Browse the repository at this point in the history
…cert being filled and keystore being null [backport release-5.4.0] (#5032)

fix: unhide keystore field and add error correction that prevents ca-cert being filled and keystore being null (#5030)

(cherry picked from commit aaf6d5c)

Co-authored-by: G_Ivo <[email protected]>
  • Loading branch information
github-actions[bot] and GregoryIvo authored Nov 29, 2023
1 parent cd573c6 commit 564a513
Showing 1 changed file with 5 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 564a513

Please sign in to comment.