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

 - improved how updated date is compared against expiration limit

Author: Cari Spruiell

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

@@ -43,6 +43,11 @@ class Consumer extends \Magento\Framework\Model\AbstractModel implements Consume
      */
     protected $dataHelper;
 
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private $_dateHelper;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -80,6 +85,22 @@ protected function _construct()
         $this->_init('Magento\Integration\Model\ResourceModel\Oauth\Consumer');
     }
 
+    /**
+     * The getter function to get the new DateTime dependency
+     *
+     * @return \Magento\Framework\Stdlib\DateTime\DateTime
+     *
+     * @deprecated
+     */
+    private function getDateHelper()
+    {
+        if ($this->_dateHelper === null) {
+            $this->_dateHelper = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\Stdlib\DateTime\DateTime::class);
+        }
+        return $this->_dateHelper;
+    }
+
     /**
      * BeforeSave actions
      *
@@ -176,6 +197,8 @@ public function getCreatedAt()
     public function isValidForTokenExchange()
     {
         $expiry = $this->dataHelper->getConsumerExpirationPeriod();
-        return $expiry > $this->getResource()->getTimeInSecondsSinceTokenExchangeStarted($this->getId());
+        $currentTimestamp = $this->getDateHelper()->gmtTimestamp();
+        $updatedTimestamp = $this->getDateHelper()->gmtTimestamp($this->getUpdatedAt());
+        return $expiry > ($currentTimestamp - $updatedTimestamp);
     }
 }

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

@@ -56,25 +56,7 @@ public function getTimeInSecondsSinceCreation($consumerId)
         $select = $connection->select()
             ->from($this->getMainTable())
             ->reset(\Magento\Framework\DB\Select::COLUMNS)
-            ->columns(new \Zend_Db_Expr('UTC_TIMESTAMP() - created_at'))
-            ->where('entity_id = ?', $consumerId);
-
-        return $connection->fetchOne($select);
-    }
-
-    /**
-     * Compute time in seconds since token exchange started.
-     *
-     * @param int $consumerId - The consumer id
-     * @return int - time lapsed in seconds
-     */
-    public function getTimeInSecondsSinceTokenExchangeStarted($consumerId)
-    {
-        $connection = $this->getConnection();
-        $select = $connection->select()
-            ->from($this->getMainTable())
-            ->reset(\Magento\Framework\DB\Select::COLUMNS)
-            ->columns(new \Zend_Db_Expr('UTC_TIMESTAMP() - updated_at'))
+            ->columns(new \Zend_Db_Expr('CURRENT_TIMESTAMP() - created_at'))
             ->where('entity_id = ?', $consumerId);
 
         return $connection->fetchOne($select);