Skip to content

Commit 0d55a49

Browse files
committed
UY-1034 per saml authenticator setting in console of registration form
it was setting a config property which was never implemented
1 parent bdc2be6 commit 0d55a49

2 files changed

Lines changed: 0 additions & 26 deletions

File tree

saml/src/main/java/pl/edu/icm/unity/saml/sp/console/SAMLAuthenticatorEditor.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ class SAMLAuthenticatorEditor extends BaseAuthenticatorEditor implements Authent
8181
private SubViewSwitcher subViewSwitcher;
8282

8383
private Set<String> credentials;
84-
private List<String> registrationForms;
8584
private Set<String> realms;
8685
private List<String> idTypes;
8786

@@ -105,8 +104,6 @@ class SAMLAuthenticatorEditor extends BaseAuthenticatorEditor implements Authent
105104
this.registrationMan = registrationMan;
106105
this.imageAccessService = imageAccessService;
107106
this.credentials = pkiMan.getCredentialNames();
108-
this.registrationForms = registrationMan.getForms().stream().map(f -> f.getName())
109-
.collect(Collectors.toList());
110107
this.realms = realmMan.getRealms().stream().map(r -> r.getName()).collect(Collectors.toSet());
111108
this.idTypes = idTypesReg.getAll().stream().map(i -> i.getId()).collect(Collectors.toList());
112109

@@ -198,12 +195,6 @@ private FormLayoutWithFixedCaptionWidth buildHeaderSection()
198195
header.addComponent(defaultRequestedNameFormat);
199196
configBinder.forField(defaultRequestedNameFormat).bind("defaultRequestedNameFormat");
200197

201-
ComboBox<String> registrationForm = new ComboBox<>(
202-
msg.getMessage("SAMLAuthenticatorEditor.registrationForm"));
203-
registrationForm.setItems(registrationForms);
204-
header.addComponent(registrationForm);
205-
configBinder.forField(registrationForm).bind("registrationForm");
206-
207198
CheckBox defAccountAssociation = new CheckBox(
208199
msg.getMessage("SAMLAuthenticatorEditor.defAccountAssociation"));
209200
configBinder.forField(defAccountAssociation).bind("defAccountAssociation");

saml/src/main/java/pl/edu/icm/unity/saml/sp/console/SAMLAuthneticatorConfiguration.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public class SAMLAuthneticatorConfiguration
5151
private boolean requireSignedAssertion;
5252
private boolean defSignRequest;
5353
private List<String> defaultRequestedNameFormat;
54-
private String registrationForm;
5554
private boolean defAccountAssociation;
5655
private List<SAMLAuthnTrustedFederationConfiguration> trustedFederations;
5756
private List<SAMLIndividualTrustedSamlIdpConfiguration> individualTrustedIdps;
@@ -100,11 +99,6 @@ public String toProperties(PKIManagement pkiMan, FileStorageService fileService,
10099
.put(SAMLSPProperties.P + SAMLSPProperties.DEF_REQUESTED_NAME_FORMAT, d));
101100
}
102101

103-
if (getRegistrationForm() != null)
104-
{
105-
raw.put(SAMLSPProperties.P + CommonWebAuthnProperties.REGISTRATION_FORM, getRegistrationForm());
106-
}
107-
108102
raw.put(SAMLSPProperties.P + CommonWebAuthnProperties.DEF_ENABLE_ASSOCIATION,
109103
String.valueOf(isDefAccountAssociation()));
110104

@@ -185,7 +179,6 @@ public void fromProperties(PKIManagement pkiMan, URIAccessService uriAccessServi
185179
setDefSignRequest(samlSpProp.getBooleanValue(SAMLSPProperties.DEF_SIGN_REQUEST));
186180
String defNameFormat = samlSpProp.getValue(SAMLSPProperties.DEF_REQUESTED_NAME_FORMAT);
187181
setDefaultRequestedNameFormat(defNameFormat != null ? Arrays.asList(defNameFormat) : null);
188-
setRegistrationForm(samlSpProp.getValue(CommonWebAuthnProperties.REGISTRATION_FORM));
189182
if (samlSpProp.isSet(CommonWebAuthnProperties.DEF_ENABLE_ASSOCIATION))
190183
{
191184
setDefAccountAssociation(
@@ -344,16 +337,6 @@ public void setDefaultRequestedNameFormat(List<String> defaultRequestedNameForma
344337
this.defaultRequestedNameFormat = defaultRequestedNameFormat;
345338
}
346339

347-
public String getRegistrationForm()
348-
{
349-
return registrationForm;
350-
}
351-
352-
public void setRegistrationForm(String registrationForm)
353-
{
354-
this.registrationForm = registrationForm;
355-
}
356-
357340
public boolean isDefAccountAssociation()
358341
{
359342
return defAccountAssociation;

0 commit comments

Comments
 (0)