Evolution #569: token réutilisable avec compteur

app/Resources/translations/flash.fr.yml

@@ -5,7 +5,7 @@ group.flash.created: Le groupe a été créé.
 group.flash.deleted: Le groupe a été supprimé.
 profile.flash.updated: Le profil a été mis à jour.
 change_password.flash.success: Le mot de passe a été modifié.
-registration.flash.user_created: Un email a été envoyé a l'adresse email saisie.
+registration.flash.user_created: Compté créé avec succés !
 resetting.flash.success: Le mot de passe a été réinitialisé avec succès.
 
 # muzich

app/Resources/translations/validators.fr.yml

@@ -39,4 +39,4 @@ error:
       
 registration:
   token:
-    error:               Le code saisie pour l'inscription n'est pas correct
+    error:               Le code saisie pour l'inscription est incorrect ou n'est plus utilisable

src/Muzich/AdminBundle/Admin/RegistrationTokenAdmin.php

@@ -16,6 +16,8 @@ class RegistrationTokenAdmin extends Admin
       ->addIdentifier('id')
       ->addIdentifier('token')
       ->add('used')
+      ->add('count')
+      ->add('count_max')
       ->add('_action', 'actions', array(
         'actions' => array(
           'view' => array(),
@@ -37,6 +39,8 @@ class RegistrationTokenAdmin extends Admin
   {
     $formMapper
       ->add('token')
+      ->add('count')
+      ->add('count_max')
       ->add('used')
     ;
   }

src/Muzich/CoreBundle/Entity/RegistrationToken.php

@@ -38,9 +38,21 @@ class RegistrationToken
   /**
    * Si ce boolean est a vrai il n'est plus utilisable
    * @ORM\Column(type="boolean", nullable=true)
-   * @var type boolean
+   * @var boolean
    */
   protected $used = false;
+  
+  /**
+   * @ORM\Column(type="integer", nullable=true)
+   * @var int
+   */
+  protected $count = 0;
+  
+  /**
+   * @ORM\Column(type="integer", nullable=true)
+   * @var int
+   */
+  protected $count_max = 1;
     
   public function __toString()
   {
@@ -96,5 +108,38 @@ class RegistrationToken
   {
     return $this->used;
   }
+  
+  public function getCount()
+  {
+    if (!$this->count)
+    {
+      return 0;
+    }
+    return $this->count;
+  }
+  
+  public function setCount($count)
+  {
+    $this->count = $count;
+  }
+  
+  public function addUseCount()
+  {
+    $this->setCount($this->getCount()+1);
+    if ($this->getCount() >= $this->count_max)
+    {
+      $this->setUsed(true);
+    }
+  }
+  
+  public function getCountMax()
+  {
+    return $this->count_max;
+  }
+  
+  public function setCountMax($count_max)
+  {
+    $this->count_max = $count_max;
+  }
 
 }

src/Muzich/CoreBundle/Tests/Controller/RegistrationTokenTest.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace Muzich\CoreBundle\Tests\Controller;
+
+use Muzich\CoreBundle\lib\FunctionalTest;
+use Muzich\CoreBundle\Entity\RegistrationToken;
+
+class UserControllerTest extends FunctionalTest
+{
+  
+  public function testRegistrationToken()
+  {
+    $this->client = self::createClient();
+    $token = new RegistrationToken();
+    $token_name = 'token_test_3_max_'.time();
+    $token->setToken($token_name);
+    $token->setCountMax(3);
+    $em = $this->getDoctrine()->getEntityManager();
+    $em->persist($token);
+    $em->flush();
+    
+    $this->procedure_registration_success(
+      'user1', 
+      'user1@mail.com', 
+      'toor', 
+      'toor',
+      $token_name
+    );
+    
+    $this->disconnectUser();
+    
+    $this->procedure_registration_success(
+      'user2', 
+      'user2@mail.com', 
+      'toor', 
+      'toor',
+      $token_name
+    );
+    
+    $this->disconnectUser();
+    
+    $this->procedure_registration_success(
+      'user3', 
+      'user3@mail.com', 
+      'toor', 
+      'toor',
+      $token_name
+    );
+    
+    $this->disconnectUser();
+    
+    $this->procedure_registration_failure(
+      'user4', 
+      'user4@mail.com', 
+      'toor', 
+      'toor',
+      $token_name
+    );
+        
+    $this->procedure_registration_failure(
+      'user5', 
+      'user5@mail.com', 
+      'toor', 
+      'toor',
+      $token_name
+    );
+        
+    $this->procedure_registration_failure(
+      'user6', 
+      'user6@mail.com', 
+      'toor', 
+      'toor',
+      ''
+    );
+  }
+  
+}

src/Muzich/CoreBundle/lib/FunctionalTest.php

@@ -145,8 +145,6 @@ class FunctionalTest extends WebTestCase
       $token
     );
     
-    
-    
     $this->isResponseRedirection();
     $this->followRedirection();
     $this->isResponseSuccess();

src/Muzich/UserBundle/Controller/UserController.php

@@ -161,54 +161,52 @@ class UserController extends Controller
     $form = $this->container->get('fos_user.registration.form');
     $formHandler = $this->container->get('fos_user.registration.form.handler');
     $confirmationEnabled = $this->container->getParameter('fos_user.registration.confirmation.enabled');
+    $errors = array();
+    
+    // On contrôle le token en premier lieu
+    $form_values = $this->getRequest()->request->get($form->getName());
+    $r_token = $this->getDoctrine()->getRepository('MuzichCoreBundle:RegistrationToken')
+      ->findOneBy(array('token' => $form_values["token"], 'used' => false))
+    ;
     
-    // Pour palier bug, verif interne
-    if (count(($errors = $this->checkRegistrationInformations($form))) < 1)
+    if ($r_token)
     {
-      $process = $formHandler->process($confirmationEnabled);
-      if ($process) {
-        $user = $form->getData();
-
-        if ($confirmationEnabled) {
-          $this->container->get('session')->set('fos_user_send_confirmation_email/email', $user->getEmail());
-          $route = 'fos_user_registration_check_email';
-        } else {
-          $this->authenticateUser($user);
-          $route = 'start';
-        }
-
-        $this->setFlash('fos_user_success', 'registration.flash.user_created');
-        $url = $this->generateUrl($route);
-
-        
-        /**
-         * Contrôle du token
-         */
-        $form_values = $this->getRequest()->request->get($form->getName());
-        $r_token = $this->getDoctrine()->getRepository('MuzichCoreBundle:RegistrationToken')
-          ->findOneBy(array('token' => $form_values["token"], 'used' => false))
-        ;
+      if (count(($errors = $this->checkRegistrationInformations($form))) < 1)
+      {
+        $process = $formHandler->process($confirmationEnabled);
+        if ($process) {
+          $user = $form->getData();
+  
+          if ($confirmationEnabled) {
+            $this->container->get('session')->set('fos_user_send_confirmation_email/email', $user->getEmail());
+            $route = 'fos_user_registration_check_email';
+          } else {
+            $this->authenticateUser($user);
+            $route = 'start';
+          }
           
-        if (!$r_token)
-        {
-          $errors[] = $this->get('translator')->trans(
-            'registration.token.error', 
-            array(),
-            'validators'
-          );
-        }
-        else
-        {
-          $r_token->setUsed(true);
+          $this->setFlash('fos_user_success', 'registration.flash.user_created');
+          $url = $this->generateUrl($route);
+          
+          $r_token->addUseCount();
           $em = $this->getDoctrine()->getEntityManager();
           $em->persist($r_token);
           $em->flush();
+          
+          return new RedirectResponse($url);
         }
-        
-        return new RedirectResponse($url);
       }
     }
-
+    else
+    {
+      $form->bindRequest($this->getRequest());
+      $errors[] = $this->get('translator')->trans(
+        'registration.token.error', 
+        array(),
+        'validators'
+      );
+    }
+    
     return $this->container->get('templating')->renderResponse(
       'MuzichIndexBundle:Index:index.html.twig',
       array(