From 7d3b81b35aab48e1cca2ac55bf37dfe803940a1d Mon Sep 17 00:00:00 2001
From: Alexey Skobkin <skobkin-ru@ya.ru>
Date: Sat, 30 Jun 2018 03:02:05 +0300
Subject: [PATCH] #4 InvalidInviteException handling removed from
 UserController due to new validator implemented.

---
 src/Controller/UserController.php             | 32 ++++++-------------
 src/User/Exception/InvalidInviteException.php |  2 +-
 templates/User/register.html.twig             |  6 ++--
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 96b52ec..7f3f974 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -5,12 +5,11 @@ namespace App\Controller;
 use App\Form\{CreateUserRequestType};
 use App\FormRequest\CreateUserRequest;
 use App\Repository\InviteRepository;
-use App\User\Exception\InvalidInviteException;
 use App\User\{InviteManager, UserManager};
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Form\{FormError, FormInterface};
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\{Request, Response};
 
 class UserController extends Controller
@@ -26,30 +25,19 @@ class UserController extends Controller
         $createUserRequest = new CreateUserRequest($inviteCode);
         $form = $this->createRegisterForm($createUserRequest, $inviteCode);
 
-        $inviteInvalid = false;
-
-        if (null === $invite = $inviteRepo->findOneBy(['code' => $inviteCode, 'usedBy' => null])) {
-            $inviteInvalid = true;
-        }
+        $invite = $inviteRepo->findOneBy(['code' => $inviteCode, 'usedBy' => null]);
 
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            try {
-                $user = $userManager->createUserByInvite(
-                    $createUserRequest->username,
-                    $createUserRequest->password,
-                    $createUserRequest->email,
-                    $invite
-                );
+            $user = $userManager->createUserByInvite(
+                $createUserRequest->username,
+                $createUserRequest->password,
+                $createUserRequest->email,
+                $invite
+            );
 
-                $inviteManager->createInvitesForUser($user);
-            } catch (InvalidInviteException $ex) {
-                // @FIXME refactor InvalidInviteException to proper validator
-                $form->get('inviteCode')->addError(new FormError('Invalid invite code'));
-
-                return $this->render('User/register.html.twig', ['form' => $form->createView()]);
-            }
+            $inviteManager->createInvitesForUser($user);
 
             $em->flush();
 
@@ -58,7 +46,7 @@ class UserController extends Controller
 
         return $this->render('User/register.html.twig', [
             'form' => $form->createView(),
-            'inviteInvalid' => $inviteInvalid,
+            'inviteValid' => $invite ? true : null,
         ]);
     }
 
diff --git a/src/User/Exception/InvalidInviteException.php b/src/User/Exception/InvalidInviteException.php
index be497ae..827015a 100644
--- a/src/User/Exception/InvalidInviteException.php
+++ b/src/User/Exception/InvalidInviteException.php
@@ -2,7 +2,7 @@
 
 namespace App\User\Exception;
 
-class InvalidInviteException extends \Exception
+class InvalidInviteException extends \InvalidArgumentException
 {
     protected $message = 'Invalid invite';
 }
\ No newline at end of file
diff --git a/templates/User/register.html.twig b/templates/User/register.html.twig
index 600b184..472ee49 100644
--- a/templates/User/register.html.twig
+++ b/templates/User/register.html.twig
@@ -1,11 +1,11 @@
 {% extends 'base.html.twig' %}
 
 {% block content %}
-    {% if inviteInvalid %}
-    <h1>Invalid invite</h1>
-    {% else %}
+    {% if inviteValid %}
     <div id="form-register">
         {{ form(form) }}
     </div>
+    {% else %}
+    <h1>Invalid invite</h1>
     {% endif %}
 {% endblock %}
\ No newline at end of file