AC-520: Oauth token improvements.

Refactoring the patch scripts.

Author: admanesachin

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

@@ -82,26 +82,32 @@ public function apply()
         $this->consumerCollection->addFieldToSelect('entity_id');
         $this->consumerCollection->addFieldToSelect('secret');
         $connection = $this->consumerResourceModel->getConnection();
-        $this->consumerCollection->getSelect()->limit(self::BATCH_SIZE);
-        $collectionItems = $this->consumerCollection->getItems();
+        $this->consumerCollection->setPageSize(self::BATCH_SIZE);
+        $pages = $this->consumerCollection->getLastPageNumber();
+        $tableName = $this->consumerResourceModel->getMainTable();
+
+        for ($currentPage = 1; $currentPage <= $pages; $currentPage++) {
+            $this->consumerCollection->setCurPage($currentPage);
 
             /** @var $consumer Consumer */
-        foreach ($collectionItems as $consumer) {
-            $existingSecret = $consumer->getSecret();
-            $entityId = $consumer->getEntityId();
-
-            if ($entityId && $existingSecret) {
-                if (strlen($existingSecret) <= OauthHelper::LENGTH_TOKEN_SECRET) {
-                    $data = ['secret' => $this->encryptor->encrypt($existingSecret)];
-                    $where = ['entity_id = ?' => $entityId];
-                    try {
-                        $connection->update($this->consumerResourceModel->getMainTable(), $data, $where);
-                    } catch (\Exception $exception) {
-                        $this->logger->critical($exception->getMessage());
-                        return $this;
+            foreach ($this->consumerCollection as $consumer) {
+                $existingSecret = $consumer->getSecret();
+                $entityId = $consumer->getEntityId();
+
+                if ($entityId && $existingSecret) {
+                    if (strlen($existingSecret) <= OauthHelper::LENGTH_TOKEN_SECRET) {
+                        $data = ['secret' => $this->encryptor->encrypt($existingSecret)];
+                        $where = ['entity_id = ?' => $entityId];
+                        try {
+                            $connection->update($tableName, $data, $where);
+                        } catch (\Exception $exception) {
+                            $this->logger->critical($exception->getMessage());
+                            return $this;
+                        }
                     }
                 }
             }
+            $this->consumerCollection->clear();
         }
 
         return $this;

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

@@ -84,28 +84,34 @@ public function apply()
         $this->tokenCollection->addFieldToSelect('entity_id');
         $this->tokenCollection->addFieldToSelect('secret');
         $this->tokenCollection->addFieldToSelect('type');
-        $this->tokenCollection->getSelect()->limit(self::BATCH_SIZE);
-        $collectionItems = $this->tokenCollection->getItems();
+        $this->tokenCollection->setPageSize(self::BATCH_SIZE);
         $connection = $this->tokenResourceModel->getConnection();
-
-        /** @var $token Token */
-        foreach ($collectionItems as $token) {
-            $existingSecret = $token->getSecret();
-            $entityId = $token->getEntityId();
-            $type = strtolower($token->getType());
-
-            if ($entityId && $existingSecret && $type === TokenModel::TYPE_ACCESS) {
-                if (strlen($existingSecret) <= OauthHelper::LENGTH_TOKEN_SECRET) {
-                    $data = ['secret' => $this->encryptor->encrypt($existingSecret)];
-                    $where = ['entity_id = ?' => $entityId, 'type = ?' => 'access'];
-                    try {
-                        $connection->update($this->tokenResourceModel->getMainTable(), $data, $where);
-                    } catch (\Exception $exception) {
-                        $this->logger->critical($exception->getMessage());
-                        return $this;
+        $pages = $this->tokenCollection->getLastPageNumber();
+        $tableName = $this->tokenResourceModel->getMainTable();
+
+        for ($currentPage = 1; $currentPage <= $pages; $currentPage++) {
+            $this->tokenCollection->setCurPage($currentPage);
+
+            /** @var $token Token */
+            foreach ($this->tokenCollection as $token) {
+                $existingSecret = $token->getSecret();
+                $entityId = $token->getEntityId();
+                $type = strtolower($token->getType());
+
+                if ($entityId && $existingSecret && $type === TokenModel::TYPE_ACCESS) {
+                    if (strlen($existingSecret) <= OauthHelper::LENGTH_TOKEN_SECRET) {
+                        $data = ['secret' => $this->encryptor->encrypt($existingSecret)];
+                        $where = ['entity_id = ?' => $entityId, 'type = ?' => 'access'];
+                        try {
+                            $connection->update($tableName, $data, $where);
+                        } catch (\Exception $exception) {
+                            $this->logger->critical($exception->getMessage());
+                            return $this;
+                        }
                     }
                 }
             }
+            $this->tokenCollection->clear();
         }
         return $this;
     }