Evolution #582: Implémenter le mode nopass

src/Muzich/CoreBundle/Entity/User.php

@@ -1031,6 +1031,14 @@ class User extends BaseUser
     return $this->cgu_accepted;
   }
   
+  public function setCguAccepted($accepted)
+  {
+    if ($accepted)
+      $this->cgu_accepted = true;
+    else
+      $this->cgu_accepted = false;
+  }
+  
   public function getMailNewsletter()
   {
     return $this->mail_newsletter;

src/Muzich/UserBundle/Controller/UserController.php

@@ -11,7 +11,8 @@ use Muzich\CoreBundle\Form\Tag\TagFavoritesForm;
 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 UserController extends Controller
 {
@@ -130,8 +131,58 @@ class UserController extends Controller
     ;
   }
   
-      
-  public function registerAction()
+  public function registerAction(Request $request)
+  {
+    $userManager = $this->container->get('fos_user.user_manager');
+    $user = $this->getNewUser($userManager);
+    $form = $this->createForm(new RegistrationFormType(), $user);
+    $form->bindRequest($request);
+    
+    if ($form->isValid())
+    {
+      $response = $this->getSuccessRegistrationResponse();
+      $userManager->updateUser($user);
+      $this->authenticateUser($user, $response);
+      return $response;
+    }
+    
+    return $this->getFailureRegistrationResponse($form);
+  }
+  
+  /** @return User */
+  protected function getNewUser($userManager)
+  {
+    $user = $userManager->createUser();
+    $user->setUsername($this->generateUsername());
+    $user->setPlainPassword($this->generatePassword(32));
+    $user->setEnabled(true);
+    $user->setCguAccepted(true);
+    return $user;
+  }
+  
+  protected function generateUsername()
+  {
+    $qb = $this->getEntityManager()->createQueryBuilder();
+    $qb->select('count(id)');
+    $qb->from('MuzichCoreBundle:User','id');
+    $count = $qb->getQuery()->getSingleScalarResult();
+    return 'User'.$count;
+  }
+  
+  protected function generatePassword($length = 8)
+  {
+    $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+    $count = mb_strlen($chars);
+    
+    for ($i = 0, $result = ''; $i < $length; $i++) {
+        $index = rand(0, $count - 1);
+        $result .= mb_substr($chars, $index, 1);
+    }
+    
+    return $result;
+  }
+  
+  public function registerOldAction()
   {
     $form = $this->container->get('fos_user.registration.form');
     $formHandler = $this->container->get('fos_user.registration.form.handler');
@@ -180,13 +231,13 @@ class UserController extends Controller
     ));
   }
   
