Merge branch 'develop' into cia-pre-release-develop-sync-02162024

Author: pawan-adobe-security

TwoFactorAuth/Test/Api/GoogleActivateTest.php

@@ -18,10 +18,10 @@
 
 class GoogleActivateTest extends WebapiAbstract
 {
-    const SERVICE_VERSION = 'V1';
-    const SERVICE_NAME = 'twoFactorAuthGoogleConfigureV1';
-    const OPERATION = 'Activate';
-    const RESOURCE_PATH = '/V1/tfa/provider/google/activate';
+    public const SERVICE_VERSION = 'V1';
+    public const SERVICE_NAME = 'twoFactorAuthGoogleConfigureV1';
+    public const OPERATION = 'Activate';
+    public const RESOURCE_PATH = '/V1/tfa/provider/google/activate';
 
     /**
      * @var UserFactory
@@ -129,7 +129,7 @@ public function testAlreadyActivatedProvider()
     /**
      * @magentoConfigFixture twofactorauth/general/force_providers google
      * @magentoApiDataFixture Magento/User/_files/user_with_custom_role.php
-     * @magentoConfigFixture twofactorauth/google/otp_window 120
+     * @magentoConfigFixture twofactorauth/google/otp_window 20
      */
     public function testActivate()
     {

TwoFactorAuth/Test/Api/GoogleAuthenticateTest.php

@@ -22,13 +22,14 @@
 
 /**
  * Class checks google authentication behaviour
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GoogleAuthenticateTest extends WebapiAbstract
 {
-    const SERVICE_VERSION = 'V1';
-    const SERVICE_NAME = 'twoFactorAuthGoogleAuthenticateV1';
-    const OPERATION = 'CreateAdminAccessToken';
-    const RESOURCE_PATH = '/V1/tfa/provider/google/authenticate';
+    public const SERVICE_VERSION = 'V1';
+    public const SERVICE_NAME = 'twoFactorAuthGoogleAuthenticateV1';
+    public const OPERATION = 'CreateAdminAccessToken';
+    public const RESOURCE_PATH = '/V1/tfa/provider/google/authenticate';
 
     /**
      * @var UserFactory
@@ -222,7 +223,7 @@ public function testNotConfiguredProvider(): void
     /**
      * @magentoConfigFixture twofactorauth/general/force_providers google
      * @magentoApiDataFixture Magento/User/_files/user_with_custom_role.php
-     * @magentoConfigFixture twofactorauth/google/otp_window 120
+     * @magentoConfigFixture twofactorauth/google/otp_window 20
      *
      * @return void
      */

TwoFactorAuth/composer.json

@@ -13,7 +13,7 @@
         "magento/module-user": "*",
         "magento/module-integration": "*",
         "christian-riesen/base32": "^1.3",
-        "spomky-labs/otphp": "^10.0",
+        "spomky-labs/otphp": "^11.2",
         "endroid/qr-code": "^4.3.5",
         "2tvenom/cborencode": "^1.0"
     },