MAGETWO-51292: [GITHUB] OAuth Token Exchange Expiration Period Is Not Calculated Correctly #3449

 - change consumer expiration to be based on time token exchange starts instead of when consumer is created

Author: Cari Spruiell

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

@@ -176,6 +176,6 @@ public function getCreatedAt()
     public function isValidForTokenExchange()
     {
         $expiry = $this->dataHelper->getConsumerExpirationPeriod();
-        return $expiry > $this->getResource()->getTimeInSecondsSinceCreation($this->getId());
+        return $expiry > $this->getResource()->getTimeInSecondsSinceTokenExchangeStarted($this->getId());
     }
 }

app/code/Magento/Integration/Model/OauthService.php

@@ -193,6 +193,8 @@ public function postToConsumer($consumerId, $endpointUrl)
     {
         try {
             $consumer = $this->_consumerFactory->create()->load($consumerId);
+            $consumer->setUpdatedAt(date_create());
+            $consumer->save();
             if (!$consumer->getId()) {
                 throw new \Magento\Framework\Oauth\Exception(
                     __('A consumer with ID %1 does not exist', $consumerId)

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

@@ -59,4 +59,16 @@ public function getTimeInSecondsSinceCreation($consumerId)
 
         return $connection->fetchOne($select);
     }
+
+    public function getTimeInSecondsSinceTokenExchangeStarted($consumerId)
+    {
+        $connection = $this->getConnection();
+        $select = $connection->select()
+            ->from($this->getMainTable())
+            ->reset(\Magento\Framework\DB\Select::COLUMNS)
+            ->columns(new \Zend_Db_Expr('CURRENT_TIMESTAMP() - updated_at'))
+            ->where('entity_id = ?', $consumerId);
+
+        return $connection->fetchOne($select);
+    }
 }