From 304e3b8380f3370fac5e5d134d772349cda6425c Mon Sep 17 00:00:00 2001
From: illfixit <66363651+illfixit@users.noreply.github.com>
Date: Tue, 12 Mar 2024 08:50:21 +0100
Subject: [PATCH 1/6] chore: add password visibility icons to login form

---
 authority-portal-keycloak/mds-theme/login/theme.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/authority-portal-keycloak/mds-theme/login/theme.properties b/authority-portal-keycloak/mds-theme/login/theme.properties
index df56b5c04..9276eabbb 100644
--- a/authority-portal-keycloak/mds-theme/login/theme.properties
+++ b/authority-portal-keycloak/mds-theme/login/theme.properties
@@ -48,6 +48,9 @@ kcFeedbackWarningIcon=fa fa-fw fa-exclamation-triangle
 kcFeedbackSuccessIcon=fa fa-fw fa-check-circle
 kcFeedbackInfoIcon=fa fa-fw fa-info-circle
 
+kcFormPasswordVisibilityIconShow=fas fa-eye
+kcFormPasswordVisibilityIconHide=fas fa-eye-slash
+
 kcResetFlowIcon=pficon pficon-arrow fa
 kcWebAuthnKeyIcon=pficon pficon-key
 

From 8cecc1047ee360967a820303bcc77310b5495fcb Mon Sep 17 00:00:00 2001
From: illfixit <66363651+illfixit@users.noreply.github.com>
Date: Tue, 12 Mar 2024 09:01:31 +0100
Subject: [PATCH 2/6] chore: update password visibility icons in login theme

---
 authority-portal-keycloak/mds-theme/login/theme.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/authority-portal-keycloak/mds-theme/login/theme.properties b/authority-portal-keycloak/mds-theme/login/theme.properties
index 9276eabbb..27bdfc3dc 100644
--- a/authority-portal-keycloak/mds-theme/login/theme.properties
+++ b/authority-portal-keycloak/mds-theme/login/theme.properties
@@ -48,8 +48,8 @@ kcFeedbackWarningIcon=fa fa-fw fa-exclamation-triangle
 kcFeedbackSuccessIcon=fa fa-fw fa-check-circle
 kcFeedbackInfoIcon=fa fa-fw fa-info-circle
 
-kcFormPasswordVisibilityIconShow=fas fa-eye
-kcFormPasswordVisibilityIconHide=fas fa-eye-slash
+kcFormPasswordVisibilityIconShow=fa fa-eye
+kcFormPasswordVisibilityIconHide=fa fa-eye-slash
 
 kcResetFlowIcon=pficon pficon-arrow fa
 kcWebAuthnKeyIcon=pficon pficon-key

From f3ea9c57c08bebbd00632031ba8c0af286e23443 Mon Sep 17 00:00:00 2001
From: illfixit <66363651+illfixit@users.noreply.github.com>
Date: Tue, 12 Mar 2024 09:26:31 +0100
Subject: [PATCH 3/6] Fix bug in login functionality

---
 .../mds-theme/login/login-update-password.ftl | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 authority-portal-keycloak/mds-theme/login/login-update-password.ftl

