Merge pull request #41 from magento-commerce/imported-magento-security-package-286

Imported magento security package 286

Author: nathanjosiah

TwoFactorAuth/Model/Config/UserNotifier.php

@@ -9,7 +9,7 @@
 namespace Magento\TwoFactorAuth\Model\Config;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\UrlInterface;
+use Magento\Backend\Model\UrlInterface;
 
 /**
  * Represents configuration for notifying the user

TwoFactorAuth/Model/Config/WebApiUserNotifier.php

@@ -9,7 +9,7 @@
 namespace Magento\TwoFactorAuth\Model\Config;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\UrlInterface;
+use Magento\Backend\Model\UrlInterface;
 use Magento\TwoFactorAuth\Api\UserNotifierInterface;
 
 /**

TwoFactorAuth/Test/Integration/Model/Config/UserNotifierTest.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TwoFactorAuth\Test\Integration\Model\Config;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\TwoFactorAuth\Model\Config\UserNotifier;
+use PHPUnit\Framework\TestCase;
+
+class UserNotifierTest extends TestCase
+{
+    /**
+     * @var UserNotifier
+     */
+    private $notifier;
+
+    protected function setUp(): void
+    {
+        $this->notifier = ObjectManager::getInstance()->get(UserNotifier::class);
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     */
+    public function testPersonalRequestConfigUrl()
+    {
+        $url = $this->notifier->getPersonalRequestConfigUrl('mytoken');
+        self::assertStringContainsString('backend/tfa/tfa/index/tfat/mytoken', $url);
+    }
+
+    /**
+     * @magentoAppArea webapi_rest
+     */
+    public function testPersonalRequestConfigUrlInWebApi()
+    {
+        $url = $this->notifier->getPersonalRequestConfigUrl('mytoken');
+        self::assertStringContainsString('backend/tfa/tfa/index/tfat/mytoken', $url);
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     */
+    public function testGetAppRequestConfigUrl()
+    {
+        $url = $this->notifier->getAppRequestConfigUrl('mytoken');
+        self::assertStringContainsString('backend/tfa/tfa/index/tfat/mytoken', $url);
+    }
+}

TwoFactorAuth/Test/Integration/Model/Config/WebApiUserNotifierTest.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TwoFactorAuth\Test\Integration\Model\Config;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\TwoFactorAuth\Model\Config\WebApiUserNotifier;
+use PHPUnit\Framework\TestCase;
+
+class WebApiUserNotifierTest extends TestCase
+{
+    /**
+     * @var WebApiUserNotifier
+     */
+    private $notifier;
+
+    protected function setUp(): void
+    {
+        $this->notifier = ObjectManager::getInstance()->get(WebApiUserNotifier::class);
+    }
+
+    /**
+     * @magentoConfigFixture default/twofactorauth/general/webapi_notification_url example.com/:tfat/abc
+     * @magentoAppArea webapi_rest
+     */
+    public function testCustomUrlIsUsed()
+    {
+        $url = $this->notifier->getPersonalRequestConfigUrl('mytoken');
+        self::assertEquals('example.com/mytoken/abc', $url);
+    }
+
+    /**
+     * @magentoAppArea webapi_rest
+     */
+    public function testDefaultUrl()
+    {
+        $url = $this->notifier->getPersonalRequestConfigUrl('mytoken');
+        self::assertStringContainsString('backend/tfa/tfa/index/tfat/mytoken', $url);
+    }
+}