Compare commits

..

2 Commits

Author SHA1 Message Date
ed80fe544f
add adminer to docker-compose
All checks were successful
mapguesser/pipeline/pr-develop This commit looks good
2023-04-16 17:48:12 +02:00
3e4c24bbc1
implement redirect after login 2023-04-16 17:48:12 +02:00
2 changed files with 7 additions and 1 deletions

View File

@ -29,6 +29,12 @@ services:
MYSQL_DATABASE: 'mapguesser' MYSQL_DATABASE: 'mapguesser'
MYSQL_USER: 'mapguesser' MYSQL_USER: 'mapguesser'
MYSQL_PASSWORD: 'mapguesser' MYSQL_PASSWORD: 'mapguesser'
adminer:
image: adminer:4.8.1-standalone
ports:
- 9090:8080
environment:
- ADMINER_DEFAULT_SERVER=mariadb
mail: mail:
image: marcopas/docker-mailslurper:latest image: marcopas/docker-mailslurper:latest
ports: ports:

View File

@ -270,7 +270,7 @@ class LoginController
{ {
if ($this->request->user() !== null) { if ($this->request->user() !== null) {
$this->deleteRedirectUrl(); $this->deleteRedirectUrl();
return new Redirect($this->redirectUrl, IRedirect::TEMPORARY); return new JsonContent(['redirect' => ['target' => '/' . $this->redirectUrl]]);
} }
$user = $this->userRepository->getByEmail($this->request->post('email')); $user = $this->userRepository->getByEmail($this->request->post('email'));