AC-10982::[2FA] Integrate with Duo Web SDK to support Universal Prompt-fixes for copyright year and text

glo05363 · glo05363 · commit 006ef91c5b4d · 2024-12-13T18:09:51.000+05:30
diff --git a/TwoFactorAuth/Api/DuoAuthenticateInterface.php b/TwoFactorAuth/Api/DuoAuthenticateInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/TwoFactorAuth/Api/DuoConfigureInterface.php b/TwoFactorAuth/Api/DuoConfigureInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/TwoFactorAuth/Block/Adminhtml/System/Config/Providers.php b/TwoFactorAuth/Block/Adminhtml/System/Config/Providers.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/TwoFactorAuth/Block/Provider/Duo/Auth.php b/TwoFactorAuth/Block/Provider/Duo/Auth.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/TwoFactorAuth/Controller/Adminhtml/Duo/Authpost.php b/TwoFactorAuth/Controller/Adminhtml/Duo/Authpost.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/TwoFactorAuth/Model/Provider/Engine/DuoSecurity.php b/TwoFactorAuth/Model/Provider/Engine/DuoSecurity.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/TwoFactorAuth/Model/Provider/Engine/DuoSecurity/Authenticate.php b/TwoFactorAuth/Model/Provider/Engine/DuoSecurity/Authenticate.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/TwoFactorAuth/Model/Provider/Engine/DuoSecurity/Configure.php b/TwoFactorAuth/Model/Provider/Engine/DuoSecurity/Configure.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
@@ -67,15 +67,20 @@ public function getConfigurationData(string $tfaToken)
 
     /**
      * @inheritDoc
+     * @throws \LocalizedException
      */
     public function activate(string $tfaToken): void
     {
-        $user = $this->userAuthenticator->authenticateWithTokenAndProvider($tfaToken, DuoSecurity::CODE);
-        $userId = (int)$user->getId();
+        try {
+            $user = $this->userAuthenticator->authenticateWithTokenAndProvider($tfaToken, DuoSecurity::CODE);
+            $userId = (int)$user->getId();
 
-        if ($this->duo->assertUserIsValid($user->getUserName()) == "auth") {
-            $this->tfa->getProviderByCode(DuoSecurity::CODE)
-                ->activate($userId);
+            if ($this->duo->assertUserIsValid($user->getUserName()) == "auth") {
+                $this->tfa->getProviderByCode(DuoSecurity::CODE)
+                    ->activate($userId);
+            }
+        } catch (\Exception $e) {
+            throw new \LocalizedException(__('Could not activate Duo Security provider.'));
         }
     }
 }
diff --git a/TwoFactorAuth/Setup/Patch/Data/EncryptSecrets.php b/TwoFactorAuth/Setup/Patch/Data/EncryptSecrets.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/TwoFactorAuth/Test/Integration/Block/ChangeProviderTest.php b/TwoFactorAuth/Test/Integration/Block/ChangeProviderTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/TwoFactorAuth/Test/Integration/Block/ConfigureLaterTest.php b/TwoFactorAuth/Test/Integration/Block/ConfigureLaterTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/TwoFactorAuth/Test/Integration/Controller/Adminhtml/Duo/AuthTest.php b/TwoFactorAuth/Test/Integration/Controller/Adminhtml/Duo/AuthTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/TwoFactorAuth/Test/Integration/Controller/Adminhtml/Duo/AuthpostTest.php b/TwoFactorAuth/Test/Integration/Controller/Adminhtml/Duo/AuthpostTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/TwoFactorAuth/Test/Integration/Controller/Adminhtml/Tfa/ConfigureLaterTest.php b/TwoFactorAuth/Test/Integration/Controller/Adminhtml/Tfa/ConfigureLaterTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/TwoFactorAuth/Test/Integration/Controller/Adminhtml/Tfa/IndexTest.php b/TwoFactorAuth/Test/Integration/Controller/Adminhtml/Tfa/IndexTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/TwoFactorAuth/Test/Integration/ControllerActionPredispatchTest.php b/TwoFactorAuth/Test/Integration/ControllerActionPredispatchTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/TwoFactorAuth/Test/Integration/Model/Provider/Engine/DuoSecurity/AuthenticateTest.php b/TwoFactorAuth/Test/Integration/Model/Provider/Engine/DuoSecurity/AuthenticateTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/TwoFactorAuth/Test/Integration/Model/Provider/Engine/DuoSecurity/ConfigureTest.php b/TwoFactorAuth/Test/Integration/Model/Provider/Engine/DuoSecurity/ConfigureTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/TwoFactorAuth/Test/Unit/Model/Provider/Engine/DuoSecurityTest.php b/TwoFactorAuth/Test/Unit/Model/Provider/Engine/DuoSecurityTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/TwoFactorAuth/etc/adminhtml/di.xml b/TwoFactorAuth/etc/adminhtml/di.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/TwoFactorAuth/etc/adminhtml/system.xml b/TwoFactorAuth/etc/adminhtml/system.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
-  * Copyright 2024 Adobe
+  * Copyright 2020 Adobe
   * All Rights Reserved.
   */
 -->
diff --git a/TwoFactorAuth/etc/config.xml b/TwoFactorAuth/etc/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
-  * Copyright 2024 Adobe
+  * Copyright 2020 Adobe
   * All Rights Reserved.
   */
 -->
diff --git a/TwoFactorAuth/etc/di.xml b/TwoFactorAuth/etc/di.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
-  * Copyright 2024 Adobe
+  * Copyright 2020 Adobe
   * All Rights Reserved.
   */
 -->
diff --git a/TwoFactorAuth/etc/webapi.xml b/TwoFactorAuth/etc/webapi.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
-  * Copyright 2024 Adobe
+  * Copyright 2020 Adobe
   * All Rights Reserved.
   */
  -->
diff --git a/TwoFactorAuth/view/adminhtml/web/js/duo/auth.js b/TwoFactorAuth/view/adminhtml/web/js/duo/auth.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/TwoFactorAuth/view/adminhtml/web/js/system/config/providers.js b/TwoFactorAuth/view/adminhtml/web/js/system/config/providers.js
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 define([
diff --git a/TwoFactorAuth/view/adminhtml/web/template/duo/auth.html b/TwoFactorAuth/view/adminhtml/web/template/duo/auth.html
@@ -1,6 +1,6 @@
 <!--
 /**
- * Copyright 2024 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 -->
