From 7831179e92885e87236d784cdcf3a3946a8e466c Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Tue, 25 Jun 2024 11:56:16 +0800
Subject: [PATCH 1/6] PR feedback: use correct escaping

---
 .../material/default/selectidp-links.twig      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/material/themes/material/default/selectidp-links.twig b/modules/material/themes/material/default/selectidp-links.twig
index 51af837..9272dfb 100644
--- a/modules/material/themes/material/default/selectidp-links.twig
+++ b/modules/material/themes/material/default/selectidp-links.twig
@@ -10,7 +10,7 @@
       const idpInput = document.createElement('input');
 
       idpInput.type = 'hidden';
-      idpInput.name = '{{ returnIDParam|e }}';
+      idpInput.name = '{{ returnIDParam|e('js')|raw }}';
       idpInput.value = id;
 
       document.querySelector('form').appendChild(idpInput);
@@ -39,7 +39,7 @@
 
       {% if not helpCenterUrl ?? '' is empty %}
         <nav class="mdl-navigation">
-          <a href="{{ helpCenterUrl }}" target="_blank" class="mdl-navigation__link">
+          <a href="{{ helpCenterUrl|e('html_attr') }}" target="_blank" class="mdl-navigation__link">
             {{ '{selectidp-links:help}'|trans }}
           </a>
         </nav>
@@ -51,9 +51,9 @@
     {% include 'announcement.twig' %}
 
     <form layout-children="row" child-spacing="space-around">
-      <input type="hidden" name="entityID" value="{{ entityID|e }}"/>
-      <input type="hidden" name="return" value="{{ return|e }}"/>
-      <input type="hidden" name="returnIDParam" value="{{ returnIDParam|e }}"/>
+      <input type="hidden" name="entityID" value="{{ entityID|e('html_attr') }}"/>
+      <input type="hidden" name="return" value="{{ return|e('html_attr') }}"/>
+      <input type="hidden" name="returnIDParam" value="{{ returnIDParam|e('html_attr') }}"/>
 
       {% for idp in idplist %}
         <div
@@ -63,14 +63,14 @@
           <div class="mdl-card__media white-bg fixed-height">
             <button
               class="mdl-button logo-container fill-parent"
-              onclick="setSelectedIdp('{{ idp.entityid|e }}')"
-              name="idp_{{ idp.entityid }}"
+              onclick="setSelectedIdp('{{ idp.entityid|e('js')|raw }}')"
+              name="idp_{{ idp.entityid|e('html_attr') }}"
             >
               <div class="image-wrapper">
                 <img
                   class="logo"
-                  id="{{ idp.entityid|e }}"
-                  src="{{ idp.iconurl is defined ? idp.iconurl : 'default-logo.png' }}"
+                  id="{{ idp.entityid|e('html_attr') }}"
+                  src="{{ idp.iconurl is defined ? idp.iconurl|e('html_attr') : 'default-logo.png' }}"
                 >
               </div>
             </button>

From f6dcafaf7005b9bf2e24801067130021d97699c4 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Tue, 25 Jun 2024 11:56:52 +0800
Subject: [PATCH 2/6] PR feedback: use the correct variable name
 `analyticsTrackingId`

---
 modules/material/themes/material/default/header.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/material/themes/material/default/header.twig b/modules/material/themes/material/default/header.twig
index c26a7e1..a3f7927 100644
--- a/modules/material/themes/material/default/header.twig
+++ b/modules/material/themes/material/default/header.twig
@@ -7,13 +7,13 @@
 
 {% if not (analyticsTrackingId ?? null) is empty %}
   <!-- Google tag (gtag.js) -->
-  <script async src="https://www.googletagmanager.com/gtag/js?id={{ trackingId }}"></script>
+  <script async src="https://www.googletagmanager.com/gtag/js?id={{ analyticsTrackingId }}"></script>
   <script>
     window.dataLayer = window.dataLayer || [];
     function gtag(){dataLayer.push(arguments);}
     gtag('js', new Date());
 
-    gtag('config', '{{ trackingId }}');
+    gtag('config', '{{ analyticsTrackingId }}');
   </script>
 {% endif %}
 

From 9f0af8ec08e13c47c185832065790aec2c85f12f Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Tue, 25 Jun 2024 15:20:41 +0800
Subject: [PATCH 3/6] PR feedback: add type="submit" to buttons

