AC-520: Oauth Token Improvement.

admanesachin · admanesachin · commit e153c0ce3fec · 2021-09-29T10:53:57.000-05:00
Improvements to afterSave method.
diff --git a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Consumer.php b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Consumer.php
@@ -103,7 +103,13 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
-        $object->setSecret($this->encryptor->decrypt($object->getSecret()));
+        $secret = $object->getSecret();
+        if ($object->isObjectNew() ||
+            isset($object->getOrigData()['secret']) &&
+            $object->getOrigData()['secret'] !== $secret
+        ) {
+            $object->setSecret($this->encryptor->decrypt($secret));
+        }
 
         return parent::_afterSave($object);
     }

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,13 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)`
`103`	`103`	`*/`
`104`	`104`	`protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)`
`105`	`105`	`{`
`106`		`- $object->setSecret($this->encryptor->decrypt($object->getSecret()));`
	`106`	`+ $secret = $object->getSecret();`
	`107`	`+ if ($object->isObjectNew() \|\|`
	`108`	`+ isset($object->getOrigData()['secret']) &&`
	`109`	`+ $object->getOrigData()['secret'] !== $secret`
	`110`	`+ ) {`
	`111`	`+ $object->setSecret($this->encryptor->decrypt($secret));`
	`112`	`+ }`
`107`	`113`
`108`	`114`	`return parent::_afterSave($object);`
`109`	`115`	`}`