#30950 allow login without redirect when using a secret key

engcom-Charlie · engcom-Charlie · commit 73ef59b9e0a3 · 2020-12-18T16:43:36.000+02:00
diff --git a/app/code/Magento/Backend/App/Action/Plugin/Authentication.php b/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
@@ -225,7 +225,8 @@ protected function _redirectIfNeededAfterLogin(\Magento\Framework\App\RequestInt
 
         // Checks, whether secret key is required for admin access or request uri is explicitly set
         if ($this->_url->useSecretKey()) {
-            $requestUri = $this->_url->getUrl('*/*/*', ['_current' => true]);
+            $requestParts = explode('/', trim($request->getRequestUri(), '/'), 2);
+            $requestUri = $this->_url->getUrl(array_pop($requestParts));
         } elseif ($request) {
             $requestUri = $request->getRequestUri();
         }

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,8 @@ protected function _redirectIfNeededAfterLogin(\Magento\Framework\App\RequestInt`
`225`	`225`
`226`	`226`	`// Checks, whether secret key is required for admin access or request uri is explicitly set`
`227`	`227`	`if ($this->_url->useSecretKey()) {`
`228`		`- $requestUri = $this->_url->getUrl('//*', ['_current' => true]);`
	`228`	`+ $requestParts = explode('/', trim($request->getRequestUri(), '/'), 2);`
	`229`	`+ $requestUri = $this->_url->getUrl(array_pop($requestParts));`
`229`	`230`	`} elseif ($request) {`
`230`	`231`	`$requestUri = $request->getRequestUri();`
`231`	`232`	`}`