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

 - fix static test failures
 - update unit tests

Author: Cari Spruiell

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

@@ -61,6 +61,11 @@ class OauthService implements \Magento\Integration\Api\OauthServiceInterface
      */
     protected $_tokenProvider;
 
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private $_dateHelper;
+
     /**
      * Initialize dependencies.
      *
@@ -94,6 +99,22 @@ public function __construct(
     }
 
     /**
+     * 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;
+    }
+
+    /*
      * {@inheritdoc}
      */
     public function createConsumer($consumerData)
@@ -193,7 +214,7 @@ public function postToConsumer($consumerId, $endpointUrl)
     {
         try {
             $consumer = $this->_consumerFactory->create()->load($consumerId);
-            $consumer->setUpdatedAt(date_create());
+            $consumer->setUpdatedAt($this->getDateHelper()->gmtDate());
             $consumer->save();
             if (!$consumer->getId()) {
                 throw new \Magento\Framework\Oauth\Exception(

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

@@ -45,6 +45,8 @@ public function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
     /**
      * Compute time in seconds since consumer was created.
      *
+     * @deprecated
+     *
      * @param int $consumerId - The consumer id
      * @return int - time lapsed in seconds
      */
@@ -60,6 +62,12 @@ public function getTimeInSecondsSinceCreation($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();

app/code/Magento/Integration/Test/Unit/Helper/Oauth/ConsumerTest.php

@@ -152,6 +152,16 @@ public function testPostToConsumer()
         )->will(
             $this->returnSelf()
         );
+
+        $dateHelperMock = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\DateTime')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dateHelperMock->expects($this->any())->method('gmtDate');
+
+        $dateHelper = new \ReflectionProperty('Magento\Integration\Model\OauthService', '_dateHelper');
+        $dateHelper->setAccessible(true);
+        $dateHelper->setValue($this->_oauthService, $dateHelperMock);
+
         $this->_consumerMock->expects($this->once())->method('getId')->will($this->returnValue($consumerId));
         $this->_consumerMock->expects($this->once())->method('getData')->will($this->returnValue($consumerData));
         $this->_httpClientMock->expects(

app/code/Magento/Integration/Test/Unit/Model/Oauth/ConsumerTest.php

@@ -110,7 +110,7 @@ public function setUp()
 
         $this->resourceMock = $this->getMock(
             'Magento\Integration\Model\ResourceModel\Oauth\Consumer',
-            ['getTimeInSecondsSinceCreation', 'getIdFieldName', 'selectByCompositeKey', 'deleteOldEntries'],
+            ['getTimeInSecondsSinceTokenExchangeStarted', 'getIdFieldName', 'selectByCompositeKey', 'deleteOldEntries'],
             [],
             '',
             false,
@@ -216,20 +216,20 @@ public function testValidateInvalidConsumerSecret()
     public function testGetConsumerExpirationPeriodValid()
     {
         $this->resourceMock->expects($this->once())
-            ->method('getTimeInSecondsSinceCreation')
+            ->method('getTimeInSecondsSinceTokenExchangeStarted')
             ->will($this->returnValue(30));
 
-        $this->consumerModel->setCreatedAt(time());
+        $this->consumerModel->setUpdatedAt(time());
         $this->assertTrue($this->consumerModel->isValidForTokenExchange());
     }
 
     public function testGetConsumerExpirationPeriodExpired()
     {
         $this->resourceMock->expects($this->once())
-            ->method('getTimeInSecondsSinceCreation')
+            ->method('getTimeInSecondsSinceTokenExchangeStarted')
             ->will($this->returnValue(400));
 
-        $this->consumerModel->setCreatedAt(time());
+        $this->consumerModel->setUpdatedAt(time());
         $this->assertFalse($this->consumerModel->isValidForTokenExchange());
     }
 }