diff --git a/authority-portal-keycloak/mds-theme/login/login-update-password.ftl b/authority-portal-keycloak/mds-theme/login/login-update-password.ftl
new file mode 100644
index 000000000..7dcddc60d
--- /dev/null
+++ b/authority-portal-keycloak/mds-theme/login/login-update-password.ftl
@@ -0,0 +1,77 @@
+<#import "template.ftl" as layout>
+<#import "password-commons.ftl" as passwordCommons>
+<@layout.registrationLayout displayMessage=!messagesPerField.existsError('password','password-confirm'); section>
+    <#if section = "header">
+        ${msg("updatePasswordTitle")}
+    <#elseif section = "form">
+        <form id="kc-passwd-update-form" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
+            <div class="${properties.kcFormGroupClass!}">
+                <div class="${properties.kcLabelWrapperClass!}">
+                    <label for="password-new" class="${properties.kcLabelClass!}">${msg("passwordNew")}</label>
+                </div>
+                <div class="${properties.kcInputWrapperClass!}">
+                    <div class="${properties.kcInputGroup!}">
+                        <input type="password" id="password-new" name="password-new" class="${properties.kcInputClass!}"
+                               autofocus autocomplete="new-password"
+                               aria-invalid="<#if messagesPerField.existsError('password','password-confirm')>true</#if>"
+                        />
+                        <button class="${properties.kcFormPasswordVisibilityButtonClass!}" type="button" aria-label="${msg('showPassword')}"
+                                aria-controls="password-new"  data-password-toggle
+                                data-icon-show="${properties.kcFormPasswordVisibilityIconShow!}" data-icon-hide="${properties.kcFormPasswordVisibilityIconHide!}"
+                                data-label-show="${msg('showPassword')}" data-label-hide="${msg('hidePassword')}">
+                            <i class="${properties.kcFormPasswordVisibilityIconShow!}" aria-hidden="true"></i>
+                        </button>
+                    </div>
+
+                    <#if messagesPerField.existsError('password')>
+                        <span id="input-error-password" class="${properties.kcInputErrorMessageClass!}" aria-live="polite">
+                            ${kcSanitize(messagesPerField.get('password'))?no_esc}
+                        </span>
+                    </#if>
+                </div>
+            </div>
+
+            <div class="${properties.kcFormGroupClass!}">
+                <div class="${properties.kcLabelWrapperClass!}">
+                    <label for="password-confirm" class="${properties.kcLabelClass!}">${msg("passwordConfirm")}</label>
+                </div>
+                <div class="${properties.kcInputWrapperClass!}">
+                    <div class="${properties.kcInputGroup!}">
+                        <input type="password" id="password-confirm" name="password-confirm"
+                               class="${properties.kcInputClass!}"
+                               autocomplete="new-password"
+                               aria-invalid="<#if messagesPerField.existsError('password-confirm')>true</#if>"
+                        />
+                        <button class="${properties.kcFormPasswordVisibilityButtonClass!}" type="button" aria-label="${msg('showPassword')}"
+                                aria-controls="password-confirm"  data-password-toggle
+                                data-icon-show="${properties.kcFormPasswordVisibilityIconShow!}" data-icon-hide="${properties.kcFormPasswordVisibilityIconHide!}"
+                                data-label-show="${msg('showPassword')}" data-label-hide="${msg('hidePassword')}">
+                            <i class="${properties.kcFormPasswordVisibilityIconShow!}" aria-hidden="true"></i>
+                        </button>
+                    </div>
+
+                    <#if messagesPerField.existsError('password-confirm')>
+                        <span id="input-error-password-confirm" class="${properties.kcInputErrorMessageClass!}" aria-live="polite">
+                            ${kcSanitize(messagesPerField.get('password-confirm'))?no_esc}
+                        </span>
+                    </#if>
+
+                </div>
+            </div>
+
+            <div class="${properties.kcFormGroupClass!}">
+                <@passwordCommons.logoutOtherSessions/>
+
+                <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
+                    <#if isAppInitiatedAction??>
+                        <input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}" type="submit" value="${msg("doSubmit")}" />
+                        <button class="${properties.kcButtonClass!} ${properties.kcButtonDefaultClass!} ${properties.kcButtonLargeClass!}" type="submit" name="cancel-aia" value="true" />${msg("doCancel")}</button>
+                    <#else>
+                        <input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}" type="submit" value="${msg("doSubmit")}" />
+                    </#if>
+                </div>
+            </div>
+        </form>
+        <script type="module" src="${url.resourcesPath}/js/passwordVisibility.js"></script>
+    </#if>
+</@layout.registrationLayout>
\ No newline at end of file

From f3d69b2ac61c59d019fcea4c68b806469a1bc40a Mon Sep 17 00:00:00 2001
From: illfixit <66363651+illfixit@users.noreply.github.com>
Date: Tue, 12 Mar 2024 12:13:10 +0100
Subject: [PATCH 4/6] .

---
 authority-portal-keycloak/mds-theme/login/theme.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/authority-portal-keycloak/mds-theme/login/theme.properties b/authority-portal-keycloak/mds-theme/login/theme.properties
