[Login As Customer] Replaced protected with private properties and methods

Author: ihorvansach

app/code/Magento/LoginAsCustomer/Block/Adminhtml/Customer/Edit/Login.php

@@ -17,7 +17,7 @@ class Login extends GenericButton implements ButtonProviderInterface
     /**
      * @var \Magento\Framework\AuthorizationInterface
      */
-    protected $_authorization;
+    private $_authorization;
 
     /**
      * Constructor

app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Index.php

@@ -19,7 +19,7 @@ class Index extends \Magento\Backend\App\Action
     /**
      * @var \Magento\LoginAsCustomer\Model\Login
      */
-    protected $loginModel = null;
+    private $loginModel = null;
 
     /**
      * Index constructor.

app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Login.php

@@ -20,23 +20,23 @@ class Login extends \Magento\Backend\App\Action
     /**
      * @var \Magento\LoginAsCustomer\Model\Login
      */
-    protected $loginModel;
+    private $loginModel;
     /**
      * @var \Magento\Backend\Model\Auth\Session
      */
-    protected $authSession  = null;
+    private $authSession  = null;
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
-    protected $storeManager  = null;
+    private $storeManager  = null;
     /**
      * @var \Magento\Framework\Url
      */
-    protected $url = null;
+    private $url = null;
     /**
      * @var \Magento\LoginAsCustomer\Model\Config
      */
-    protected $config = null;
+    private $config = null;
 
     /**
      * Login constructor.

app/code/Magento/LoginAsCustomer/Controller/Login/Index.php

@@ -13,7 +13,7 @@ class Index extends \Magento\Framework\App\Action\Action
     /**
      * @var \Magento\LoginAsCustomer\Model\Login
      */
-    protected $loginModel = null;
+    private $loginModel = null;
 
     /**
      * Index constructor.
@@ -57,7 +57,7 @@ public function execute()
      * Init login info
      * @return false || \Magento\LoginAsCustomer\Model\Login
      */
-    protected function _initLogin()
+    private function _initLogin()
     {
         $secret = $this->getRequest()->getParam('secret');
         if (!$secret) {

app/code/Magento/LoginAsCustomer/Model/Config.php

@@ -25,11 +25,12 @@ class Config
     /**
      * @var ScopeConfigInterface
      */
-    protected $scopeConfig;
+
+    private $scopeConfig;
     /**
      * @var \Magento\Framework\App\ProductMetadataInterface
      */
-    protected $metadata;
+    private $metadata;
 
     /**
      * Config constructor.

app/code/Magento/LoginAsCustomer/Model/Login.php

@@ -37,42 +37,42 @@ class Login extends \Magento\Framework\Model\AbstractModel
     /**
      * @var \Magento\Customer\Model\CustomerFactory
      */
-    protected $_customerFactory;
+    private $_customerFactory;
 
     /**
      * @var \Magento\Customer\Model\Customer
      */
-    protected $_customer;
+    private $_customer;
 
     /**
      * @var \Magento\Customer\Model\Session
      */
-    protected $_customerSession;
+    private $_customerSession;
 
     /**
      * @var \Magento\Checkout\Model\Session
      */
-    protected $_checkoutSession;
+    private $_checkoutSession;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
      */
-    protected $_dateTime;
+    private $_dateTime;
 
     /**
      * @var \Magento\Framework\Math\Random
      */
-    protected $_random;
+    private $_random;
 
     /**
      * @var \Magento\Checkout\Model\Cart
      */
-    protected $cart;
+    private $cart;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      */
-    protected $scopeConfig;
+    private $scopeConfig;
 
     /**
      * Initialize dependencies.
@@ -167,7 +167,7 @@ public function deleteNotUsed()
      * Retrieve login datetime point
      * @return [type] [description]
      */
-    protected function getDateTimePoint()
+    private function getDateTimePoint()
     {
         return date('Y-m-d H:i:s', $this->_dateTime->gmtTimestamp() - self::TIME_FRAME);
     }

app/code/Magento/LoginAsCustomer/Model/PageCache/ConfigPlugin.php

@@ -16,12 +16,12 @@ class ConfigPlugin
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      */
-    protected $_scopeConfig;
+    private $_scopeConfig;
 
     /**
      * @var \Magento\Customer\Model\Session
      */
-    protected $_customerSession;
+    private $_customerSession;
 
     /**
      * Initialize dependencies.

app/code/Magento/LoginAsCustomer/Plugin/Button/ToolbarPlugin.php

@@ -20,12 +20,12 @@ class ToolbarPlugin
     /**
      * @var \Magento\Framework\AuthorizationInterface
      */
-    protected $authorization;
+    private $authorization;
 
     /**
      * @var \Magento\Framework\UrlInterface
      */
-    protected $urlInterface;
+    private $urlInterface;
 
     /**
      * ToolbarPlugin constructor.
@@ -83,7 +83,7 @@ public function beforePushButtons(
      *
      * @return bool
      */
-    protected function isAllowed()
+    private function isAllowed()
     {
         return $this->authorization->isAllowed('Magento_LoginAsCustomer::login_button');
     }

app/code/Magento/LoginAsCustomer/Ui/Component/Listing/Column/CustomerActions.php

@@ -12,20 +12,18 @@
 use Magento\Framework\UrlInterface;
 use Magento\Framework\AuthorizationInterface;
 
-abstract class AbstractColumn extends \Magento\Ui\Component\Listing\Columns\Column
+class Login extends \Magento\Ui\Component\Listing\Columns\Column
 {
 
     /**
      * @var UrlInterface
      */
-    protected $urlBuilder;
+    private $urlBuilder;
 
     /**
      * @var \Magento\Framework\AuthorizationInterface
      */
-    protected $_authorization;
-
-    protected $sourceColumnName;
+    private $_authorization;
 
     /**
      * @param ContextInterface $context
@@ -59,11 +57,14 @@ public function prepareDataSource(array $dataSource)
         if (isset($dataSource['data']['items'])) {
             $hidden = !$this->_authorization->isAllowed('Magento_LoginAsCustomer::login_button');
             foreach ($dataSource['data']['items'] as &$item) {
-                if (!empty($item[$this->sourceColumnName])) {
+
+                $sourceColumnName = !empty($item['customer_id']) ? 'customer_id' : 'entity_id';
+
+                if (!empty($item[$sourceColumnName])) {
                     $item[$this->getData('name')]['edit'] = [
                         'href' => $this->urlBuilder->getUrl(
                             'loginascustomer/login/login',
-                            ['customer_id' => $item[$this->sourceColumnName]]
+                            ['customer_id' => $item[$sourceColumnName]]
                         ),
                         'label' => __('Login As Customer'),
                         'hidden' => $hidden,