Skip to content

Commit 0153d82

Browse files
naydavnaydav
committed
magento2-login-as-customer/issues/104: Global refactoring
- Extract LoginAsCustomerLog
1 parent ef0f033 commit 0153d82

File tree

40 files changed

+173
-101
lines changed

40 files changed

+173
-101
lines changed

‎app/code/Magento/LoginAsCustomer/composer.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,9 @@
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
66
"magento/framework": "*",
7-
"magento/module-backend": "*",
87
"magento/module-customer": "*",
9-
"magento/module-sales": "*",
10-
"magento/module-store": "*",
11-
"magento/module-user": "*"
12-
},
13-
"suggest": {
14-
"magento/module-page-cache": "*"
8+
"magento/module-login-as-customer-api": "*",
9+
"magento/module-store": "*"
1510
},
1611
"type": "magento2-module",
1712
"license": [

‎app/code/Magento/LoginAsCustomerUi/Block/Adminhtml/Login.php renamed to ‎app/code/Magento/LoginAsCustomerLog/Block/Adminhtml/Login.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\LoginAsCustomerUi\Block\Adminhtml;
8+
namespace Magento\LoginAsCustomerLog\Block\Adminhtml;
99

1010
/**
1111
* Login as customer log

‎app/code/Magento/LoginAsCustomerUi/Controller/Adminhtml/Login/Grid.php renamed to ‎app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Login/Grid.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\LoginAsCustomerUi\Controller\Adminhtml\Login;
8+
namespace Magento\LoginAsCustomerLog\Controller\Adminhtml\Login;
99

1010
use Magento\Framework\Controller\ResultFactory;
1111
use Magento\Framework\Controller\ResultInterface;
@@ -22,14 +22,14 @@ class Grid extends Action implements HttpPostActionInterface
2222
*
2323
* @see _isAllowed()
2424
*/
25-
const ADMIN_RESOURCE = 'Magento_LoginAsCustomerUi::login_log';
25+
const ADMIN_RESOURCE = 'Magento_LoginAsCustomer::login_log';
2626

2727
/**
2828
* Login as customer log ajax grid
2929
*
3030
* @return ResultInterface
3131
*/
32-
public function execute():ResultInterface
32+
public function execute(): ResultInterface
3333
{
3434
return $this->resultFactory->create(ResultFactory::TYPE_PAGE);
3535
}

‎app/code/Magento/LoginAsCustomerUi/Controller/Adminhtml/Login/Index.php renamed to ‎app/code/Magento/LoginAsCustomerLog/Controller/Adminhtml/Login/Index.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\LoginAsCustomerUi\Controller\Adminhtml\Login;
8+
namespace Magento\LoginAsCustomerLog\Controller\Adminhtml\Login;
99

1010
use Magento\Backend\Model\View\Result\Page;
1111
use Magento\Framework\Controller\ResultFactory;
@@ -25,7 +25,7 @@ class Index extends Action implements HttpGetActionInterface, HttpPostActionInte
2525
*
2626
* @see _isAllowed()
2727
*/
28-
const ADMIN_RESOURCE = 'Magento_LoginAsCustomerUi::login_log';
28+
const ADMIN_RESOURCE = 'Magento_LoginAsCustomer::login_log';
2929

3030
/**
3131
* Login As Customer log grid action
@@ -42,7 +42,7 @@ public function execute():ResultInterface
4242

4343
/** @var Page $resultPage */
4444
$resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
45-
$resultPage->setActiveMenu('Magento_LoginAsCustomerUi::login_log')
45+
$resultPage->setActiveMenu('Magento_LoginAsCustomerLog::login_log')
4646
->addBreadcrumb(__('Customer'), __('Login As Customer Log'));
4747
$resultPage->getConfig()->getTitle()->prepend(__('Login As Customer Log'));
4848

‎app/code/Magento/LoginAsCustomerUi/Model/Login.php renamed to ‎app/code/Magento/LoginAsCustomerLog/Model/Login.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\LoginAsCustomerUi\Model;
8+
namespace Magento\LoginAsCustomerLog\Model;
99

1010
/**
1111
* Login model
@@ -19,6 +19,6 @@ class Login extends \Magento\Framework\Model\AbstractModel
1919
*/
2020
protected function _construct()
2121
{
22-
$this->_init(\Magento\LoginAsCustomerUi\Model\ResourceModel\Login::class);
22+
$this->_init(\Magento\LoginAsCustomerLog\Model\ResourceModel\Login::class);
2323
}
2424
}

