From 008744beddcc96c391dd483ff9da8cc4076c7e83 Mon Sep 17 00:00:00 2001 From: Michael Gerber Date: Sun, 1 Mar 2015 17:26:16 +0100 Subject: [PATCH] fix unit test --- .../account/freemarker/FreeMarkerAccountProvider.java | 2 +- .../theme/account/base/messages/messages_de.properties | 8 ++++---- .../theme/account/base/messages/messages_en.properties | 9 +++++++-- .../theme/login/base/messages/messages_en.properties | 2 +- .../login/freemarker/FreeMarkerLoginFormsProvider.java | 2 +- .../services/resources/LoginActionsService.java | 6 ++++-- .../keycloak/testsuite/oauth/OAuthRedirectUriTest.java | 10 +++++----- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/FreeMarkerAccountProvider.java b/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/FreeMarkerAccountProvider.java index cb4cf134bf4..ea718262cab 100755 --- a/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/FreeMarkerAccountProvider.java +++ b/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/FreeMarkerAccountProvider.java @@ -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; } diff --git a/forms/common-themes/src/main/resources/theme/account/base/messages/messages_de.properties b/forms/common-themes/src/main/resources/theme/account/base/messages/messages_de.properties index 085275eb778..cda1a962b98 100755 --- a/forms/common-themes/src/main/resources/theme/account/base/messages/messages_de.properties +++ b/forms/common-themes/src/main/resources/theme/account/base/messages/messages_de.properties @@ -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 diff --git a/forms/common-themes/src/main/resources/theme/account/base/messages/messages_en.properties b/forms/common-themes/src/main/resources/theme/account/base/messages/messages_en.properties index e49a938d89e..3458a63c507 100755 --- a/forms/common-themes/src/main/resources/theme/account/base/messages/messages_en.properties +++ b/forms/common-themes/src/main/resources/theme/account/base/messages/messages_en.properties @@ -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 diff --git a/forms/common-themes/src/main/resources/theme/login/base/messages/messages_en.properties b/forms/common-themes/src/main/resources/theme/login/base/messages/messages_en.properties index 760649fd416..e74339b8b73 100755 --- a/forms/common-themes/src/main/resources/theme/login/base/messages/messages_en.properties +++ b/forms/common-themes/src/main/resources/theme/login/base/messages/messages_en.properties @@ -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 diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java index 06c6690442d..7d926a493fe 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java +++ b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginFormsProvider.java @@ -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; } diff --git a/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java b/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java index 7f9a4053072..41809517b45 100755 --- a/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java +++ b/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java @@ -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) { diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriTest.java index efd54fe085d..a36b9d14fd2 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriTest.java @@ -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) {