Skip to content

Commit

Permalink
Fix bug for wrong redirect on customer login and account confirmation…
Browse files Browse the repository at this point in the history
… email link.
  • Loading branch information
bold-dkdewijer committed Apr 11, 2022
1 parent e414da6 commit 03d0dcb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Controller/LoginCheck.php
Expand Up @@ -165,9 +165,6 @@ public function execute()
return true;
}

// Set Url To redirect ,using standard method of magento
$this->customerSession->setBeforeAuthUrl($url);

// check if current url is a match with one of the ignored urls
/** @var \BitExpert\ForceCustomerLogin\Model\WhitelistEntry $rule */
foreach ($this->whitelistRepository->getCollection()->getItems() as $rule) {
Expand All @@ -181,6 +178,9 @@ public function execute()
}
}

// Set Url To redirect ,using standard method of magento
$this->customerSession->setBeforeAuthUrl($url);

// Add any GET query parameters back to the path after making our url checks.
if (is_array($urlParts) && isset($urlParts['query']) && !empty($urlParts['query'])) {
$path .= '?' . $urlParts['query'];
Expand Down

0 comments on commit 03d0dcb

Please sign in to comment.