MAPG-140 refactor user handling to use the PersistentDataManager
This commit is contained in:
1 parent
d6750777c2
commit
a9eec05288
6 files changed
+78
-60
No files matched your search
@@ -7,7 +7,9 @@ use MapGuesser\Interfaces\Request\IRequest;
|
||||
use MapGuesser\Interfaces\Response\IContent;
|
||||
use MapGuesser\Interfaces\Response\IRedirect;
|
||||
use MapGuesser\Mailing\Mail;
|
||||
use MapGuesser\Model\User;
|
||||
use MapGuesser\PersistentData\PersistentDataManager;
|
||||
use MapGuesser\PersistentData\Model\User;
|
||||
use MapGuesser\Repository\UserRepository;
|
||||
use MapGuesser\Response\HtmlContent;
|
||||
use MapGuesser\Response\JsonContent;
|
||||
use MapGuesser\Response\Redirect;
|
||||
@@ -16,9 +18,15 @@ class SignupController
|
||||
{
|
||||
private IRequest $request;
|
||||
|
||||
private PersistentDataManager $pdm;
|
||||
|
||||
private UserRepository $userRepository;
|
||||
|
||||
public function __construct(IRequest $request)
|
||||
{
|
||||
$this->request = $request;
|
||||
$this->pdm = new PersistentDataManager();
|
||||
$this->userRepository = new UserRepository();
|
||||
}
|
||||
|
||||
public function getSignupForm()
|
||||
@@ -48,15 +56,9 @@ class SignupController
|
||||
return new JsonContent($data);
|
||||
}
|
||||
|
||||
$select = new Select(\Container::$dbConnection, 'users');
|
||||
$select->columns(User::getFields());
|
||||
$select->where('email', '=', $this->request->post('email'));
|
||||
|
||||
$userData = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
|
||||
|
||||
if ($userData !== null) {
|
||||
$user = new User($userData);
|
||||
$user = $this->userRepository->getByEmail($this->request->post('email'));
|
||||
|
||||
if ($user !== null) {
|
||||
if ($user->getActive()) {
|
||||
$data = ['error' => 'user_found'];
|
||||
} else {
|
||||
@@ -75,23 +77,18 @@ class SignupController
|
||||
return new JsonContent($data);
|
||||
}
|
||||
|
||||
$user = new User([
|
||||
'email' => $this->request->post('email'),
|
||||
]);
|
||||
|
||||
$user = new User();
|
||||
$user->setEmail($this->request->post('email'));
|
||||
$user->setPlainPassword($this->request->post('password'));
|
||||
|
||||
\Container::$dbConnection->startTransaction();
|
||||
|
||||
$modify = new Modify(\Container::$dbConnection, 'users');
|
||||
$modify->fill($user->toArray());
|
||||
$modify->save();
|
||||
$userId = $modify->getId();
|
||||
$this->pdm->saveToDb($user);
|
||||
|
||||
$token = hash('sha256', serialize($user) . random_bytes(10) . microtime());
|
||||
|
||||
$modify = new Modify(\Container::$dbConnection, 'user_confirmations');
|
||||
$modify->set('user_id', $userId);
|
||||
$modify->set('user_id', $user->getId());
|
||||
$modify->set('token', $token);
|
||||
$modify->save();
|
||||
|
||||
@@ -128,20 +125,13 @@ class SignupController
|
||||
$modify->setId($confirmation['id']);
|
||||
$modify->delete();
|
||||
|
||||
$modify = new Modify(\Container::$dbConnection, 'users');
|
||||
$modify->setId($confirmation['user_id']);
|
||||
$modify->set('active', true);
|
||||
$modify->save();
|
||||
$user = $this->userRepository->getById($confirmation['user_id']);
|
||||
$user->setActive(true);
|
||||
|
||||
$this->pdm->saveToDb($user);
|
||||
|
||||
\Container::$dbConnection->commit();
|
||||
|
||||
$select = new Select(\Container::$dbConnection, 'users');
|
||||
$select->columns(User::getFields());
|
||||
$select->whereId($confirmation['user_id']);
|
||||
|
||||
$userData = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
|
||||
$user = new User($userData);
|
||||
|
||||
$session->set('user', $user);
|
||||
|
||||
return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
|
||||
@@ -172,9 +162,9 @@ class SignupController
|
||||
$modify->setId($confirmation['id']);
|
||||
$modify->delete();
|
||||
|
||||
$modify = new Modify(\Container::$dbConnection, 'users');
|
||||
$modify->setId($confirmation['user_id']);
|
||||
$modify->delete();
|
||||
$user = $this->userRepository->getById($confirmation['user_id']);
|
||||
|
||||
$this->pdm->deleteFromDb($user);
|
||||
|
||||
\Container::$dbConnection->commit();
|
||||
|
||||
|
||||
Reference in new issue
Block a user