fix: persistent login error

PrestaShopCorp · Feb 6, 2023 · 5e46fb8 · 5e46fb8
1 parent bdcd330
commit 5e46fb8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/controllers/admin/AdminLoginController.php b/controllers/admin/AdminLoginController.php
@@ -141,7 +141,7 @@ public function createPsAccountsLoginTemplate()
         $isoCode = $this->context->currentLocale->getCode();
 
         $this->context->smarty->assign('uriHelpCenter', $this->getUriHelpCenter($isoCode));
-        $this->context->smarty->assign('loginError', $session->get('loginError'));
+        $this->context->smarty->assign('loginError', $session->remove('loginError'));
         $this->context->smarty->assign('meta_title', '');
         $this->context->smarty->assign('ssoResendVerificationEmail',
             $this->psAccountsModule->getParameter('ps_accounts.sso_resend_verification_email_url')

diff --git a/controllers/admin/AdminOAuth2PsAccountsController.php b/controllers/admin/AdminOAuth2PsAccountsController.php
@@ -143,8 +143,6 @@ private function initUserSession(PrestaShopUser $user): bool
 
         $cookie->write();
 
-        $this->unsetLoginError();
-
         if ($this->module->isShopEdition()) {
             $this->analyticsService->identify(
                 $user->getId(),
@@ -270,12 +268,4 @@ private function setLoginError(string $error): void
     {
         $this->getSession()->set('loginError', $error);
     }
-
-    /**
-     * @throws ContainerNotFoundException
-     */
-    private function unsetLoginError(): void
-    {
-        $this->getSession()->remove('loginError');
-    }
 }