Merge remote-tracking branch 'origin/develop' into MQE-2601

Author: ysapiga

TwoFactorAuth/Model/Provider/Engine/Google.php

@@ -98,7 +98,10 @@ public function __construct(
     private function generateSecret(): string
     {
         $secret = random_bytes(128);
-        return preg_replace('/[^A-Za-z0-9]/', '', Base32::encode($secret));
+        // seed for iOS devices to avoid errors with barcode
+        $seed = 'abcd';
+
+        return preg_replace('/[^A-Za-z0-9]/', '', Base32::encode($seed . $secret));
     }
 
     /**

TwoFactorAuth/Test/Mftf/Test/AdminUpdateUserRoleTest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateUserRoleTest">
+        <before>
+            <actionGroup ref="AdminChooseUserRoleResourceActionGroup" before="saveNewRole" stepKey="enableTfa">
+                <argument name="resourceId" value="Magento_TwoFactorAuth::tfa"/>
+                <argument name="resourceName" value="Two Factor Auth"/>
+            </actionGroup>
+        </before>
+    </test>
+</tests>