‎app/code/Magento/LoginAsCustomerUi/Model/ResourceModel/Login.php renamed to ‎app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\LoginAsCustomerUi\Model\ResourceModel;
8+
namespace Magento\LoginAsCustomerLog\Model\ResourceModel;
99

1010
/**
11-
* LoginAsCustomerUi resource model
11+
* LoginAsCustomerLog resource model
1212
*/
1313
class Login extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1414
{
@@ -20,6 +20,6 @@ class Login extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
2020
*/
2121
protected function _construct()
2222
{
23-
$this->_init('login_as_customer', 'login_id');
23+
$this->_init('login_as_customer', 'secret');
2424
}
2525
}

‎app/code/Magento/LoginAsCustomerUi/Model/ResourceModel/Login/Collection.php renamed to ‎app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login/Collection.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\LoginAsCustomerUi\Model\ResourceModel\Login;
8+
namespace Magento\LoginAsCustomerLog\Model\ResourceModel\Login;
99

1010
/**
11-
* LoginAsCustomerUi collection
11+
* LoginAsCustomerLog collection
1212
*/
1313
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1414
{
@@ -21,6 +21,9 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
2121
protected function _construct()
2222
{
2323
parent::_construct();
24-
$this->_init(\Magento\LoginAsCustomerUi\Model\Login::class, \Magento\LoginAsCustomerUi\Model\ResourceModel\Login::class);
24+
$this->_init(
25+
\Magento\LoginAsCustomerLog\Model\Login::class,
26+
\Magento\LoginAsCustomerLog\Model\ResourceModel\Login::class
27+
);
2528
}
2629
}

‎app/code/Magento/LoginAsCustomerUi/Model/ResourceModel/Login/Grid/Collection.php renamed to ‎app/code/Magento/LoginAsCustomerLog/Model/ResourceModel/Login/Grid/Collection.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\LoginAsCustomerUi\Model\ResourceModel\Login\Grid;
8+
namespace Magento\LoginAsCustomerLog\Model\ResourceModel\Login\Grid;
99

1010
/**
11-
* LoginAsCustomerUi collection
11+
* LoginAsCustomerLog collection
1212
*/
13-
class Collection extends \Magento\LoginAsCustomerUi\Model\ResourceModel\Login\Collection
13+
class Collection extends \Magento\LoginAsCustomerLog\Model\ResourceModel\Login\Collection
1414
{
1515
/**
1616
* Constructor

‎app/code/Magento/LoginAsCustomerLog/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Magento_LoginAsCustomerLog module
2+
3+
The Magento_LoginAsCustomerLog module provides log for Login As Customer functionality

‎app/code/Magento/LoginAsCustomerLog/composer.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"name": "magento/module-login-as-customer-log",
3+
"description": "",
4+
"require": {
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "*",
7+
"magento/module-login-as-customer-api": "*",
8+
"magento/module-backend": "*",
9+
"magento/module-customer": "*",
10+
"magento/module-sales": "*",
11+
"magento/module-store": "*",
12+
"magento/module-ui": "*",
13+
"magento/module-user": "*"
14+
},
15+
"type": "magento2-module",
16+
"license": [
17+
"OSL-3.0",
18+
"AFL-3.0"
19+
],
20+
"autoload": {
21+
"files": [ "registration.php" ],
22+
"psr-4": {
23+
"Magento\\LoginAsCustomerLog\\": ""
24+
}
25+
}
26+
}

0 commit comments

Comments
 (0)