Merge branch 'develop' into feature/whitespace-cleanup

silinternational · Jun 28, 2024 · b99576c · b99576c
2 parents 803eab6 + 41cf5a0
commit b99576c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/features/bootstrap/MfaContext.php b/features/bootstrap/MfaContext.php
@@ -662,6 +662,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/default/header.twig b/modules/material/themes/material/default/header.twig
@@ -7,7 +7,7 @@
 
 {% 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 || [];
 
@@ -17,7 +17,7 @@
 
     gtag('js', new Date());
 
-    gtag('config', '{{ trackingId }}');
+    gtag('config', '{{ analyticsTrackingId }}');
   </script>
 {% endif %}
 

diff --git 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" rel="noopener" class="mdl-navigation__link">
+          <a href="{{ helpCenterUrl|e(html_attr) }}" target="_blank" rel="noopener" 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>

diff --git 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>
 
@@ -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
@@ -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>