From 3cdfb422ad476077953e3829b15b0794cdfd60a1 Mon Sep 17 00:00:00 2001 From: Erik Jan de Wit Date: Fri, 20 Mar 2020 10:27:22 +0100 Subject: [PATCH] KEYCLOAK-12173 removed escaping of '&' --- .../java/org/keycloak/testsuite/ui/account2/ReferrerTest.java | 4 +--- .../main/resources/theme/keycloak-preview/account/index.ftl | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/testsuite/integration-arquillian/tests/other/base-ui/src/test/java/org/keycloak/testsuite/ui/account2/ReferrerTest.java b/testsuite/integration-arquillian/tests/other/base-ui/src/test/java/org/keycloak/testsuite/ui/account2/ReferrerTest.java index 54d7e9642b2..c62558162d3 100644 --- a/testsuite/integration-arquillian/tests/other/base-ui/src/test/java/org/keycloak/testsuite/ui/account2/ReferrerTest.java +++ b/testsuite/integration-arquillian/tests/other/base-ui/src/test/java/org/keycloak/testsuite/ui/account2/ReferrerTest.java @@ -163,8 +163,6 @@ private String getFakeClientUrl() { // we need to use some page which host exists – Firefox is throwing exceptions like crazy if we try to load // a page on a non-existing host, like e.g. http://non-existing-server/ // also we need to do this here as getAuthServerRoot is not ready when firing this class' constructor - return getAuthServerRoot() + "auth/non-existing-page/?foo=bar"; - // TODO replace ^^ with the following once KEYCLOAK-12173 and KEYCLOAK-12189 are resolved - // return getAuthServerRoot() + "auth/non-existing-page/?foo=bar&bar=foo#anchor"; + return getAuthServerRoot() + "auth/non-existing-page/?foo=bar&bar=foo#anchor"; } } diff --git a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl index 61b9aa9acb6..4521b3a1e67 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl +++ b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl @@ -44,7 +44,7 @@ <#if referrer??> var referrer = '${referrer}'; var referrerName = '${referrerName}'; - var referrerUri = '${referrer_uri}'; + var referrerUri = '${referrer_uri?no_esc}'; <#if msg??>