Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for the IndexOutOfBoundsException in the IDP Linking flow #9218

Closed
wants to merge 2 commits into from
Closed

Fix for the IndexOutOfBoundsException in the IDP Linking flow #9218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f306f09
Fix for the IndexOutOfBoundsException in the IDP Linking flow
vilmosnagy Dec 17, 2021
db9d0c0
Add some test cases for the capitalize method.
vilmosnagy Dec 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions common/src/main/java/org/keycloak/common/util/ObjectUtil.java
View file
Open in desktop
Expand Up @@ -44,6 +44,9 @@ public static boolean isEqualOrBothNull(Object str1, Object str2) {


public static String capitalize(String str) {
if (str.isEmpty()) {
return "";
}
return str.substring(0, 1).toUpperCase() + str.substring(1);
}

Expand Down
17 changes: 17 additions & 0 deletions common/src/test/java/org/keycloak/common/util/ObjectUtilTest.java
View file
Open in desktop
@@ -0,0 +1,17 @@
package org.keycloak.common.util;

import org.junit.Test;

import static org.junit.Assert.*;

public class ObjectUtilTest {

@Test
public void shouldCapitalizeCorrectly() {
assertEquals("", ObjectUtil.capitalize(""));
assertEquals("T", ObjectUtil.capitalize("t"));
assertEquals("Test", ObjectUtil.capitalize("test"));
assertEquals("Test string", ObjectUtil.capitalize("test string"));
}

}
2 changes: 1 addition & 1 deletion services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java
View file
Open in desktop
Expand Up @@ -148,7 +148,7 @@ public void sendConfirmIdentityBrokerLink(String link, long expirationInMinutes)
String idpDisplayName = brokerContext.getIdpConfig().getDisplayName();
idpAlias = ObjectUtil.capitalize(idpAlias);

if (idpDisplayName != null) {
if (idpDisplayName != null && !idpDisplayName.isEmpty()) {
idpAlias = ObjectUtil.capitalize(idpDisplayName);
}

Expand Down