AC-520: Oauth Token Improvement.

-Fixing afterSave methods in ResourceModel.
-Adding Assert to Integration test.

Author: admanesachin

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

@@ -79,9 +79,7 @@ public function getTimeInSecondsSinceCreation($consumerId)
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
-        $entityId = $object->getEntityId();
-
-        if (!$entityId && $object->getSecret()) {
+        if ($object->getSecret()) {
             $object->setSecret($this->encryptor->encrypt($object->getSecret()));
         }
 
@@ -93,7 +91,9 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
      */
     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     {
-        $object->setSecret($this->encryptor->decrypt($object->getSecret()));
+        if ($object->getSecret()) {
+            $object->setSecret($this->encryptor->decrypt($object->getSecret()));
+        }
 
         return parent::_afterLoad($object);
     }
@@ -103,13 +103,8 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
-        $secret = $object->getSecret();
-        //only decrypt secret for new objects or if data property was modified
-        if ($object->isObjectNew() ||
-            isset($object->getOrigData()['secret']) &&
-            $object->getOrigData()['secret'] !== $secret
-        ) {
-            $object->setSecret($this->encryptor->decrypt($secret));
+        if ($object->getSecret()) {
+            $object->setSecret($this->encryptor->decrypt($object->getSecret()));
         }
 
         return parent::_afterSave($object);

app/code/Magento/Integration/Setup/Patch/Data/UpgradeConsumerSecret.php

@@ -26,11 +26,6 @@ class UpgradeConsumerSecret implements DataPatchInterface, PatchVersionInterface
      */
     private $consumerCollection;
 
-    /**
-     * @var ConsumerCollectionFactory
-     */
-    private $consumerCollectionFactory;
-
     /**
      * @var Encryptor
      */
@@ -67,7 +62,7 @@ public function __construct(
         LoggerInterface $logger
     ) {
 
-        $this->consumerCollectionFactory= $consumerCollectionFactory;
+        $this->consumerCollection= $consumerCollectionFactory->create();
         $this->encryptor = $encryptor;
         $this->consumerResourceModel = $consumerResourceModel;
         $this->logger = $logger;
@@ -78,7 +73,6 @@ public function __construct(
      */
     public function apply()
     {
-        $this->consumerCollection = $this->consumerCollectionFactory->create();
         $this->consumerCollection->addFieldToSelect('entity_id');
         $this->consumerCollection->addFieldToSelect('secret');
         $connection = $this->consumerResourceModel->getConnection();

app/code/Magento/Integration/Setup/Patch/Data/UpgradeOauthToken.php

@@ -28,11 +28,6 @@ class UpgradeOauthToken implements DataPatchInterface, PatchVersionInterface
      */
     private $tokenCollection;
 
-    /**
-     * @var TokenCollectionFactory
-     */
-    private $tokenCollectionFactory;
-
     /**
      * @var Encryptor
      */
@@ -69,7 +64,7 @@ public function __construct(
         LoggerInterface $logger
     ) {
 
-        $this->tokenCollectionFactory= $tokenCollectionFactory;
+        $this->tokenCollection= $tokenCollectionFactory->create();
         $this->encryptor = $encryptor;
         $this->tokenResourceModel = $tokenResourceModel;
         $this->logger = $logger;
@@ -80,7 +75,6 @@ public function __construct(
      */
     public function apply()
     {
-        $this->tokenCollection = $this->tokenCollectionFactory->create();
         $this->tokenCollection->addFieldToSelect('entity_id');
         $this->tokenCollection->addFieldToSelect('secret');
         $this->tokenCollection->addFieldToSelect('type');

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

@@ -51,6 +51,12 @@ public function testSave(): void
             ]
         )->save();
 
+        $consumerResourceModel = $this->consumerModel->getResource();
+
         $this->assertEquals($consumerSecret, $this->consumerModel->getSecret());
+        $this->assertNotEquals(
+            $this->consumerModel->getSecret(),
+            $consumerResourceModel->load($this->consumerModel, 'secret')
+        );
     }
 }

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

@@ -303,6 +303,9 @@ public function testSave(): void
         );
         $model->save();
 
+        $tokenResourceModel = $model->getResource();
+
         $this->assertEquals($tokenSecret, $model->getSecret());
+        $this->assertNotEquals($model->getSecret(), $tokenResourceModel->load($model, 'secret'));
     }
 }