Mise a plat du code d'inscription. Debut d'écriture de la page d'arrivée après inscriptionb.

src/Muzich/CoreBundle/Entity/User.php

@@ -13,6 +13,7 @@ use Gedmo\Mapping\Annotation as Gedmo;
  * @ORM\Entity
  * @ORM\Table(name="m_user")
  * @ORM\Entity(repositoryClass="Muzich\CoreBundle\Repository\UserRepository")
+ * @ORM\HasLifecycleCallbacks()
  */
 class User extends BaseUser
 {
@@ -272,6 +273,17 @@ class User extends BaseUser
     return $this->getUsername();
   }
   
+//  /**
+//  * @ORM\prePersist
+//  */
+//  public function setSlug()
+//  {
+//    if (!$this->slug)
+//    {
+//      
+//    }
+//  }
+//  
   /**
    * Retourn si l'user_id transmis fait partis des enregistrements
    * followed de l'objet.

src/Muzich/CoreBundle/lib/Controller.php

@@ -4,11 +4,22 @@ namespace Muzich\CoreBundle\lib;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller as BaseController;
 use Muzich\CoreBundle\Searcher\ElementSearcher;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 
 class Controller extends BaseController
 {
   
-  //private $ElementSearcher = null;
+  /**
+   * Authenticate a user with Symfony Security
+   *
+   */
+  protected function authenticateUser($user)
+  {
+    $providerKey = $this->container->getParameter('fos_user.firewall_name');
+    $token = new UsernamePasswordToken($user, null, $providerKey, $user->getRoles());
+
+    $this->container->get('security.context')->setToken($token);
+  }
     
   /**
    * Met a jour l'objet ElementSearcher (en réallité on met a jour les
@@ -89,4 +100,9 @@ class Controller extends BaseController
     return $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')->getTagsArray();
   }
   
+  protected function setFlash($type, $value)
+  {
+    $this->container->get('session')->setFlash($type, $value);
+  }
+  
 }

src/Muzich/IndexBundle/Controller/IndexController.php

@@ -3,17 +3,16 @@
 namespace Muzich\IndexBundle\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use FOS\UserBundle\Controller\SecurityController as BaseController;
+use Muzich\CoreBundle\lib\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\Security\Core\SecurityContext;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 
 use Muzich\CoreBundle\Entity\Tag;
 use Muzich\CoreBundle\Entity\UsersTagsFavorites;
 use Muzich\CoreBundle\Entity\User;
 
-class IndexController extends BaseController
+class IndexController extends Controller
 {
   
   /**
@@ -23,8 +22,12 @@ class IndexController extends BaseController
   public function indexAction()
   {
     $vars = $this->proceedLogin();
-    $vars = array_merge($vars, $this->proceedRegister());
-    return $vars;
+    
+    $form = $this->container->get('fos_user.registration.form');
+    
+    return array_merge($vars, array(
+      'form' => $form->createView()
+    ));
   }
   
   /**
@@ -67,34 +70,9 @@ class IndexController extends BaseController
    * 
    * @return type array
    */
-  protected function proceedRegister()
+  public function proceedRegister()
   {
-    $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();
-
-        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 = 'fos_user_registration_confirmed';
-        }
-
-        $this->setFlash('fos_user_success', 'registration.flash.user_created');
-        $url = $this->container->get('router')->generate($route);
-
-        return new RedirectResponse($url);
-    }
-
-    return array(
-        'form' => $form->createView(),
-        'theme' => $this->container->getParameter('fos_user.template.theme'),
-    );
+    
   }
   
 }

src/Muzich/UserBundle/Controller/UserController.php

@@ -24,6 +24,40 @@ class UserController extends Controller
         'form_password' => $form_password->createView()
       );
   }
+  
+  public function registerAction()
+  {
+    $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();
+
+      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 = 'register_finish';
+      }
+
+      $this->setFlash('success', 'Votre compte a bien été créé');
+      $url = $this->generateUrl($route);
+
+      return new RedirectResponse($url);
+    }
+
+    return $this->container->get('templating')->renderResponse(
+      'MuzichIndexBundle:Index:index.html.twig',
+      array(
+        'form' => $form->createView(),
+        'error' => null,
+        'last_username' => null
+      )
+    );
+  }
     
   public function changePasswordAction()
   {
@@ -54,5 +88,15 @@ class UserController extends Controller
 
     
   }
+  
+  /**
+   * 
+   * @Template()
+   */
+  public function registerFinishAction()
+  {
+    
+    return array();
+  }
     
 }

src/Muzich/UserBundle/Entity/UserManager.php

