feature/update-to-soko-web-0.5 #26

Merged
bence merged 5 commits from feature/update-to-soko-web-0.5 into master 2023-04-18 23:30:34 +02:00
Showing only changes of commit b4cfa7aab2 - Show all commits

View File

@ -226,16 +226,12 @@ class LoginController
$passwordResetter->setToken($token);
$passwordResetter->setExpiresDate($expires);
\Container::$dbConnection->startTransaction();
if ($existingResetter !== null) {
$this->pdm->deleteFromDb($existingResetter);
}
$this->pdm->saveToDb($passwordResetter);
\Container::$dbConnection->commit();
$this->sendPasswordResetEmail($user->getEmail(), $token, $expires);
return new JsonContent(['success' => true]);
@ -275,8 +271,6 @@ class LoginController
return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
}
\Container::$dbConnection->startTransaction();
$this->pdm->deleteFromDb($resetter);
$user = $this->userRepository->getById($resetter->getUserId());
@ -284,8 +278,6 @@ class LoginController
$this->pdm->saveToDb($user);
\Container::$dbConnection->commit();
$this->request->setUser($user);
$this->deleteRedirectUrl();