Skip to content

Commit 0900b6a

Browse files
committed
MC-22950: Enable 2FA by default for Admins
- Browser compatibility (*ahem* Safari *ahem*) - Minor template updates
1 parent 5c11f52 commit 0900b6a

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

TwoFactorAuth/Model/Provider/Engine/U2fKey/WebAuthn.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,9 @@ public function getAuthenticateData(array $publicKeys): array
140140
$data = [
141141
'credentialRequestOptions' => [
142142
'challenge' => $this->convertBytesToArray($challenge),
143-
'mediation' => 'required',
144143
'timeout' => 60000,
145144
'allowCredentials' => $allowedCredentials,
146-
'userVerification' => 'required',
145+
'userVerification' => 'discouraged',
147146
'extensions' => [
148147
'txAuthSimple' => 'Authenticate with ' . $store->getName(),
149148
],
@@ -192,7 +191,7 @@ public function getRegisterData(UserInterface $user): array
192191
'authenticatorSelection' => [
193192
'authenticatorAttachment' => 'cross-platform',
194193
'requireResidentKey' => false,
195-
'userVerification' => 'required'
194+
'userVerification' => 'discouraged'
196195
],
197196
'timeout' => 60000,
198197
// Currently only one device may be registered at a time

TwoFactorAuth/view/adminhtml/web/template/u2fkey/auth.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<div data-bind="afterRender: onAfterRender">
7+
<div afterRender="onAfterRender">
88
<div visible='currentStep() === "register"'>
99
<fieldset class="admin__fieldset">
1010
<legend class="admin__legend">
11-
<span data-bind='i18n: "2FA - U2F key verification"'></span>
11+
<span translate="'2FA - U2F key verification'"></span>
1212
</legend><br/>
1313
<div class="tfa-u2f-touch-key">
14-
<h3 data-bind='i18n: "Plug in your U2F key, then touch button"'></h3>
14+
<h3 translate="'Plug in your U2F key and follow instructions'"></h3>
1515
<div visible="$data.idle" class="tfa-u2f-try-again">
1616
<a href="javascript:void(0)" click="waitForTouch" translate="'Try again'"></a>
1717
</div>
@@ -25,6 +25,6 @@ <h3 data-bind='i18n: "Plug in your U2F key, then touch button"'></h3>
2525
<span/><span/><span/><span/><span/><span/><span/><span/>
2626
</div>
2727
</div>
28-
<div data-bind='i18n: "Redirecting to Magento Admin Panel..."'></div>
28+
<div translate="'Redirecting to Magento Admin Panel...'"></div>
2929
</div>
3030
</div>

TwoFactorAuth/view/adminhtml/web/template/u2fkey/configure.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<div data-bind="afterRender: onAfterRender">
7+
<div afterRender="onAfterRender">
88
<div visible='currentStep() === "register"'>
99
<fieldset class="admin__fieldset">
1010
<legend class="admin__legend">
11-
<span data-bind='i18n: "2FA - U2F key device registration"'></span>
11+
<span translate="'2FA - U2F key device registration'"></span>
1212
</legend><br/>
1313
<div id="u2f-touch-key">
14-
<h3 data-bind='i18n: "Plug in your U2F key, then touch button"'></h3>
14+
<h3 translate="'Plug in your U2F key and follow instructions'"></h3>
1515
<div visible="$data.idle" class="tfa-u2f-try-again">
1616
<a href="javascript:void(0)" click="waitForTouch" translate="'Try again'"></a>
1717
</div>
@@ -25,6 +25,6 @@ <h3 data-bind='i18n: "Plug in your U2F key, then touch button"'></h3>
2525
<span/><span/><span/><span/><span/><span/><span/><span/>
2626
</div>
2727
</div>
28-
<div data-bind='i18n: "Redirecting to Magento Admin Panel..."'></div>
28+
<div translate="'Redirecting to Magento Admin Panel...'"></div>
2929
</div>
3030
</div>

0 commit comments

Comments
 (0)