@@ -0,0 +1,189 @@
+<?php
+
+/*
+ * 
+ */
+
+namespace Muzich\UserBundle\Entity;
+
+use Doctrine\ORM\EntityManager;
+use FOS\UserBundle\Model\UserInterface;
+use FOS\UserBundle\Model\UserManager as BaseUserManager;
+use FOS\UserBundle\Util\CanonicalizerInterface;
+use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
+use Symfony\Component\Validator\Constraint;
+
+class UserManager extends BaseUserManager
+{
+    protected $em;
+    protected $class;
+    protected $repository;
+
+    /**
+     * Constructor.
+     *
+     * @param EncoderFactoryInterface $encoderFactory
+     * @param string                  $algorithm
+     * @param CanonicalizerInterface  $usernameCanonicalizer
+     * @param CanonicalizerInterface  $emailCanonicalizer
+     * @param EntityManager           $em
+     * @param string                  $class
+     */
+    public function __construct(EncoderFactoryInterface $encoderFactory, $algorithm, CanonicalizerInterface $usernameCanonicalizer, CanonicalizerInterface $emailCanonicalizer, EntityManager $em, $class)
+    {
+        parent::__construct($encoderFactory, $algorithm, $usernameCanonicalizer, $emailCanonicalizer);
+        
+        $this->em = $em;
+        $this->repository = $em->getRepository($class);
+
+        $metadata = $em->getClassMetadata($class);
+        $this->class = $metadata->name;
+
+        // Slug stuff
+        $evm = new \Doctrine\Common\EventManager();
+        // ORM and ODM
+        $sluggableListener = new \Gedmo\Sluggable\SluggableListener();
+        $evm->addEventSubscriber($sluggableListener);
+        // now this event manager should be passed to entity manager constructor
+        $this->em->getEventManager()->addEventSubscriber($sluggableListener);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function deleteUser(UserInterface $user)
+    {
+        $this->em->remove($user);
+        $this->em->flush();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getClass()
+    {
+        return $this->class;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function findUserBy(array $criteria)
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function findUsers()
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function reloadUser(UserInterface $user)
+    {
+        $this->em->refresh($user);
+    }
+
+    /**
+     * Updates a user.
+     *
+     * @param UserInterface $user
+     * @param Boolean $andFlush Whether to flush the changes (default true)
+     */
+    public function updateUser(UserInterface $user, $andFlush = true)
+    {
+        $this->updateCanonicalFields($user);
+        $this->updatePassword($user);
+
+        $this->em->persist($user);
+        if ($andFlush) {
+            $this->em->flush();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function validateUnique(UserInterface $value, Constraint $constraint)
+    {
+        // Since we probably want to validate the canonical fields,
+        // we'd better make sure we have them.
+        $this->updateCanonicalFields($value);
+
+        $fields = array_map('trim', explode(',', $constraint->property));
+        $users = $this->findConflictualUsers($value, $fields);
+
+        // there is no conflictual user
+        if (empty($users)) {
+            return true;
+        }
+
+        // there is no conflictual user which is not the same as the value
+        if ($this->anyIsUser($value, $users)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Indicates whether the given user and all compared objects correspond to the same record.
+     *
+     * @param UserInterface $user
+     * @param array $comparisons
+     * @return Boolean
+     */
+    protected function anyIsUser($user, array $comparisons)
+    {
+        foreach ($comparisons as $comparison) {
+            if (!$user->isUser($comparison)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Gets conflictual users for the given user and constraint.
+     *
+     * @param UserInterface $value
+     * @param array $fields
+     * @return array
+     */
+    protected function findConflictualUsers($value, array $fields)
+    {
+        return $this->repository->findBy($this->getCriteria($value, $fields));
+    }
+
+    /**
+     * Gets the criteria used to find conflictual entities.
+     *
+     * @param UserInterface $value
+     * @param array $constraint
+     * @return array
+     */
+    protected function getCriteria($value, array $fields)
+    {
+        $classMetadata = $this->em->getClassMetadata($this->class);
+
+        $criteria = array();
+        foreach ($fields as $field) {
+            if (!$classMetadata->hasField($field)) {
+                throw new \InvalidArgumentException(sprintf('The "%s" class metadata does not have any "%s" field or association mapping.', $this->class, $field));
+            }
+
+            $criteria[$field] = $classMetadata->getFieldValue($value, $field);
+        }
+
+        return $criteria;
+    }
+}
+
+
+?>

src/Muzich/UserBundle/Resources/config/routing.yml

@@ -7,4 +7,12 @@ my_account:
 change_password:
   pattern: /account/change-password
   defaults: { _controller: MuzichUserBundle:User:changePassword }
+  
+register:
+  pattern: /register/do
+  defaults: { _controller: MuzichUserBundle:User:register }
+  
+register_finish:
+  pattern: /register/finish
+  defaults: { _controller: MuzichUserBundle:User:registerFinish }
   

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

@@ -1,9 +1,23 @@
 <div class="register">
-  <form action="{{ path('fos_user_registration_register') }}" {{ form_enctype(form) }} 
+  <form action="{{ path('register') }}" {{ form_enctype(form) }} 
     method="POST" 
     class="fos_user_registration_register"
   >
+    
     {{ form_widget(form) }}
+    
+    {{ form_errors(form) }}
+
+    {{ form_row(form.username) }}
+    
+    {{ form_row(form.email) }}
+    
+    {{ form_row(form.plainPassword.first) }}
+    
+    {{ form_row(form.plainPassword.second) }}
+
+    {{ form_rest(form) }}
+    
     <div>
         <input type="submit" value="{{ 'registration.submit'|trans({}, 'FOSUserBundle') }}" />
     </div>

src/Muzich/UserBundle/Resources/views/User/registerFinish.html.twig

@@ -0,0 +1,9 @@
+{% extends "MuzichUserBundle::layout.html.twig" %}
+
+{% block title %}Inscription terminé{% endblock %}
+
+{% block content %}
+
+  <h2>Inscription terminé !</h2>
+      
+{% endblock %}

web/bundles/muzichcore/js/muzich.js

@@ -24,6 +24,7 @@ $(document).ready(function(){
   // When message is clicked, hide it
   $('.message a.message-close').click(function(){			  
     $(this).parent('.message').animate({top: -$(this).outerHeight()-50}, 700);
+    return false;
   });		 
 		 
 });