---
 .../material/expirychecker/about2expire.twig  | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/material/themes/material/expirychecker/about2expire.twig b/modules/material/themes/material/expirychecker/about2expire.twig
index f009355..fdfbf40 100644
--- a/modules/material/themes/material/expirychecker/about2expire.twig
+++ b/modules/material/themes/material/expirychecker/about2expire.twig
@@ -6,45 +6,45 @@
   {% include 'header.twig' %}
 </head>
 <body>
-  <div class="mdl-layout mdl-layout--fixed-header fill-viewport">
-    <header class="mdl-layout__header">
-      <div class="mdl-layout__header-row">
+<div class="mdl-layout mdl-layout--fixed-header fill-viewport">
+  <header class="mdl-layout__header">
+    <div class="mdl-layout__header-row">
         <span class="mdl-layout-title">
           {{ '{about2expire:header}'|trans }}
         </span>
-      </div>
-    </header>
-    <main class="mdl-layout__content" layout-children="column">
-      <form layout-children="column">
-        {% for name, value in formData %}
-          <input type="hidden" name="{{ name|e }}" value="{{ value|e }}">
-        {% endfor %}
+    </div>
+  </header>
+  <main class="mdl-layout__content" layout-children="column">
+    <form layout-children="column">
+      {% for name, value in formData %}
+        <input type="hidden" name="{{ name|e }}" value="{{ value|e }}">
+      {% endfor %}
 
-        <p class="mdl-typography--title margin">
-          {% if daysLeft < 2 %}
-            {{ '{about2expire:expiring_in_a_day}'|trans }}
-          {% else %}
-            {{ '{about2expire:expiring_soon}'|trans({'%daysLeft%': daysLeft}) }}
-          {% endif %}
-        </p>
+      <p class="mdl-typography--title margin">
+        {% if daysLeft < 2 %}
+          {{ '{about2expire:expiring_in_a_day}'|trans }}
+        {% else %}
+          {{ '{about2expire:expiring_soon}'|trans({'%daysLeft%': daysLeft}) }}
+        {% endif %}
+      </p>
 
-        <p class="mdl-typography--body-1">
-          {{ '{about2expire:change_now}'|trans }}
-        </p>
+      <p class="mdl-typography--body-1">
+        {{ '{about2expire:change_now}'|trans }}
+      </p>
 
-        <div class="fill-parent" layout-children="row" child-spacing="space-around">
-          <button name="continue" class="mdl-button mdl-button--raised">
-            {{ '{about2expire:button_continue}'|trans }}
-          </button>
+      <div class="fill-parent" layout-children="row" child-spacing="space-around">
+        <button name="continue" type="submit" class="mdl-button mdl-button--raised">
+          {{ '{about2expire:button_continue}'|trans }}
+        </button>
 
-          <button name="changepwd" class="mdl-button mdl-button--raised mdl-button--primary">
-            {{ '{about2expire:button_change}'|trans }}
-          </button>
-        </div>
-      </form>
-    </main>
+        <button name="changepwd" type="submit" class="mdl-button mdl-button--raised mdl-button--primary">
+          {{ '{about2expire:button_change}'|trans }}
+        </button>
+      </div>
+    </form>
+  </main>
 
-    {% include 'footer.twig' %}
-  </div>
+  {% include 'footer.twig' %}
+</div>
 </body>
 </html>

From 3e1e2442c9cb48d77a486893cb541df989168375 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Tue, 25 Jun 2024 15:59:25 +0800
Subject: [PATCH 4/6] PR feedback: add type="submit" to buttons

---
 .../material/themes/material/mfa/prompt-for-mfa-manager.twig    | 2 +-
 modules/material/themes/material/mfa/prompt-for-mfa-totp.twig   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig b/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
index 22aa3ea..dfe3075 100644
--- a/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
+++ b/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
@@ -60,7 +60,7 @@
 
         <div class="mdl-card__actions" layout-children="row">
           <span flex></span>
-          <button name="submitMfa" class="mdl-button mdl-button--raised mdl-button--primary">
+          <button name="submitMfa" type="submit" class="mdl-button mdl-button--raised mdl-button--primary">
             {{ '{mfa:button_verify}'|trans }}
           </button>
         </div>
diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig b/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig
index 5be2e29..7fd9a92 100644
--- a/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig
+++ b/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig
@@ -58,7 +58,7 @@
 
         <div class="mdl-card__actions" layout-children="row">
           <span flex></span>
-          <button name="submitMfa" class="mdl-button mdl-button--raised mdl-button--primary">
+          <button name="submitMfa" type="submit" class="mdl-button mdl-button--raised mdl-button--primary">
             {{ '{mfa:button_verify}'|trans }}
           </button>
         </div>

From 82e1d70887d93ee063d3ff12601d8db929dfee97 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Tue, 25 Jun 2024 16:22:33 +0800
Subject: [PATCH 5/6] PR feedback: add type="submit" to button

---
 .../material/expirychecker/expired.twig       | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/material/themes/material/expirychecker/expired.twig b/modules/material/themes/material/expirychecker/expired.twig
index 04d83ac..071a814 100644
--- a/modules/material/themes/material/expirychecker/expired.twig
+++ b/modules/material/themes/material/expirychecker/expired.twig
@@ -6,31 +6,31 @@
   {% include 'header.twig' %}
 </head>
 <body>
-  <div class="mdl-layout mdl-layout--fixed-header fill-viewport">
-    <header class="mdl-layout__header mdl-color--red">
-      <div class="mdl-layout__header-row">
+<div class="mdl-layout mdl-layout--fixed-header fill-viewport">
+  <header class="mdl-layout__header mdl-color--red">
+    <div class="mdl-layout__header-row">
         <span class="mdl-layout-title">
             {{ '{expired:header}'|trans }}
         </span>
-      </div>
-    </header>
-    <main class="mdl-layout__content" layout-children="column">
-      <form layout-children="column">
-        {% for name, value in formData %}
-          <input type="hidden" name="{{ name|e }}" value="{{ value|e }}">
-        {% endfor %}
+    </div>
+  </header>
+  <main class="mdl-layout__content" layout-children="column">
+    <form layout-children="column">
+      {% for name, value in formData %}
+        <input type="hidden" name="{{ name|e }}" value="{{ value|e }}">
+      {% endfor %}
 
-        <p class="mdl-typography--title margin">
-          {{ '{expired:expired}'|trans }}
-        </p>
+      <p class="mdl-typography--title margin">
+        {{ '{expired:expired}'|trans }}
+      </p>
 
-        <button name="changepwd" class="mdl-button mdl-button--raised mdl-button--primary">
-          {{ '{expired:button_change}'|trans }}
-        </button>
-      </form>
-    </main>
+      <button name="changepwd" type="submit" class="mdl-button mdl-button--raised mdl-button--primary">
+        {{ '{expired:button_change}'|trans }}
+      </button>
+    </form>
+  </main>
 
-    {% include 'footer.twig' %}
-  </div>
+  {% include 'footer.twig' %}
+</div>
 </body>
 </html>

From 8341338c7793ed3e6794d46c198af54f945e98fa Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Wed, 26 Jun 2024 10:58:30 +0800
Subject: [PATCH 6/6] PR feedback: fix translation key syntax

---
 features/bootstrap/MfaContext.php                               | 1 +
 .../material/themes/material/mfa/prompt-for-mfa-manager.twig    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/features/bootstrap/MfaContext.php b/features/bootstrap/MfaContext.php
index 664b159..6ea146d 100644
--- a/features/bootstrap/MfaContext.php
+++ b/features/bootstrap/MfaContext.php
@@ -661,6 +661,7 @@ public function iShouldSeeAPromptForAManagerRescueCode()
         $pageHtml = $page->getHtml();
         Assert::assertContains('Ask Your Recovery Contact for Help', $pageHtml);
         Assert::assertContains('Enter code', $pageHtml);
+        Assert::assertContains('m*****r@e******.c**', $pageHtml);
     }
 
     /**
diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig b/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
index dfe3075..aa464f7 100644
--- a/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
+++ b/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
@@ -29,7 +29,7 @@
 
         <div class="mdl-card__title center">
           <p class="mdl-card__subtitle-text">
-            {{ '{mfa:manager_sent}'|trans({'{managerEmail': managerEmail}) }}
+            {{ '{mfa:manager_sent}'|trans({'%managerEmail%': managerEmail}) }}
           </p>
         </div>