Remove blank spaces in email links

tidepool-org · May 9, 2023 · 7e0a42c · 7e0a42c
1 parent 452c59c
commit 7e0a42c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 17 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ RUN unset MAVEN_CONFIG && \
     ./mvnw clean compile package && \
     wget -O keycloak-rest-provider.jar https://github.com/toddkazakov/keycloak-user-migration/releases/download/v1.1/keycloak-rest-provider.jar && \
     wget -O keycloak-metrics-spi.jar https://github.com/toddkazakov/keycloak-metrics-spi/releases/download/2.5.4-20.0.1/keycloak-metrics-spi-2.5.4.jar && \
-    wget -O keycloak-home-idp-discovery.jar https://github.com/toddkazakov/keycloak-home-idp-discovery/releases/download/0.2.0/keycloak-home-idp-discovery.jar    
+    wget -O keycloak-home-idp-discovery.jar https://github.com/toddkazakov/keycloak-home-idp-discovery/releases/download/0.3.0/keycloak-home-idp-discovery.jar    
 
 FROM alpine:3.15 as release
 

diff --git a/tidepool-theme/email/html/email-verification.ftl b/tidepool-theme/email/html/email-verification.ftl
@@ -6,7 +6,5 @@
         Please verify your Tidepool account! The verification link will expire in ${kcSanitize(linkExpirationFormatter(linkExpiration))?no_esc}.
     <#elseif section = "actionText">
         Verify Your Account
-    <#elseif section = "actionLink">
-        ${kcSanitize(link)?no_esc}
-    </#if>
+    <#elseif section = "actionLink">${kcSanitize(link)?no_esc}</#if>
 </@layout.emailLayout>
diff --git a/tidepool-theme/email/html/executeActions.ftl b/tidepool-theme/email/html/executeActions.ftl
@@ -10,7 +10,5 @@
       ${kcSanitize(msg("executeActionsBodyHtml",link, linkExpiration, realmName, requiredActionsText, linkExpirationFormatter(linkExpiration)))?no_esc}
     <#elseif section = "actionText">
       Update Your Account
-    <#elseif section = "actionLink">
-        ${kcSanitize(link)?no_esc}
-    </#if>
+    <#elseif section = "actionLink">${kcSanitize(link)?no_esc}</#if>
 </@layout.emailLayout>
diff --git a/tidepool-theme/email/html/identity-provider-link.ftl b/tidepool-theme/email/html/identity-provider-link.ftl
@@ -6,7 +6,5 @@
       ${kcSanitize(msg("identityProviderLinkBodyHtml", identityProviderAlias, realmName, identityProviderContext.username, link, linkExpiration, linkExpirationFormatter(linkExpiration)))?no_esc}
     <#elseif section = "actionText">
       Confirm Account Linking
-    <#elseif section = "actionLink">
-        ${kcSanitize(link)?no_esc}
-    </#if>
+    <#elseif section = "actionLink">${kcSanitize(link)?no_esc}</#if>
 </@layout.emailLayout>
diff --git a/tidepool-theme/email/html/password-reset.ftl b/tidepool-theme/email/html/password-reset.ftl
@@ -6,7 +6,5 @@
         You requested a password reset. If you didn't request this, please ignore this email.<br /><br />Otherwise, click the link below. The link will expire in ${kcSanitize(linkExpirationFormatter(linkExpiration))?no_esc}.
     <#elseif section = "actionText">
         Reset Password
-    <#elseif section = "actionLink">
-        ${kcSanitize(link)?no_esc}
-    </#if>
+    <#elseif section = "actionLink">${kcSanitize(link)?no_esc}</#if>
 </@layout.emailLayout>
diff --git a/tidepool-theme/login/login-idp-link-email.ftl b/tidepool-theme/login/login-idp-link-email.ftl
@@ -18,9 +18,6 @@
                 <p id="instruction2" class="instruction">
                     <a class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!} tp-btn-fw"  href="${url.loginAction}">${msg("emailLinkIdpResendVerificationCode")}</a>
                 </p>
-                <p id="instruction2" class="instruction">
-                    <a class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!} tp-btn-fw"  href="${url.loginAction}">${msg("emailLinkIdpResendVerificationCode")}</a>
-                </p>
                 <p id="instruction3" class="instruction">
                     ${msg("emailLinkIdp4")} <a href="${url.loginAction}">${msg("doClickHere")}</a> ${msg("emailLinkIdp5")}
                 </p>

diff --git a/tidepool-theme/login/messages/messages_en.properties b/tidepool-theme/login/messages/messages_en.properties
@@ -6,7 +6,7 @@ doCreateAccount=Create Account
 continue=Continue
 keepingYourDataSecure=Keeping your data private and secure is important to us!
 next=Next
-letsGetStarted=Let''s Get Started
+letsGetStarted=Sign in to Tidepool
 enterYourEmail=Enter your email address
 enterYourUsername=Enter your username
 enterYourUsernameOrEmail=Enter your username or email address