mirror/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-02-09 16:58:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix unit test

Browse Source
This commit is contained in:
Michael Gerber
2015-03-01 17:26:16 +01:00
parent a70a1c7a82
commit 008744bedd
7 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/FreeMarkerAccountProvider.java
View File

@@ -111,7 +111,7 @@ public class FreeMarkerAccountProvider implements AccountProvider {
if (message != null) {
String formattedMessage;
if(messages.containsKey(message)){
formattedMessage = new MessageFormat(messages.getProperty(message),locale).format(parameters);
formattedMessage = new MessageFormat(messages.getProperty(message).replace("'","''"),locale).format(parameters);
}else{
formattedMessage = message;
}

8
forms/common-themes/src/main/resources/theme/account/base/messages/messages_de.properties
View File

@@ -42,8 +42,8 @@ accountTemporarilyDisabled=Account is temporarily disabled, contact admin or try
logOutAllSessions=Log out all sessions
invalidPasswordMinLength=Invalid password: minimum length {0}
invalidPasswordMinLength=Invalid password\: minimum length {0}
invalidPasswordMinDigits=Invalid password\: must contain at least {0} numerical digits
invalidPasswordMinLowerCaseChars=Invalid password: must contain at least {0} lower case characters
invalidPasswordMinUpperCaseChars=Invalid password: must contain at least {0} upper case characters
invalidPasswordMinSpecialChars=Invalid password: must contain at least {0} special characters
invalidPasswordMinLowerCaseChars=Invalid password\: must contain at least {0} lower case characters
invalidPasswordMinUpperCaseChars=Invalid password\: must contain at least {0} upper case characters
invalidPasswordMinSpecialChars=Invalid password\: must contain at least {0} special characters

9
forms/common-themes/src/main/resources/theme/account/base/messages/messages_en.properties
View File

@@ -37,7 +37,12 @@ federatedIdentityRemovingLastProvider=You can't remove last federated identity a
identityProviderRedirectError=Failed to redirect to identity provider
identityProviderRemoved=Identity provider removed successfully
accountDisabled=Account is disabled, contact admin\
accountTemporarilyDisabled=Account is temporarily disabled, contact admin or try again later
accountDisabled=Account is disabled, contact admin
logOutAllSessions=Log out all sessions
accountTemporarilyDisabled=Account is temporarily disabled, contact admin or try again later
invalidPasswordMinLength=Invalid password\: minimum length {0}
invalidPasswordMinLowerCaseChars=Invalid password\: must contain at least {0} lower case characters
invalidPasswordMinDigits=Invalid password\: must contain at least {0} numerical digits
invalidPasswordMinUpperCaseChars=Invalid password\: must contain at least {0} upper case characters
invalidPasswordMinSpecialChars=Invalid password\: must contain at least {0} special characters

2
forms/common-themes/src/main/resources/theme/login/base/messages/messages_en.properties
View File

@@ -121,7 +121,7 @@ noAccess=No access
invalidPasswordMinLength=Invalid password: minimum length {0}
invalidPasswordMinDigits=Invalid password\: must contain at least {0} numerical digits
invalidPasswordMinLowerCaseChars=Invalid password: must contain at least {0} lower case characters
invalidPasswordMinLowerCaseChars=Invalid password\: must contain at least {0} lower case characters
invalidPasswordMinUpperCaseChars=Invalid password: must contain at least {0} upper case characters
invalidPasswordMinSpecialChars=Invalid password: must contain at least {0} special characters

2
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java
View File

@@ -186,7 +186,7 @@ import java.util.concurrent.TimeUnit;
if (message != null) {
String formattedMessage;
if(messages.containsKey(message)){
formattedMessage = new MessageFormat(messages.getProperty(message),locale).format(parameters);
formattedMessage = new MessageFormat(messages.getProperty(message).replace("'","''"),locale).format(parameters);
}else{
formattedMessage = message;
}

6
services/src/main/java/org/keycloak/services/resources/LoginActionsService.java
View File

@@ -439,8 +439,10 @@ public class LoginActionsService {
Object[] parameters = new Object[0];
if (errorMessage == null) {
PasswordPolicy.Error error = Validation.validatePassword(formData, realm.getPasswordPolicy());
errorMessage = error.getMessage();
parameters = error.getParameters();
if(error != null){
errorMessage = error.getMessage();
parameters = error.getParameters();
}
}
if (errorMessage != null) {

10
testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriTest.java
View File

@@ -108,7 +108,7 @@ public class OAuthRedirectUriTest {
oauth.openLoginForm();
Assert.assertTrue(errorPage.isCurrent());
Assert.assertEquals("Invalid redirect_uri.", errorPage.getError());
Assert.assertEquals("Invalid redirect uri", errorPage.getError());
} finally {
keycloakRule.update(new KeycloakRule.KeycloakSetup() {
@Override
@@ -133,7 +133,7 @@ public class OAuthRedirectUriTest {
oauth.openLoginForm();
Assert.assertTrue(errorPage.isCurrent());
Assert.assertEquals("Invalid redirect_uri.", errorPage.getError());
Assert.assertEquals("Invalid redirect uri", errorPage.getError());
} finally {
keycloakRule.update(new KeycloakRule.KeycloakSetup() {
@Override
@@ -158,7 +158,7 @@ public class OAuthRedirectUriTest {
oauth.openLoginForm();
Assert.assertTrue(errorPage.isCurrent());
Assert.assertEquals("Invalid redirect_uri.", errorPage.getError());
Assert.assertEquals("Invalid redirect uri", errorPage.getError());
} finally {
keycloakRule.update(new KeycloakRule.KeycloakSetup() {
@Override
@@ -184,7 +184,7 @@ public class OAuthRedirectUriTest {
oauth.openLoginForm();
Assert.assertTrue(errorPage.isCurrent());
Assert.assertEquals("Invalid redirect_uri.", errorPage.getError());
Assert.assertEquals("Invalid redirect uri", errorPage.getError());
}
@Test
@@ -244,7 +244,7 @@ public class OAuthRedirectUriTest {
Assert.assertTrue(loginPage.isCurrent());
} else {
Assert.assertTrue(errorPage.isCurrent());
Assert.assertEquals("Invalid redirect_uri.", errorPage.getError());
Assert.assertEquals("Invalid redirect uri", errorPage.getError());
}
if (expectValid) {