-  protected function getFailureRegistrationResponse($form, $formHandler)
+  protected function getFailureRegistrationResponse($form)//, $formHandler)
   {
     $parameters = array(
       'form'                     => $form->createView(),
       'error'                    => null,
       'registration_errors'      => $form->getErrors(),
-      'registration_errors_pers' => $formHandler->getErrors(),
+      //'registration_errors_pers' => $formHandler->getErrors(),
       'last_username'            => null,
       'registration_page'        => true,
       'presubscription_form'     => $this->getPreSubscriptionForm()->createView()

src/Muzich/UserBundle/Form/Type/RegistrationFormType.php

@@ -2,34 +2,27 @@
 
 namespace Muzich\UserBundle\Form\Type;
 
+use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use FOS\UserBundle\Form\Type\RegistrationFormType as BaseType;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
-class RegistrationFormType extends BaseType
+class RegistrationFormType  extends AbstractType
 {
   public function buildForm(FormBuilderInterface $builder, array $options)
   {
-    parent::buildForm($builder, $options);
-
-    $builder->add('token', 'text', array(
-      //"property_path" => false UPGRADE 2.1
-      'mapped' => false,
-    ));
-    
-    $builder->add('cgu_accepted', 'checkbox', array(
-      'required'  => true
-    ));
-
-    $builder->add('mail_newsletter', 'checkbox', array(
-      'required'  => false
+    $builder->add('email', 'email', array(
+      'label' => 'form.email',
+      'translation_domain' => 'FOSUserBundle'
     ));
-
-    $builder->add('mail_partner', 'checkbox', array(
-      'required'  => false
-    ));
-    
   }
-
+  
+  //public function setDefaultOptions(OptionsResolverInterface $resolver)
+  //{
+  //  $resolver->setDefaults(array(
+  //    'data_class' => 'Muzich\CoreBundle\Entity\User'
+  //  ));
+  //}
+  
   public function getName()
   {
     return 'muzich_user_registration';

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

@@ -15,57 +15,11 @@
 {% endif %}
 
 <div class="field">
-  {{ form_errors(form.username) }}
-  {{ form_label(form.username, 'username'|trans({}, 'userform')) }}
-  {{ form_widget(form.username, {'attr':{'class':'niceinput'}}) }}
-</div>   
-    
-<div class="field">
   {{ form_errors(form.email) }}
   {{ form_label(form.email, 'email'|trans({}, 'userform')) }}
   {{ form_widget(form.email, {'attr':{'class':'niceinput'}}) }}
 </div> 
 
-<div class="field">
-  {{ form_errors(form.plainPassword.first) }}
-  {{ form_label(form.plainPassword.first, 'password.first'|trans({}, 'userform')) }}
-  {{ form_widget(form.plainPassword.first, {'attr':{'class':'niceinput'}}) }}
-</div> 
-
-<div class="field">
-  {{ form_errors(form.plainPassword.second) }}
-  {{ form_label(form.plainPassword.second, 'password.second'|trans({}, 'userform')) }}
-  {{ form_widget(form.plainPassword.second, {'attr':{'class':'niceinput'}}) }}
-</div> 
-
-<span class="help">{{ 'help.token'|trans({}, 'userform') }}</span>
-
-<div class="field">
-  {{ form_errors(form.token) }}
-  {{ form_label(form.token, 'token'|trans({}, 'userform')) }}
-  {{ form_widget(form.token, {'attr':{'class':'niceinput'}}) }}
-</div>
-
-<div class="field">
-  {{ form_errors(form.cgu_accepted) }}
-  {{ form_widget(form.cgu_accepted, {'attr':{}}) }}
-  {% autoescape false %}
-  {{ 'cgu_accepted'|trans({'%url%':path('info_cgu')}, 'userform') }}
-  {% endautoescape %}
-</div>
-
-<div class="field">
-  {{ form_errors(form.mail_newsletter) }}
-  {{ form_widget(form.mail_newsletter, {'attr':{}}) }}
-  {{ 'mail_newsletter'|trans({}, 'userform') }}
-</div>
-
-<div class="field">
-  {{ form_errors(form.mail_partner) }}
-  {{ form_widget(form.mail_partner, {'attr':{}}) }}
-  {{ 'mail_partner'|trans({}, 'userform') }}
-</div> 
-
 {{ form_rest(form) }}
 
 <div class="alignright">

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

@@ -0,0 +1,74 @@
+{% if registration_errors_pers is not defined %}
+  {% set registration_errors_pers = null %}
+{% endif %}
+
+{% form_theme form 'MuzichCoreBundle:Form:errors.html.twig' %}
+
+{{ form_errors(form) }}
+
+{% if registration_errors_pers|length > 0 %}
+<ul class="error_list">
+  {% for error in registration_errors_pers %}
+    <li>{{ error }}</li>
+  {% endfor %}
+</ul>
+{% endif %}
+
+<div class="field">
+  {{ form_errors(form.username) }}
+  {{ form_label(form.username, 'username'|trans({}, 'userform')) }}
+  {{ form_widget(form.username, {'attr':{'class':'niceinput'}}) }}
+</div>   
+    
+<div class="field">
+  {{ form_errors(form.email) }}
+  {{ form_label(form.email, 'email'|trans({}, 'userform')) }}
+  {{ form_widget(form.email, {'attr':{'class':'niceinput'}}) }}
+</div> 
+
+<div class="field">
+  {{ form_errors(form.plainPassword.first) }}
+  {{ form_label(form.plainPassword.first, 'password.first'|trans({}, 'userform')) }}
+  {{ form_widget(form.plainPassword.first, {'attr':{'class':'niceinput'}}) }}
+</div> 
+
+<div class="field">
+  {{ form_errors(form.plainPassword.second) }}
+  {{ form_label(form.plainPassword.second, 'password.second'|trans({}, 'userform')) }}
+  {{ form_widget(form.plainPassword.second, {'attr':{'class':'niceinput'}}) }}
+</div> 
+
+<span class="help">{{ 'help.token'|trans({}, 'userform') }}</span>
+
+<div class="field">
+  {{ form_errors(form.token) }}
+  {{ form_label(form.token, 'token'|trans({}, 'userform')) }}
+  {{ form_widget(form.token, {'attr':{'class':'niceinput'}}) }}
+</div>
+
+<div class="field">
+  {{ form_errors(form.cgu_accepted) }}
+  {{ form_widget(form.cgu_accepted, {'attr':{}}) }}
+  {% autoescape false %}
+  {{ 'cgu_accepted'|trans({'%url%':path('info_cgu')}, 'userform') }}
+  {% endautoescape %}
+</div>
+
+<div class="field">
+  {{ form_errors(form.mail_newsletter) }}
+  {{ form_widget(form.mail_newsletter, {'attr':{}}) }}
+  {{ 'mail_newsletter'|trans({}, 'userform') }}
+</div>
+
+<div class="field">
+  {{ form_errors(form.mail_partner) }}
+  {{ form_widget(form.mail_partner, {'attr':{}}) }}
+  {{ 'mail_partner'|trans({}, 'userform') }}
+</div> 
+
+{{ form_rest(form) }}
+
+<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>