esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

Merged in bugfix/MAPG-69-dont-resend-welcome-email (pull request #125)

Browse Source 
MAPG-69 welcome email shouldn't be sent to existing user
This commit is contained in:
Bence Pőcze 2020-06-21 14:03:28 +00:00
commit d96ac938f8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Controller/LoginController.php
View File

@ -273,8 +273,12 @@ class LoginController
$user = $this->userRepository->getByEmail($userData['email']); $user = $this->userRepository->getByEmail($userData['email']);
if ($user === null) { if ($user === null) {
$sendWelcomeEmail = true;
$user = new User(); $user = new User();
$user->setEmail($userData['email']); $user->setEmail($userData['email']);
} else {
$sendWelcomeEmail = false;
} }
$user->setActive(true); $user->setActive(true);
@ -282,7 +286,9 @@ class LoginController
$this->pdm->saveToDb($user); $this->pdm->saveToDb($user);
$this->sendWelcomeEmail($user->getEmail()); if ($sendWelcomeEmail) {
$this->sendWelcomeEmail($user->getEmail());
}
$this->request->session()->delete('google_user_data'); $this->request->session()->delete('google_user_data');
$this->request->setUser($user); $this->request->setUser($user);