From 1378dbebee4cc85bc40e9000d1273b451844e241 Mon Sep 17 00:00:00 2001
From: Joseph Garrone <joseph.garrone.gj@gmail.com>
Date: Fri, 5 Mar 2021 01:35:50 +0100
Subject: [PATCH] avoid escaping urls

---
 src/bin/build-keycloak-theme/generateFtl/login.ftl   |  6 +++---
 .../build-keycloak-theme/generateFtl/register.ftl    |  2 +-
 .../build-keycloak-theme/generateFtl/template.ftl    | 12 ++++++------
 src/lib/components/Login.tsx                         |  2 --
 src/lib/components/Template.tsx                      |  2 --
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/bin/build-keycloak-theme/generateFtl/login.ftl b/src/bin/build-keycloak-theme/generateFtl/login.ftl
index 197ca336..803c96e3 100644
--- a/src/bin/build-keycloak-theme/generateFtl/login.ftl
+++ b/src/bin/build-keycloak-theme/generateFtl/login.ftl
@@ -1,8 +1,8 @@
 <script>const _= 
 {
     "url": {
-        "loginResetCredentialsUrl": "${url.loginResetCredentialsUrl}",
-        "registrationUrl": "${url.registrationUrl}"
+        "loginResetCredentialsUrl": "${url.loginResetCredentialsUrl?no_esc}",
+        "registrationUrl": "${url.registrationUrl?no_esc}"
     },
     "realm": {
         "loginWithEmailAllowed": ${realm.loginWithEmailAllowed?c},
@@ -35,7 +35,7 @@
 
                 <#list social.providers as p>
                     out.push({ 
-                        "loginUrl": "${p.loginUrl}",
+                        "loginUrl": "${p.loginUrl?no_esc}",
                         "alias": "${p.alias}",
                         "providerId": "${p.providerId}",
                         "displayName": "${p.displayName}"
diff --git a/src/bin/build-keycloak-theme/generateFtl/register.ftl b/src/bin/build-keycloak-theme/generateFtl/register.ftl
index fb260148..7635e5d2 100644
--- a/src/bin/build-keycloak-theme/generateFtl/register.ftl
+++ b/src/bin/build-keycloak-theme/generateFtl/register.ftl
@@ -1,7 +1,7 @@
 <script>const _= 
 {
     "url": {
-        "registrationAction": "${url.registrationAction}"
+        "registrationAction": "${url.registrationAction?no_esc}"
     },
     "messagesPerField": {
         "printIfExists": function (key, x) {
diff --git a/src/bin/build-keycloak-theme/generateFtl/template.ftl b/src/bin/build-keycloak-theme/generateFtl/template.ftl
index 5764bafa..c3c869e4 100644
--- a/src/bin/build-keycloak-theme/generateFtl/template.ftl
+++ b/src/bin/build-keycloak-theme/generateFtl/template.ftl
@@ -1,11 +1,11 @@
 <script>const _= 
 {
     "url": {
-        "loginAction": "${url.loginAction}",
-        "resourcesPath": "${url.resourcesPath}",
-        "resourcesCommonPath": "${url.resourcesCommonPath}",
-        "loginRestartFlowUrl": "${url.loginRestartFlowUrl}",
-        "loginUrl": "${url.loginUrl}"
+        "loginAction": "${url.loginAction?no_esc}",
+        "resourcesPath": "${url.resourcesPath?no_esc}",
+        "resourcesCommonPath": "${url.resourcesCommonPath?no_esc}",
+        "loginRestartFlowUrl": "${url.loginRestartFlowUrl?no_esc}",
+        "loginUrl": "${url.loginUrl?no_esc}"
     },
     "realm": {
         "displayName": "${realm.displayName!''}" || undefined,
@@ -27,7 +27,7 @@
 
                         <#list locale.supported as lng>
                             out.push({ 
-                                "url": "${lng.url}", 
+                                "url": "${lng.url?no_esc}", 
                                 "label": "${lng.label}",
                                 "languageTag": "${lng.languageTag}"
                             });
diff --git a/src/lib/components/Login.tsx b/src/lib/components/Login.tsx
index baabac92..f39f6c97 100644
--- a/src/lib/components/Login.tsx
+++ b/src/lib/components/Login.tsx
@@ -32,8 +32,6 @@ export const Login = memo((props: LoginProps) => {
             kcContext.pageBasename === "login.ftl"
         );
 
-        console.log(kcContext);
-
         return kcContext;
 
     });
diff --git a/src/lib/components/Template.tsx b/src/lib/components/Template.tsx
index cd0637aa..23b1bfe1 100644
--- a/src/lib/components/Template.tsx
+++ b/src/lib/components/Template.tsx
@@ -113,8 +113,6 @@ export const Template = memo((props: TemplateProps) => {
     return (
         <div className={cx(kcProperties.kcLoginClass)}>
 
-            <h1>REACT</h1>
-
             <div id="kc-header" className={cx(kcProperties.kcHeaderClass)}>
                 <div id="kc-header-wrapper" className={cx(kcProperties.kcHeaderWrapperClass)}>
                     {t("loginTitleHtml", realm.displayNameHtml)}