MAGETWO-62556: Subscription Request

Author: valdislav

app/code/Magento/Analytics/Model/AnalyticsConnector/SignUpCommand.php

@@ -7,7 +7,6 @@
 
 use Magento\Analytics\Model\AnalyticsToken;
 use Magento\Analytics\Model\IntegrationManager;
-use Magento\Analytics\Model\TokenProvider;
 
 /**
  * Class SignUpCommand
@@ -26,11 +25,6 @@ class SignUpCommand implements AnalyticsCommandInterface
      */
     private $integrationManager;
 
-    /**
-     * @var TokenProvider
-     */
-    private $tokenProvider;
-
     /**
      * @var SignUpRequest
      */
@@ -42,17 +36,14 @@ class SignUpCommand implements AnalyticsCommandInterface
      * @param SignUpRequest $signUpRequest
      * @param AnalyticsToken $analyticsToken
      * @param IntegrationManager $integrationManager
-     * @param TokenProvider $tokenProvider
      */
     public function __construct(
         SignUpRequest $signUpRequest,
         AnalyticsToken $analyticsToken,
-        IntegrationManager $integrationManager,
-        TokenProvider $tokenProvider
+        IntegrationManager $integrationManager
     ) {
         $this->analyticsToken = $analyticsToken;
         $this->integrationManager = $integrationManager;
-        $this->tokenProvider = $tokenProvider;
         $this->signUpRequest = $signUpRequest;
     }
 
