Revert "MAGETWO-37815: Unable to revoke All Access Tokens for Customer without Tokens"

This reverts commit c14a78f.

Author: okarpenko

app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php

@@ -7,11 +7,28 @@
 
 namespace Magento\Customer\Controller\Adminhtml\Customer;
 
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+
 /**
  *  Class to invalidate tokens for customers
  */
 class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index
 {
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    protected $tokenService;
+
+    /**
+     * Inject dependencies.
+     *
+     * @param CustomerTokenServiceInterface $tokenService
+     */
+    public function __construct(CustomerTokenServiceInterface $tokenService)
+    {
+        $this->tokenService = $tokenService;
+    }
+
     /**
      * Reset customer's tokens handler
      *

app/code/Magento/Customer/Controller/Adminhtml/Index.php

@@ -15,7 +15,6 @@
 use Magento\Framework\Message\Error;
 use Magento\Framework\ObjectFactory;
 use Magento\Framework\Api\DataObjectHelper;
-use Magento\Integration\Api\CustomerTokenServiceInterface;
 
 /**
  * Class Index
@@ -144,11 +143,6 @@ class Index extends \Magento\Backend\App\Action
      */
     protected $resultJsonFactory;
 
-    /**
-     * @var CustomerTokenServiceInterface
-     */
-    protected $tokenService;
-
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
@@ -203,8 +197,7 @@ public function __construct(
         \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
         \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        CustomerTokenServiceInterface $tokenService
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
     ) {
         $this->_coreRegistry = $coreRegistry;
         $this->_fileFactory = $fileFactory;
@@ -230,7 +223,6 @@ public function __construct(
         $this->resultPageFactory = $resultPageFactory;
         $this->resultForwardFactory = $resultForwardFactory;
         $this->resultJsonFactory = $resultJsonFactory;
-        $this->tokenService = $tokenService;
         parent::__construct($context);
     }