6
6
*/
7
7
namespace Magento \Backend \Controller \Adminhtml \Auth ;
8
8
9
+ use Magento \Backend \App \Area \FrontNameResolver ;
10
+
9
11
class Login extends \Magento \Backend \Controller \Adminhtml \Auth
10
12
{
11
13
/**
12
14
* @var \Magento\Framework\View\Result\PageFactory
13
15
*/
14
16
protected $ resultPageFactory ;
15
17
18
+ /**
19
+ * @var FrontNameResolver
20
+ */
21
+ protected $ frontNameResolver ;
22
+
16
23
/**
17
24
* Constructor
18
25
*
@@ -21,9 +28,11 @@ class Login extends \Magento\Backend\Controller\Adminhtml\Auth
21
28
*/
22
29
public function __construct (
23
30
\Magento \Backend \App \Action \Context $ context ,
24
- \Magento \Framework \View \Result \PageFactory $ resultPageFactory
31
+ \Magento \Framework \View \Result \PageFactory $ resultPageFactory ,
32
+ FrontNameResolver $ frontNameResolver
25
33
) {
26
34
$ this ->resultPageFactory = $ resultPageFactory ;
35
+ $ this ->frontNameResolver = $ frontNameResolver ;
27
36
parent ::__construct ($ context );
28
37
}
29
38
@@ -43,6 +52,14 @@ public function execute()
43
52
$ resultRedirect ->setPath ($ this ->_backendUrl ->getStartupPageUrl ());
44
53
return $ resultRedirect ;
45
54
}
46
- return $ this ->resultPageFactory ->create ();
55
+
56
+ $ requestUrl = $ this ->getRequest ()->getUri ();
57
+ $ backendUrl = $ this ->getUrl ('* ' );
58
+ // redirect according to rewrite rule
59
+ if ($ requestUrl != $ backendUrl ) {
60
+ $ this ->_redirect ('* ' );
61
+ } else {
62
+ return $ this ->resultPageFactory ->create ();
63
+ }
47
64
}
48
65
}
0 commit comments