[4.4] Improve Totp code input (#42608)

* [4.4] Improve Totp code input * Fix code input pattern attribute * Specify autocomplete on code input * [4.4] Improve Totp code input * Fix typo * [4.4] Improve Totp code input * Fix mixed single/double quotes * Add code input required attribute to disable submitting an empty code value * [4.4] Improve Totp code input * Apply same fix to Email Totp: - Fix code input pattern attribute - Specify autocomplete on code input - Add code input required attribute to disable submitting an empty code value - Fix mixed single/double quotes ---------
joomla · Jan 19, 2024 · 302ce23 · 302ce23
1 parent deae2f0
commit 302ce23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/plugins/multifactorauth/email/src/Extension/Email.php b/plugins/multifactorauth/email/src/Extension/Email.php
@@ -190,7 +190,7 @@ public function onUserMultifactorCaptive(Captive $event): void
                     'input_type' => 'text',
                     // The attributes for the HTML input box.
                     'input_attributes' => [
-                        'pattern' => "{0,9}", 'maxlength' => "6", 'inputmode' => "numeric",
+                        'pattern' => '[0-9]{6}', 'maxlength' => '6', 'inputmode' => 'numeric', 'required' => 'true', 'autocomplete' => 'one-time-code', 'aria-autocomplete' => 'none',
                     ],
                     // Placeholder text for the HTML input box. Leave empty if you don't need it.
                     'placeholder' => Text::_('PLG_MULTIFACTORAUTH_EMAIL_LBL_SETUP_PLACEHOLDER'),
@@ -264,7 +264,7 @@ public function onUserMultifactorGetSetup(GetSetup $event): void
                         'field_type'       => 'input',
                         'input_type'       => 'text',
                         'input_attributes' => [
-                            'pattern' => "{0,9}", 'maxlength' => "6", 'inputmode' => "numeric",
+                            'pattern' => '[0-9]{6}', 'maxlength' => '6', 'inputmode' => 'numeric', 'required' => 'true', 'autocomplete' => 'one-time-code', 'aria-autocomplete' => 'none',
                         ],
                         'input_value' => '',
                         'placeholder' => Text::_('PLG_MULTIFACTORAUTH_EMAIL_LBL_SETUP_PLACEHOLDER'),

diff --git a/plugins/multifactorauth/totp/src/Extension/Totp.php b/plugins/multifactorauth/totp/src/Extension/Totp.php
@@ -150,7 +150,7 @@ public function onUserMultifactorCaptive(Captive $event): void
                     'input_type' => 'text',
                     // The attributes for the HTML input box.
                     'input_attributes' => [
-                        'pattern' => "{0,9}", 'maxlength' => "6", 'inputmode' => "numeric",
+                        'pattern' => '[0-9]{6}', 'maxlength' => '6', 'inputmode' => 'numeric', 'required' => 'true', 'autocomplete' => 'one-time-code', 'aria-autocomplete' => 'none',
                     ],
                     // Placeholder text for the HTML input box. Leave empty if you don't need it.
                     'placeholder' => '',
@@ -239,7 +239,7 @@ public function onUserMultifactorGetSetup(GetSetup $event): void
                     ],
                     'input_type'       => $isConfigured ? 'hidden' : 'text',
                     'input_attributes' => [
-                        'pattern' => "{0,9}", 'maxlength' => "6", 'inputmode' => "numeric",
+                        'pattern' => '[0-9]{6}', 'maxlength' => '6', 'inputmode' => 'numeric', 'required' => 'true', 'autocomplete' => 'one-time-code', 'aria-autocomplete' => 'none',
                     ],
                     'input_value' => '',
                     'placeholder' => Text::_('PLG_MULTIFACTORAUTH_TOTP_LBL_SETUP_PLACEHOLDER'),