index 27bdfc3dc..ef3d605c0 100644
--- a/authority-portal-keycloak/mds-theme/login/theme.properties
+++ b/authority-portal-keycloak/mds-theme/login/theme.properties
@@ -48,6 +48,7 @@ kcFeedbackWarningIcon=fa fa-fw fa-exclamation-triangle
 kcFeedbackSuccessIcon=fa fa-fw fa-check-circle
 kcFeedbackInfoIcon=fa fa-fw fa-info-circle
 
+# classes for show/hide password icons   
 kcFormPasswordVisibilityIconShow=fa fa-eye
 kcFormPasswordVisibilityIconHide=fa fa-eye-slash
 

From ed7bb7cc9ae6ed51c60dce158741803da4c40c48 Mon Sep 17 00:00:00 2001
From: illfixit <66363651+illfixit@users.noreply.github.com>
Date: Tue, 12 Mar 2024 13:19:56 +0100
Subject: [PATCH 5/6] chore: remove test template file, move variables

---
 .../mds-theme/login/login-update-password.ftl | 77 -------------------
 .../mds-theme/login/theme.properties          | 10 +--
 2 files changed, 5 insertions(+), 82 deletions(-)
 delete mode 100644 authority-portal-keycloak/mds-theme/login/login-update-password.ftl

diff --git a/authority-portal-keycloak/mds-theme/login/login-update-password.ftl b/authority-portal-keycloak/mds-theme/login/login-update-password.ftl
deleted file mode 100644
index 7dcddc60d..000000000
--- a/authority-portal-keycloak/mds-theme/login/login-update-password.ftl
+++ /dev/null
@@ -1,77 +0,0 @@
-<#import "template.ftl" as layout>
-<#import "password-commons.ftl" as passwordCommons>
-<@layout.registrationLayout displayMessage=!messagesPerField.existsError('password','password-confirm'); section>
-    <#if section = "header">
-        ${msg("updatePasswordTitle")}
-    <#elseif section = "form">
-        <form id="kc-passwd-update-form" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
-            <div class="${properties.kcFormGroupClass!}">
-                <div class="${properties.kcLabelWrapperClass!}">
-                    <label for="password-new" class="${properties.kcLabelClass!}">${msg("passwordNew")}</label>
-                </div>
-                <div class="${properties.kcInputWrapperClass!}">
-                    <div class="${properties.kcInputGroup!}">
-                        <input type="password" id="password-new" name="password-new" class="${properties.kcInputClass!}"
-                               autofocus autocomplete="new-password"
-                               aria-invalid="<#if messagesPerField.existsError('password','password-confirm')>true</#if>"
-                        />
-                        <button class="${properties.kcFormPasswordVisibilityButtonClass!}" type="button" aria-label="${msg('showPassword')}"
-                                aria-controls="password-new"  data-password-toggle
-                                data-icon-show="${properties.kcFormPasswordVisibilityIconShow!}" data-icon-hide="${properties.kcFormPasswordVisibilityIconHide!}"
-                                data-label-show="${msg('showPassword')}" data-label-hide="${msg('hidePassword')}">
-                            <i class="${properties.kcFormPasswordVisibilityIconShow!}" aria-hidden="true"></i>
-                        </button>
-                    </div>
-
-                    <#if messagesPerField.existsError('password')>
-                        <span id="input-error-password" class="${properties.kcInputErrorMessageClass!}" aria-live="polite">
-                            ${kcSanitize(messagesPerField.get('password'))?no_esc}
-                        </span>
-                    </#if>
-                </div>
-            </div>
-
-            <div class="${properties.kcFormGroupClass!}">
-                <div class="${properties.kcLabelWrapperClass!}">
-                    <label for="password-confirm" class="${properties.kcLabelClass!}">${msg("passwordConfirm")}</label>
-                </div>
-                <div class="${properties.kcInputWrapperClass!}">
-                    <div class="${properties.kcInputGroup!}">
-                        <input type="password" id="password-confirm" name="password-confirm"
-                               class="${properties.kcInputClass!}"
-                               autocomplete="new-password"
-                               aria-invalid="<#if messagesPerField.existsError('password-confirm')>true</#if>"
-                        />
-                        <button class="${properties.kcFormPasswordVisibilityButtonClass!}" type="button" aria-label="${msg('showPassword')}"
-                                aria-controls="password-confirm"  data-password-toggle
-                                data-icon-show="${properties.kcFormPasswordVisibilityIconShow!}" data-icon-hide="${properties.kcFormPasswordVisibilityIconHide!}"
-                                data-label-show="${msg('showPassword')}" data-label-hide="${msg('hidePassword')}">
-                            <i class="${properties.kcFormPasswordVisibilityIconShow!}" aria-hidden="true"></i>
-                        </button>
-                    </div>
-
-                    <#if messagesPerField.existsError('password-confirm')>
-                        <span id="input-error-password-confirm" class="${properties.kcInputErrorMessageClass!}" aria-live="polite">
-                            ${kcSanitize(messagesPerField.get('password-confirm'))?no_esc}
-                        </span>
-                    </#if>
-
-                </div>
-            </div>
-
-            <div class="${properties.kcFormGroupClass!}">
-                <@passwordCommons.logoutOtherSessions/>
-
-                <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
-                    <#if isAppInitiatedAction??>
-                        <input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}" type="submit" value="${msg("doSubmit")}" />
-                        <button class="${properties.kcButtonClass!} ${properties.kcButtonDefaultClass!} ${properties.kcButtonLargeClass!}" type="submit" name="cancel-aia" value="true" />${msg("doCancel")}</button>
-                    <#else>
-                        <input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}" type="submit" value="${msg("doSubmit")}" />
-                    </#if>
-                </div>
-            </div>
-        </form>
-        <script type="module" src="${url.resourcesPath}/js/passwordVisibility.js"></script>
-    </#if>
-</@layout.registrationLayout>
\ No newline at end of file
diff --git a/authority-portal-keycloak/mds-theme/login/theme.properties b/authority-portal-keycloak/mds-theme/login/theme.properties
index ef3d605c0..1bf68c19e 100644
--- a/authority-portal-keycloak/mds-theme/login/theme.properties
+++ b/authority-portal-keycloak/mds-theme/login/theme.properties
@@ -48,10 +48,6 @@ kcFeedbackWarningIcon=fa fa-fw fa-exclamation-triangle
 kcFeedbackSuccessIcon=fa fa-fw fa-check-circle
 kcFeedbackInfoIcon=fa fa-fw fa-info-circle
 
