Evolution #582: Implémenter le mode nopass

app/Resources/translations/userform.en.yml

@@ -1,4 +1,6 @@
 
 password.actual: Actual
 password.new.first: New
-password.new.second: New (check)
+password.new.second: New (check)
+
+accept_cgu_registration: By processing registration you accept <a href="%link%">terms of service</a> of muzi.ch

app/Resources/translations/userform.fr.yml

@@ -16,4 +16,6 @@ cgu_accepted:     J'ai lu et j'accepete les <a href="%url%">condition générale
 help:
   token:   |
             Rentrez ici le code qui vous à été fourni afin de vous inscrire 
-            à la version non publique.
+            à la version non publique.
+
+accept_cgu_registration: En procédant à l'inscription vous acceptez les <a href="%link%">conditions générales d'utilisation</a> de muzi.ch

src/Muzich/CoreBundle/Resources/public/css/main.css

@@ -2050,4 +2050,9 @@ div.helpbox_image_container img
 div.side_margin_top
 {
   margin-top: 25px;
+}
+
+p.accept_cgu
+{
+  font-size: 11px;
 }

src/Muzich/IndexBundle/Controller/IndexController.php

@@ -8,6 +8,8 @@ use Symfony\Component\Security\Core\SecurityContext;
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\Collection;
 use Symfony\Component\HttpFoundation\Request;
+use Muzich\UserBundle\Form\Type\RegistrationFormType;
+use Muzich\CoreBundle\Entity\User;
 
 class IndexController extends Controller
 {
@@ -25,7 +27,7 @@ class IndexController extends Controller
     }
     
     $vars = $this->proceedLogin();
-    $form = $this->container->get('fos_user.registration.form');
+    $form = $this->getRegistrationForm();
     
     return $this->render('MuzichIndexBundle:Index:index.html.twig', array_merge($vars, array(
       'form' => $form->createView(),
@@ -33,6 +35,11 @@ class IndexController extends Controller
     )));
   }
   
+  protected function getRegistrationForm()
+  {
+    return $this->createForm(new RegistrationFormType(), new User());
+  }
+  
   /**
    * Gestion du formulaire d'identification sur la page d'index.
    * 
@@ -104,7 +111,7 @@ class IndexController extends Controller
     
     $this->setFlash('error', 'presubscription.error');
     return $this->render('MuzichIndexBundle:Index:index.html.twig', array(
-      'form' => $this->container->get('fos_user.registration.form')->createView(),
+      'form' => $this->getRegistrationForm()->createView(),
       'presubscription_form' => $form->createView(),
       'last_username' => '',
       'error'         => '',

src/Muzich/UserBundle/Controller/UserController.php

@@ -135,7 +135,7 @@ class UserController extends Controller
   {
     $userManager = $this->container->get('fos_user.user_manager');
     $user = $this->getNewUser($userManager);
-    $form = $this->createForm(new RegistrationFormType(), $user);
+    $form = $this->getRegistrationForm($user);
     $form->bindRequest($request);
     
     if ($form->isValid())
@@ -149,9 +149,15 @@ class UserController extends Controller
     return $this->getFailureRegistrationResponse($form);
   }
   
+  protected function getRegistrationForm(User $user)
+  {
+    return $this->createForm(new RegistrationFormType(), $user);
+  }
+  
   /** @return User */
-  protected function getNewUser($userManager)
+  protected function getNewUser()
   {
+    $userManager = $this->container->get('fos_user.user_manager');
     $user = $userManager->createUser();
     $user->setUsername($this->generateUsername());
     $user->setPlainPassword($this->generatePassword(32));
@@ -182,42 +188,6 @@ class UserController extends Controller
     return $result;
   }
   
-  public function registerOldAction()
-  {
-    $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');
-    
-    $process = $formHandler->process($confirmationEnabled);
-    if ($process)
-    {
-      $user = $form->getData();
-      
-      $authUser = false;
-      if ($confirmationEnabled) {
-          $this->container->get('session')->set('fos_user_send_confirmation_email/email', $user->getEmail());
-          $route = 'fos_user_registration_check_email';
-      } else {
-          $authUser = true;
-          $route = 'start';
-      }
-      
-      $response = $this->getSuccessRegistrationResponse();
-      if ($authUser) {
-        $this->authenticateUser($user, $response);
-      }
-      
-      $formHandler->getToken()->addUseCount();
-      $em = $this->getDoctrine()->getEntityManager();
-      $em->persist($formHandler->getToken());
-      $em->flush();
-      
-      return $response;
-    }
-    
-    return $this->getFailureRegistrationResponse($form, $formHandler);
-  }
-  
   protected function getSuccessRegistrationResponse()
   {
     if (!$this->getRequest()->isXmlHttpRequest())
@@ -692,7 +662,7 @@ class UserController extends Controller
     return $this->jsonResponse(array(
       'status' => 'success',
       'data'   => $this->render('MuzichUserBundle:Account:subscribe_or_login.html.twig', array(
-        'form' => $this->container->get('fos_user.registration.form')->createView()
+        'form' => $this->getRegistrationForm($this->getNewUser())->createView()
       ))->getContent()
     ));
   }

src/Muzich/UserBundle/Resources/views/Registration/register_form_content.html.twig

@@ -20,9 +20,17 @@
   {{ form_widget(form.email, {'attr':{'class':'niceinput'}}) }}
 </div> 
 
-{{ form_rest(form) }}
+{{ form_widget(form._token) }}
 
 <div class="alignright">
   <img class="loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
   <input type="submit" class="button" value="{{ 'registration.submit'|trans({}, 'userui') }}" />
 </div>
+
+<p class="accept_cgu">
+  {% autoescape false %}
+    {{ 'accept_cgu_registration'|trans({
+      '%link%' : path('info_cgu')
+    }, 'userform' )}}
+  {% endautoescape %}
+</p>