AC-520: Oauth token improvement.

Added AfterSaveMethod for Consumer and Token Model.
Refactoring Integration tests.

Author: admanesachin

app/code/Magento/Integration/Model/Oauth/Token.php

@@ -15,7 +15,6 @@
 use Magento\Integration\Api\UserTokenReaderInterface;
 use Magento\Integration\Model\CustomUserContext;
 use Magento\Integration\Model\ResourceModel\Oauth\Token\Collection as TokenCollection;
-use Magento\Integration\Model\ResourceModel\Oauth\Token as TokenResourceModel;
 
 /**
  * oAuth token model
@@ -100,11 +99,6 @@ class Token extends \Magento\Framework\Model\AbstractModel
      */
     private $tokenParamsFactory;
 
-    /**
-     * @var TokenResourceModel
-     */
-    private $tokenResourceModel;
-
     /**
      * Initialize dependencies.
      *
@@ -121,7 +115,6 @@ class Token extends \Magento\Framework\Model\AbstractModel
      * @param UserTokenReaderInterface|null $reader
      * @param UserTokenIssuerInterface|null $issuer
      * @param UserTokenParametersInterfaceFactory|null $paramsFactory
-     * @param TokenResourceModel|null $tokenResourceModel
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -137,8 +130,7 @@ public function __construct(
         array $data = [],
         ?UserTokenReaderInterface $reader = null,
         ?UserTokenIssuerInterface $issuer = null,
-        ?UserTokenParametersInterfaceFactory $paramsFactory = null,
-        ?TokenResourceModel $tokenResourceModel = null
+        ?UserTokenParametersInterfaceFactory $paramsFactory = null
     ) {
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
         $this->_keyLengthFactory = $keyLengthFactory;
@@ -150,8 +142,6 @@ public function __construct(
         $this->issuer = $issuer ?? ObjectManager::getInstance()->get(UserTokenIssuerInterface::class);
         $this->tokenParamsFactory = $paramsFactory ??
             ObjectManager::getInstance()->get(UserTokenParametersInterfaceFactory::class);
-        $this->tokenResourceModel = $tokenResourceModel ??
-            ObjectManager::getInstance()->get(TokenResourceModel::class);
     }
 
     /**
@@ -219,12 +209,7 @@ public function convertToAccess()
         if (self::TYPE_REQUEST != $this->getType()) {
             throw new OauthException(__('Cannot convert to access token due to token is not request type'));
         }
-        $this->tokenResourceModel->afterLoad(
-            $this->saveAccessToken(
-                UserContextInterface::USER_TYPE_INTEGRATION
-            )
-        );
-        return $this;
+        return $this->saveAccessToken(UserContextInterface::USER_TYPE_INTEGRATION);
     }
 
     /**

app/code/Magento/Integration/Model/ResourceModel/Oauth/Consumer.php

@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Encryption\Encryptor;
-use Magento\Framework\Oauth\Helper\Oauth as OauthHelper;
 
 class Consumer extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -80,11 +79,10 @@ public function getTimeInSecondsSinceCreation($consumerId)
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
-        $existingSecret = $object->getSecret();
         $entityId = $object->getEntityId();
 
-        if (!$entityId && $existingSecret && strlen($existingSecret) <= OauthHelper::LENGTH_TOKEN_SECRET) {
-            $object->setSecret($this->encryptor->encrypt($existingSecret));
+        if (!$entityId && $object->getSecret()) {
+            $object->setSecret($this->encryptor->encrypt($object->getSecret()));
         }
 
         return parent::_beforeSave($object);
@@ -95,12 +93,18 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
      */
     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     {
-        $existingSecret = $object->getSecret();
-
-        if (strlen($existingSecret) > OauthHelper::LENGTH_CONSUMER_SECRET) {
-            $object->setSecret($this->encryptor->decrypt($existingSecret));
-        }
+        $object->setSecret($this->encryptor->decrypt($object->getSecret()));
 
         return parent::_afterLoad($object);
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
+    {
+        $object->setSecret($this->encryptor->decrypt($object->getSecret()));
+
+        return parent::_afterSave($object);
+    }
 }

app/code/Magento/Integration/Model/ResourceModel/Oauth/Token.php

@@ -227,13 +227,21 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     {
         if ($object->getType() === \Magento\Integration\Model\Oauth\Token::TYPE_ACCESS) {
-            $existingSecret = $object->getSecret();
+            $object->setSecret($this->encryptor->decrypt($object->getSecret()));
+        }
 
-            if (strlen($existingSecret) > OauthHelper::LENGTH_TOKEN_SECRET) {
-                $object->setSecret($this->encryptor->decrypt($existingSecret));
-            }
+        return parent::_afterLoad($object);
+    }
 
+    /**
+     * @inheritdoc
+     */
+    protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
+    {
+        if ($object->getType() === \Magento\Integration\Model\Oauth\Token::TYPE_ACCESS) {
+            $object->setSecret($this->encryptor->decrypt($object->getSecret()));
         }
-        return parent::_afterLoad($object);
+
+        return parent::_afterSave($object);
     }
 }

dev/tests/integration/testsuite/Magento/Integration/Model/ResourceModel/Oauth/ConsumerTest.php

@@ -69,6 +69,6 @@ public function testSave(): void
             ]
         )->save();
 
-        $this->assertEquals($consumerSecret, $this->encryptor->decrypt($this->consumerModel->getSecret()));
+        $this->assertEquals($consumerSecret, $this->consumerModel->getSecret());
     }
 }

dev/tests/integration/testsuite/Magento/Integration/Model/ResourceModel/Oauth/TokenTest.php

@@ -310,6 +310,6 @@ public function testSave(): void
         );
         $model->save();
 
-        $this->assertEquals($tokenSecret, $this->encryptor->decrypt($model->getSecret()));
+        $this->assertEquals($tokenSecret, $model->getSecret());
     }
 }