Cleanup

leepeuker · Jun 30, 2022 · fca4317 · fca4317
1 parent a60a10e
commit fca4317
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/Application/User/Service/Authentication.php b/src/Application/User/Service/Authentication.php
@@ -8,6 +8,10 @@
 
 class Authentication
 {
+    private const AUTHENTICATION_COOKIE_NAME = 'id';
+
+    private const MAX_EXPIRATION_AGE_IN_DAYS = 30;
+
     public function __construct(private readonly Repository $repository)
     {
     }
@@ -19,22 +23,26 @@ public function deleteToken(string $token) : void
 
     public function isUserAuthenticated() : bool
     {
-        $token = filter_input(INPUT_COOKIE, 'id');
+        $token = filter_input(INPUT_COOKIE, self::AUTHENTICATION_COOKIE_NAME);
 
         if (empty($token) === false && $this->isValidToken($token) === true) {
             return true;
         }
 
         if (empty($token) === false) {
-            unset($_COOKIE['id']);
-            setcookie('id', '', -1);
+            unset($_COOKIE[self::AUTHENTICATION_COOKIE_NAME]);
+            setcookie(self::AUTHENTICATION_COOKIE_NAME, '', -1);
         }
 
         return false;
     }
 
     public function login(string $password, bool $rememberMe) : void
     {
+        if ($this->isUserAuthenticated() === true) {
+            return;
+        }
+
         $user = $this->repository->fetchAdminUser();
 
         if (password_verify($password, $user->getPasswordHash()) === false) {
@@ -43,12 +51,12 @@ public function login(string $password, bool $rememberMe) : void
 
         $expirationDate = $this->createExpirationDate();
         if ($rememberMe === true) {
-            $expirationDate = $this->createExpirationDate(30);
+            $expirationDate = $this->createExpirationDate(self::MAX_EXPIRATION_AGE_IN_DAYS);
         }
 
         $token = $this->generateToken(DateTime::createFromString((string)$expirationDate));
 
-        setcookie('id', $token, (int)$expirationDate->format('U'));
+        setcookie(self::AUTHENTICATION_COOKIE_NAME, $token, (int)$expirationDate->format('U'));
     }
 
     private function createExpirationDate(int $days = 1) : DateTime

diff --git a/src/HttpController/AuthenticationController.php b/src/HttpController/AuthenticationController.php
@@ -21,14 +21,6 @@ public function __construct(
 
     public function login(Request $request) : Response
     {
-        if ($this->authenticationService->isUserAuthenticated() === true) {
-            return Response::create(
-                StatusCode::createSeeOther(),
-                null,
-                [Header::createLocation($_SERVER['HTTP_REFERER'])]
-            );
-        }
-
         try {
             $this->authenticationService->login(
                 $request->getPostParameters()['password'],