esoko/rvr-nextgen
esoko/rvr-nextgen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

RVRNEXT-2 fix redirect after login

Browse Source
This commit is contained in:
Bence Pőcze 2023-04-08 19:07:18 +02:00
parent e4dc8ace04
commit 364d55a4b2
Signed by: bence
GPG Key ID: DC5BD6E95A333E6D
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Controller/LoginController.php
View File

@ -27,21 +27,27 @@ class LoginController
private UserPasswordResetterRepository $userPasswordResetterRepository; private UserPasswordResetterRepository $userPasswordResetterRepository;
private string $redirectUrl;
public function __construct(IRequest $request) public function __construct(IRequest $request)
{ {
$this->request = $request; $this->request = $request;
$this->pdm = new PersistentDataManager(); $this->pdm = new PersistentDataManager();
$this->userRepository = new UserRepository(); $this->userRepository = new UserRepository();
$this->userPasswordResetterRepository = new UserPasswordResetterRepository(); $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
$this->redirectUrl = $this->request->session()->has('redirect_after_login') ?
$this->request->session()->get('redirect_after_login') :
\Container::$routeCollection->getRoute('index')->generateLink();
} }
public function getLoginForm() public function getLoginForm()
{ {
if ($this->request->user() !== null) { if ($this->request->user() !== null) {
return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY); $this->deleteRedirectUrl();
return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
} }
return new HtmlContent('login/login', ['redirectUrl' => $this->getRedirectUrl()]); return new HtmlContent('login/login', ['redirectUrl' => $this->redirectUrl]);
} }
public function getGoogleLoginRedirect(): IRedirect public function getGoogleLoginRedirect(): IRedirect
@ -65,7 +71,8 @@ class LoginController
public function getRequestPasswordResetForm() public function getRequestPasswordResetForm()
{ {
if ($this->request->user() !== null) { if ($this->request->user() !== null) {
return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY); $this->deleteRedirectUrl();
return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
} }
return new HtmlContent('login/password_reset_request', ['email' => $this->request->query('email')]); return new HtmlContent('login/password_reset_request', ['email' => $this->request->query('email')]);
@ -79,7 +86,8 @@ class LoginController
public function getResetPasswordForm() public function getResetPasswordForm()
{ {
if ($this->request->user() !== null) { if ($this->request->user() !== null) {
return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY); $this->deleteRedirectUrl();
return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
} }
$token = $this->request->query('token'); $token = $this->request->query('token');
@ -91,7 +99,7 @@ class LoginController
$user = $this->userRepository->getById($resetter->getUserId()); $user = $this->userRepository->getById($resetter->getUserId());
return new HtmlContent('login/reset_password', ['success' => true, 'token' => $token, 'email' => $user->getEmail(), 'redirectUrl' => $this->getRedirectUrl()]); return new HtmlContent('login/reset_password', ['success' => true, 'token' => $token, 'email' => $user->getEmail(), 'redirectUrl' => $this->redirectUrl]);
} }
public function login(): IContent public function login(): IContent
@ -123,7 +131,7 @@ class LoginController
if ($this->request->user() !== null) { if ($this->request->user() !== null) {
$this->deleteRedirectUrl(); $this->deleteRedirectUrl();
return new Redirect($this->getRedirectUrl(), IRedirect::TEMPORARY); return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
} }
if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) { if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) {
@ -159,7 +167,7 @@ class LoginController
$this->request->setUser($user); $this->request->setUser($user);
$this->deleteRedirectUrl(); $this->deleteRedirectUrl();
return new Redirect($this->getRedirectUrl(), IRedirect::TEMPORARY); return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
} }
public function logout(): IRedirect public function logout(): IRedirect
@ -175,7 +183,7 @@ class LoginController
$this->deleteRedirectUrl(); $this->deleteRedirectUrl();
return new JsonContent([ return new JsonContent([
'redirect' => [ 'redirect' => [
'target' => $this->getRedirectUrl() 'target' => $this->redirectUrl
] ]
]); ]);
} }
@ -239,7 +247,7 @@ class LoginController
$this->deleteRedirectUrl(); $this->deleteRedirectUrl();
return new JsonContent([ return new JsonContent([
'redirect' => [ 'redirect' => [
'target' => $this->getRedirectUrl() 'target' => $this->redirectUrl
] ]
]); ]);
} }
@ -298,15 +306,6 @@ class LoginController
$mail->send(); $mail->send();
} }
private function getRedirectUrl(): string
{
$redirectUrl = $this->request->session()->get('redirect_after_login');
if ($redirectUrl === null) {
return \Container::$routeCollection->getRoute('index')->generateLink();
}
return $redirectUrl;
}
private function deleteRedirectUrl(): void private function deleteRedirectUrl(): void
{ {
$this->request->session()->delete('redirect_after_login'); $this->request->session()->delete('redirect_after_login');