-# classes for show/hide password icons   
-kcFormPasswordVisibilityIconShow=fa fa-eye
-kcFormPasswordVisibilityIconHide=fa fa-eye-slash
-
 kcResetFlowIcon=pficon pficon-arrow fa
 kcWebAuthnKeyIcon=pficon pficon-key
 
@@ -131,4 +127,8 @@ kcLogoIdP-paypal=fa fa-paypal
 kcLogoIdP-stackoverflow=fa fa-stack-overflow
 kcLogoIdP-twitter=fa fa-twitter
 kcLogoIdP-openshift-v4=pf-icon pf-icon-openshift
-kcLogoIdP-openshift-v3=pf-icon pf-icon-openshift
\ No newline at end of file
+kcLogoIdP-openshift-v3=pf-icon pf-icon-openshift
+
+# classes for show/hide password icons   
+kcFormPasswordVisibilityIconShow=fa fa-eye
+kcFormPasswordVisibilityIconHide=fa fa-eye-slash
\ No newline at end of file

From bd516d53b8850b0142d2cb2a06c405250926992f Mon Sep 17 00:00:00 2001
From: illfixit <66363651+illfixit@users.noreply.github.com>
Date: Tue, 12 Mar 2024 13:25:17 +0100
Subject: [PATCH 6/6] docs: append Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index daed826cf..2abd5c959 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
   - Rebased the entire history to remove secrets and unrelated code
   - Cleaned up dead links
 - Added max length validator to most fields (128 symbols) ([#17](https://github.com/sovity/authority-portal/issues/17))
+- Added missing variables to show "hide/show" icon in reset password keycloak page ([#18](https://github.com/sovity/authority-portal/issues/18))
 - Certificate generation: Added a notice below the generate button ([#19](https://github.com/sovity/authority-portal/issues/19))
 - Fixed an error with input validation that prevented the use of upper-case letters in zip codes ([#21](https://github.com/sovity/authority-portal/issues/21))
 - Changed order of industry select options ([#22](https://github.com/sovity/authority-portal/issues/22))