AC-1619: Integration access tokens do not work as Bearer tokens

- Stabilizing tests

Author: nathanjosiah

…el/Authorization/AuthorizationConfig.php …ion/Model/Config/AuthorizationConfig.phpapp/code/Magento/Webapi/Model/Authorization/AuthorizationConfig.php renamed to app/code/Magento/Integration/Model/Config/AuthorizationConfig.php app/code/Magento/Webapi/Model/Authorization/AuthorizationConfig.php renamed to app/code/Magento/Integration/Model/Config/AuthorizationConfig.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Magento\Webapi\Model\Authorization;
+namespace Magento\Integration\Model\Config;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
@@ -19,7 +19,7 @@ class AuthorizationConfig
     /**
      * XML Path for Enable Integration as Bearer
      */
-    const CONFIG_PATH_INTEGRATION_BEARER = 'webapi/authorization/enable_integration_as_bearer';
+    const CONFIG_PATH_INTEGRATION_BEARER = 'oauth/consumer/enable_integration_as_bearer';
 
     /**
      * @var ScopeConfigInterface

app/code/Magento/Integration/Model/OpaqueToken/Reader.php

@@ -13,11 +13,11 @@
 use Magento\Integration\Api\Exception\UserTokenException;
 use Magento\Integration\Api\IntegrationServiceInterface;
 use Magento\Integration\Api\UserTokenReaderInterface;
+use Magento\Integration\Model\Config\AuthorizationConfig;
 use Magento\Integration\Model\CustomUserContext;
 use Magento\Integration\Model\Oauth\Token;
 use Magento\Integration\Model\Oauth\TokenFactory;
 use Magento\Integration\Helper\Oauth\Data as OauthHelper;
-use Magento\Webapi\Model\Authorization\AuthorizationConfig;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -147,6 +147,6 @@ private function getUserId(Token $tokenModel): int
             throw new UserTokenException('Invalid token found');
         }
 
-        return $userId;
+        return (int)$userId;
     }
 }

…uthorization/AuthorizationConfigTest.php …Model/Config/AuthorizationConfigTest.phpapp/code/Magento/Webapi/Test/Unit/Model/Authorization/AuthorizationConfigTest.php renamed to app/code/Magento/Integration/Test/Unit/Model/Config/AuthorizationConfigTest.php app/code/Magento/Webapi/Test/Unit/Model/Authorization/AuthorizationConfigTest.php renamed to app/code/Magento/Integration/Test/Unit/Model/Config/AuthorizationConfigTest.php

@@ -6,10 +6,10 @@
 
 declare(strict_types=1);
 
-namespace Magento\Webapi\Test\Unit\Model\Authorization;
+namespace Magento\Integration\Test\Unit\Model\Config\Authorization;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Webapi\Model\Authorization\AuthorizationConfig;
+use Magento\Integration\Model\Config\AuthorizationConfig;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -34,7 +34,7 @@ protected function setUp(): void
     public function testEnabled()
     {
         $this->scopeConfig->method('isSetFlag')
-            ->with('webapi/authorization/enable_integration_as_bearer')
+            ->with('oauth/consumer/enable_integration_as_bearer')
             ->willReturn(true);
 
         self::assertTrue($this->config->isIntegrationAsBearerEnabled());
@@ -43,7 +43,7 @@ public function testEnabled()
     public function testDisabled()
     {
         $this->scopeConfig->method('isSetFlag')
-            ->with('webapi/authorization/enable_integration_as_bearer')
+            ->with('oauth/consumer/enable_integration_as_bearer')
             ->willReturn(false);
 
         self::assertFalse($this->config->isIntegrationAsBearerEnabled());

app/code/Magento/Integration/etc/adminhtml/system.xml

@@ -54,6 +54,10 @@
                     <comment>Timeout for OAuth consumer credentials Post request within X seconds.</comment>
                     <validate>required-entry validate-zero-or-greater validate-number</validate>
                 </field>
+                <field id="enable_integration_as_bearer" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <label>Allow OAuth Access Tokens to be used as standalone Bearer tokens</label>
+                </field>
             </group>
             <group id="authentication_lock" translate="label" type="text" sortOrder="400" showInDefault="1">
                 <label>Authentication Locks</label>

app/code/Magento/Webapi/etc/adminhtml/system.xml

@@ -20,13 +20,6 @@
                     <comment>If empty, UTF-8 will be used.</comment>
                 </field>
             </group>
-            <group id="authorization" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Web Api Authentication</label>
-                <field id="enable_integration_as_bearer" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <label>Enable Input Limits</label>
-                </field>
-            </group>
         </section>
     </system>
 </config>

dev/tests/api-functional/testsuite/Magento/Integration/Model/IntegrationTest.php

@@ -90,7 +90,7 @@ public function testIntegrationAsBearerTokenDefault()
     /**
      * Test Integration access token can be used as Bearer token when explicitly enabled
      *
-     * @magentoConfigFixture default_store webapi/authorization/enable_integration_as_bearer 1
+     * @magentoConfigFixture default_store oauth/consumer/enable_integration_as_bearer 1
      * @doesNotPerformAssertions
      */
     public function testIntegrationAsBearerTokenEnabled()