MAPG-140 MAPG-154 store user in session based on id

src/Controller/LoginController.php

@@ -22,9 +22,7 @@ class LoginController
 
     public function getLoginForm()
     {
-        $session = $this->request->session();
-
-        if ($session->get('user')) {
+        if ($this->request->user() !== null) {
             return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
         }
 
@@ -34,9 +32,7 @@ class LoginController
 
     public function login(): IContent
     {
-        $session = $this->request->session();
-
-        if ($session->get('user')) {
+        if ($this->request->user() !== null) {
             $data = ['success' => true];
             return new JsonContent($data);
         }
@@ -58,7 +54,7 @@ class LoginController
             return new JsonContent($data);
         }
 
-        $session->set('user', $user);
+        $this->request->setUser($user);
 
         $data = ['success' => true];
         return new JsonContent($data);
@@ -66,7 +62,7 @@ class LoginController
 
     public function logout(): IRedirect
     {
-        $this->request->session()->delete('user');
+        $this->request->setUser(null);
 
         return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
     }

src/Controller/SignupController.php

@@ -31,9 +31,7 @@ class SignupController
 
     public function getSignupForm()
     {
-        $session = $this->request->session();
-
-        if ($session->get('user')) {
+        if ($this->request->user() !== null) {
             return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
         }
 
@@ -43,9 +41,7 @@ class SignupController
 
     public function signup(): IContent
     {
-        $session = $this->request->session();
-
-        if ($session->get('user')) {
+        if ($this->request->user() !== null) {
             //TODO: return with some error
             $data = ['success' => true];
             return new JsonContent($data);
@@ -102,9 +98,7 @@ class SignupController
 
     public function activate()
     {
-        $session = $this->request->session();
-
-        if ($session->get('user')) {
+        if ($this->request->user() !== null) {
             return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
         }
 
@@ -132,16 +126,14 @@ class SignupController
 
         \Container::$dbConnection->commit();
 
-        $session->set('user', $user);
+        $this->request->setUser($user);
 
         return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
     }
 
     public function cancel()
     {
-        $session = $this->request->session();
-
-        if ($session->get('user')) {
+        if ($this->request->user() !== null) {
             return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
         }
 

src/Controller/UserController.php

@@ -66,8 +66,6 @@ class UserController implements ISecured
 
         $this->pdm->saveToDb($user);
 
-        $this->request->session()->set('user', $user);
-
         $data = ['success' => true];
         return new JsonContent($data);
     }