Skip to content

Commit f19ddec

Browse files
committed
UY-1517 fix parsing sp federation entries. Support null in names
1 parent 2944be0 commit f19ddec

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

saml/src/main/java/pl/edu/icm/unity/saml/metadata/cfg/MetadataToSPConfigConverter.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,10 @@ private I18nString getLocalizedNamesAsI18nString(UIInfoType uiInfo,
486486
SSODescriptorType idpDesc, EntityDescriptorType mainDescriptor)
487487
{
488488
I18nString ret = new I18nString();
489-
ret.addAllValues(getLocalizedNames(uiInfo, idpDesc, mainDescriptor));
489+
Map<String, String> localizedNames = getLocalizedNames(uiInfo, idpDesc, mainDescriptor);
490+
ret.addAllValues(localizedNames);
491+
if (localizedNames.containsKey(""))
492+
ret.setDefaultValue(localizedNames.get(""));
490493
return ret;
491494
}
492495

vaadin-authentication/src/main/java/io/imunity/vaadin/auth/AuthnsGridWidget.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
import io.imunity.vaadin.elements.CssClassNames;
1515

16+
import org.apache.commons.lang3.StringUtils;
1617
import org.apache.logging.log4j.Logger;
1718
import pl.edu.icm.unity.base.authn.AuthenticationOptionKeyUtils;
1819
import pl.edu.icm.unity.base.message.MessageSource;
@@ -239,7 +240,7 @@ public int compareTo(AuthenticationOptionGridEntry o)
239240
{
240241
String otherName = o.getNameWithTags().name;
241242
String thisName = getNameWithTags().name;
242-
return thisName.compareToIgnoreCase(otherName);
243+
return StringUtils.compareIgnoreCase(thisName,otherName, false);
243244
}
244245
}
245246
}

0 commit comments

Comments
 (0)