@@ -70,7 +61,7 @@ public function __construct(
      */
     public function execute()
     {
-        $integrationToken = $this->tokenProvider->getToken();
+        $integrationToken = $this->integrationManager->generateToken();
         if ($integrationToken) {
             $this->integrationManager->activateIntegration();
             $responseToken = $this->signUpRequest->call($integrationToken);

app/code/Magento/Analytics/Model/IntegrationManager.php

@@ -10,6 +10,7 @@
 use Magento\Integration\Api\IntegrationServiceInterface;
 use Magento\Config\Model\Config;
 use Magento\Integration\Model\Integration;
+use Magento\Integration\Api\OauthServiceInterface;
 
 /**
  * Class IntegrationManager
@@ -30,29 +31,26 @@ class IntegrationManager
      */
     private $integrationService;
 
+    /**
+     * @var OauthServiceInterface
+     */
+    private $oauthService;
+
     /**
      * IntegrationManager constructor
      *
      * @param Config $config
      * @param IntegrationServiceInterface $integrationService
+     * @param OauthServiceInterface $oauthService
      */
     public function __construct(
         Config $config,
-        IntegrationServiceInterface $integrationService
+        IntegrationServiceInterface $integrationService,
+        OauthServiceInterface $oauthService
     ) {
         $this->integrationService = $integrationService;
         $this->config = $config;
-    }
-
-    /**
-     * Creates new integration user for MA
-     *
-     * @return bool
-     */
-    public function createIntegration()
-    {
-        $this->integrationService->create($this->getIntegrationData());
-        return true;
+        $this->oauthService = $oauthService;
     }
 
     /**
@@ -75,6 +73,37 @@ public function activateIntegration()
         return true;
     }
 
+    /**
+     * This method execute Generate Token command and enable integration
+     *
+     * @return bool|string
+     */
+    public function generateToken()
+    {
+        $consumerId = $this->generateIntegration()->getConsumerId();
+        $accessToken = $this->oauthService->getAccessToken($consumerId);
+        if (!$accessToken && $this->oauthService->createAccessToken($consumerId, true)) {
+            $accessToken = $this->oauthService->getAccessToken($consumerId);
+        }
+        return $accessToken;
+    }
+
+    /**
+     * Returns consumer Id for MA integration user
+     *
+     * @return \Magento\Integration\Model\Integration
+     */
+    private function generateIntegration()
+    {
+        $integration = $this->integrationService->findByName(
+            $this->config->getConfigDataValue('analytics/integration_name')
+        );
+        if (!$integration->getId()) {
+            $integration = $this->integrationService->create($this->getIntegrationData());
+        }
+        return $integration;
+    }
+
     /**
      * Returns default attributes for MA integration user
      *

app/code/Magento/Analytics/Model/TokenProvider.php

@@ -10,7 +10,6 @@
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Analytics\Model\NotificationTime;
-use Magento\Analytics\Model\IntegrationManager;
 
 /**
  * @codeCoverageIgnore
@@ -22,23 +21,15 @@ class InstallData implements InstallDataInterface
      */
     private $notificationTime;
 
-    /**
-     * @var IntegrationManager
-     */
-    private $integrationManager;
-
     /**
      * InstallData constructor.
      *
      * @param NotificationTime $notificationTime
-     * @param IntegrationManager $integrationManager\
      */
     public function __construct(
-        NotificationTime $notificationTime,
-        IntegrationManager $integrationManager
+        NotificationTime $notificationTime
     ) {
         $this->notificationTime = $notificationTime;
-        $this->integrationManager = $integrationManager;
     }
 
     /**
@@ -48,6 +39,5 @@ public function __construct(
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
         $this->notificationTime->storeLastTimeNotification(1);
-        $this->integrationManager->createIntegration();
     }
 }

app/code/Magento/Analytics/Setup/InstallData.php

@@ -7,7 +7,6 @@
 
 use Magento\Analytics\Model\AnalyticsConnector\SignUpCommand;
 use Magento\Analytics\Model\AnalyticsConnector\SignUpRequest;
-use Magento\Analytics\Model\TokenProvider;
 use Magento\Analytics\Model\AnalyticsToken;
 use Magento\Analytics\Model\IntegrationManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
@@ -32,11 +31,6 @@ class SignUpCommandTest extends \PHPUnit_Framework_TestCase
      */
     private $integrationManagerMock;
 
-    /**
-     * @var TokenProvider|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $tokenProviderMock;
-
     /**
      * @var SignUpRequest|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -50,9 +44,6 @@ protected function setUp()
         $this->integrationManagerMock = $this->getMockBuilder(IntegrationManager::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->tokenProviderMock = $this->getMockBuilder(TokenProvider::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->signUpRequestMock = $this->getMockBuilder(SignUpRequest::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -62,16 +53,15 @@ protected function setUp()
             [
                 'analyticsToken' => $this->analyticsTokenMock,
                 'integrationManager' => $this->integrationManagerMock,
-                'tokenProvider' => $this->tokenProviderMock,
                 'signUpRequest' => $this->signUpRequestMock
             ]
         );
     }
 
     public function testExecuteSuccess()
     {
-        $this->tokenProviderMock->expects($this->once())
-            ->method('getToken')
+        $this->integrationManagerMock->expects($this->once())
+            ->method('generateToken')
             ->willReturn('IntegrationToken');
         $this->integrationManagerMock->expects($this->once())
             ->method('activateIntegration')
@@ -89,8 +79,8 @@ public function testExecuteSuccess()
 
     public function testExecuteFailureCannotGenerateToken()
     {
-        $this->tokenProviderMock->expects($this->once())
-            ->method('getToken')
+        $this->integrationManagerMock->expects($this->once())
+            ->method('generateToken')
             ->willReturn(false);
         $this->integrationManagerMock->expects($this->never())
             ->method('activateIntegration')
@@ -106,8 +96,8 @@ public function testExecuteFailureCannotGenerateToken()
 
     public function testExecuteFailureResponseIsEmpty()
     {
-        $this->tokenProviderMock->expects($this->once())
-            ->method('getToken')
+        $this->integrationManagerMock->expects($this->once())
+            ->method('generateToken')
             ->willReturn('IntegrationToken');
         $this->integrationManagerMock->expects($this->once())
             ->method('activateIntegration')