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

Author: nathanjosiah

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

@@ -20,6 +20,8 @@
 use Magento\Integration\Helper\Oauth\Data as OauthHelper;
 
 /**
+ * Reads user token data
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Reader implements UserTokenReaderInterface
@@ -112,6 +114,7 @@ private function getTokenModel(string $token): Token
      * Validate the given user type
      *
      * @param int $userType
+     * @throws UserTokenException
      */
     private function validateUserType(int $userType): void
     {

app/code/Magento/Integration/Model/UserToken/ExpirationValidator.php

@@ -34,10 +34,30 @@ public function __construct(DtUtil $datetimeUtil)
      */
     public function validate(UserToken $token): void
     {
-        if ($token->getUserContext()->getUserType() !== UserContextInterface::USER_TYPE_INTEGRATION
-            && $token->getData()->getExpires()->getTimestamp() <= $this->datetimeUtil->gmtTimestamp()
-        ) {
+        if (!$this->isIntegrationToken($token) && $this->isTokenExpired($token)) {
             throw new AuthorizationException(__('Consumer key has expired'));
         }
     }
+
+    /**
+     * Check if a token is expired
+     *
+     * @param UserToken $token
+     * @return bool
+     */
+    private function isTokenExpired(UserToken $token): bool
+    {
+        return $token->getData()->getExpires()->getTimestamp() <= $this->datetimeUtil->gmtTimestamp();
+    }
+
+    /**
+     * Check if a token is an integration token
+     *
+     * @param UserToken $token
+     * @return bool
+     */
+    private function isIntegrationToken(UserToken $token): bool
+    {
+        return $token->getUserContext()->getUserType() === UserContextInterface::USER_TYPE_INTEGRATION;
+    }
 }