MAPG-142 implemenet confirmation mail resend

src/Controller/LoginController.php

@@ -1,5 +1,6 @@
 <?php namespace MapGuesser\Controller;
 
+use DateInterval;
 use DateTime;
 use MapGuesser\Http\Request;
 use MapGuesser\Interfaces\Request\IRequest;
@@ -168,6 +169,8 @@ class LoginController
         }
 
         if (!$user->getActive()) {
+            $this->resendConfirmationEmail($user);
+
             return new JsonContent([
                 'error' => [
                     'errorText' => 'User found with the given email address, but the account is not activated. ' .
@@ -306,11 +309,12 @@ class LoginController
 
         $this->pdm->saveToDb($user);
 
-        $token = hash('sha256', serialize($user) . random_bytes(10) . microtime());
+        $token = bin2hex(random_bytes(16));
 
         $confirmation = new UserConfirmation();
         $confirmation->setUser($user);
         $confirmation->setToken($token);
+        $confirmation->setLastSentDate(new DateTime());
 
         $this->pdm->saveToDb($confirmation);
 
@@ -377,7 +381,7 @@ class LoginController
             return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
         }
 
-        $confirmation = $this->userConfirmationRepository->getByToken($this->request->query('token'));
+        $confirmation = $this->userConfirmationRepository->getByToken(substr($this->request->query('token'), 0, 32));
 
         if ($confirmation === null) {
             return new HtmlContent('login/activate');
@@ -405,7 +409,7 @@ class LoginController
             return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
         }
 
-        $confirmation = $this->userConfirmationRepository->getByToken($this->request->query('token'));
+        $confirmation = $this->userConfirmationRepository->getByToken(substr($this->request->query('token'), 0, 32));
 
         if ($confirmation === null) {
             return new HtmlContent('login/cancel', ['success' => false]);
@@ -445,6 +449,8 @@ class LoginController
         }
 
         if (!$user->getActive()) {
+            $this->resendConfirmationEmail($user);
+
             return new JsonContent([
                 'error' => [
                     'errorText' => 'User found with the given email address, but the account is not activated. ' .
@@ -533,6 +539,23 @@ class LoginController
         $mail->send();
     }
 
+    private function resendConfirmationEmail(User $user): bool
+    {
+        $confirmation = $this->userConfirmationRepository->getByUser($user);
+
+        if ($confirmation === null || (clone $confirmation->getLastSentDate())->add(new DateInterval('PT1H')) > new DateTime()) {
+            return false;
+        }
+
+        $confirmation->setLastSentDate(new DateTime());
+
+        $this->pdm->saveToDb($confirmation);
+
+        $this->sendConfirmationEmail($user->getEmail(), $confirmation->getToken());
+
+        return true;
+    }
+
     private function sendWelcomeEmail(string $email): void
     {
         $mail = new Mail();