Evolution #701: Nopass: Saisie du mot de passe

app/Resources/translations/userui.en.yml

@@ -51,6 +51,7 @@ my_account:
   change_password_submit: Mettre à jour mon mot de passe
   change_email:     Changer mon adresse email
   change_email_submit: Mettre à jour mon email
+  choose_password:  Choisir un mot de passe pour mon compte
   address:
     title:          Mon adresse
     description:    Avec votre adresse Muzi.ch pourra vous avertir plus aisément des événements à venirs dans votre région.

app/Resources/translations/userui.fr.yml

@@ -52,6 +52,7 @@ my_account:
   change_password_submit: Mettre à jour mon mot de passe
   change_email:     Changer mon adresse email
   change_email_submit: Mettre à jour mon email
+  choose_password:  Choisir un mot de passe pour mon compte
   address:
     title:          Mon adresse
     description:    Avec votre adresse Muzi.ch pourra vous avertir plus aisément des événements à venir dans votre région.

src/Muzich/CoreBundle/Entity/User.php

@@ -276,6 +276,12 @@ class User extends BaseUser
   protected $email_confirmation_sent_timestamp = 0;
   
   /**
+   * @ORM\Column(type="boolean", nullable=false)
+   * @var type boolean
+   */
+  private $password_set = true;
+  
+  /**
    * 
    */
   public function __construct()
@@ -1150,4 +1156,14 @@ class User extends BaseUser
     return $this->email_confirmation_sent_timestamp;
   }
   
+  public function isPasswordSet()
+  {
+    return ($this->password_set)?true:false;
+  }
+  
+  public function setPasswordSet($set)
+  {
+    $this->password_set = ($set)?true:false;
+  }
+  
 }

src/Muzich/CoreBundle/Form/User/PasswordForm.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Muzich\CoreBundle\Form\User;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class PasswordForm extends AbstractType
+{
+  public function buildForm(FormBuilderInterface $builder, array $options)
+  {
+    $builder->add('plain_password', 'repeated', array(
+      'type' => 'password',
+      'options' => array('translation_domain' => 'FOSUserBundle'),
+      'first_options' => array('label' => 'form.new_password', 'always_empty' => true),
+      'second_options' => array('label' => 'form.new_password_confirmation', 'always_empty' => true),
+      'invalid_message' => 'fos_user.password.mismatch',
+    ));
+  }
+  
+  public function getName()
+  {
+    return 'user_password';
+  }
+
+}

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

@@ -2064,4 +2064,80 @@ li.user_name a
 
 li.user_name a:hover
 {
-text-decoration: underline;
+  text-decoration: underline;
+}
+
+@-webkit-keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+@-moz-keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+@-ms-keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+@-o-keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+@keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+
+.flashing
+{
+  font-weight: bold;
+  text-shadow: 0 1px 0 white;
+  border-radius: 3px;
+  padding: 5px 10px;
+  box-shadow:0px 0px 10px #909090;
+  
+  -webkit-animation-name: clignote;
+  -webkit-animation-duration: 1s;
+  -webkit-animation-iteration-count:infinite;
+  
+  -moz-animation-name: clignote;
+  -moz-animation-duration: 1s;
+  -moz-animation-iteration-count:infinite;
+  
+  -ms-animation-name: clignote;
+  -ms-animation-duration: 1s;
+  -ms-animation-iteration-count:infinite;
+  
+  -o-animation-name: clignote;
+  -o-animation-duration: 1s;
+  -o-animation-iteration-count:infinite;
+  
+  animation-name: clignote;
+  animation-duration: 1s;
+  animation-iteration-count:infinite;
+}
+
+div.myaccount_part.flashing
+{
+  padding: 2px;
+}
+
+div.choose_password
+{
+  text-align: center;
+}

src/Muzich/CoreBundle/Resources/views/Layout/side.html.twig

@@ -1,9 +1,19 @@
 {% if app.user %}
+  
   <div id="user_statusbox" class="nicebox">
     {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
       {% render "MuzichUserBundle:Event:infoBar" %}
     {% endif %}
   </div>
+
+  {% if not app.user.PasswordSet and not app.request.get('open') == 'change_password' %}
+    <div class="nicebox choose_password flashing">
+      <a href="{{ path('my_account', {'open':'change_password'}) }}">
+        {{ 'my_account.choose_password'|trans({}, 'userui') }}
+      </a>
+    </div>
+  {% endif %}
+
 {% else %}
   <div class="side_margin_top"></div>
 {% endif %}

src/Muzich/UserBundle/Controller/UserController.php

@@ -13,6 +13,7 @@ use Symfony\Component\Validator\Constraints\Collection;
 use Symfony\Component\HttpFoundation\Request;
 use Muzich\UserBundle\Form\Type\RegistrationFormType;
 use Muzich\CoreBundle\Entity\User;
+use Muzich\CoreBundle\Form\User\PasswordForm;
 
 class UserController extends Controller
 {
@@ -107,7 +108,7 @@ class UserController extends Controller
   public function accountAction()
   {
     $user = $this->getUser();
-    $form_password = $this->container->get('fos_user.change_password.form');
+    $form_password = $this->getChangePasswordForm();
     $form_tags_favorites = $this->getTagsFavoritesForm($user);
     $change_email_form = $this->getChangeEmailForm();
     
@@ -123,6 +124,11 @@ class UserController extends Controller
     );
   }
   
+  protected function getChangePasswordForm()
+  {
+    return $this->createForm(new PasswordForm(), $this->getUser());
+  }
+  
   protected function getAvatarForm()
   {
     return $this->createFormBuilder($this->getUser())
@@ -166,6 +172,7 @@ class UserController extends Controller
     $user->setEnabled(true);
     $user->setCguAccepted(true);
     $user->setUsernameUpdatable(true);
+    $user->setPasswordSet(false);
     return $user;
   }
   
@@ -280,7 +287,7 @@ class UserController extends Controller
     return $errors;
   }
     
-  public function changePasswordAction()
+  public function changePasswordAction(Request $request)
   {
     $user = $this->getUser();
     
@@ -296,40 +303,37 @@ class UserController extends Controller
       )->getSingleResult();
     }
     
-    if (!is_object($user) || !$user instanceof UserInterface) {
-        throw new AccessDeniedException('This user does not have access to this section.');
-    }
-
-    $form = $this->container->get('fos_user.change_password.form');
-    $formHandler = $this->container->get('fos_user.change_password.form.handler');
+    $form = $this->getChangePasswordForm();
+    $form->bind($request);
     
-    $process = $formHandler->process($user);
-    if (count(($errors = $this->checkChangePasswordInformations($form))) < 1 && $process)
+    if ($form->isValid())
     {
+      $userManager = $this->container->get('fos_user.user_manager');
+      $userManager->updateUser($form->getData());
+      $form->getData()->setPasswordSet(true);
+      $this->persist($form->getData());
+      $this->flush();
       $this->container->get('session')->setFlash('fos_user_success', 'change_password.flash.success');
-      return new RedirectResponse($this->generateUrl('my_account'));
-    }
-    else
-    {
-      $form_tags_favorites = $this->getTagsFavoritesForm($user);
-      $change_email_form = $this->getChangeEmailForm();
-      
-      return $this->container->get('templating')->renderResponse(
-        'MuzichUserBundle:User:account.html.twig',
-        array(
-          'form_password'            => $form->createView(),
-          'errors_pers'              => $errors,
-          'user'                     => $user,
-          'form_tags_favorites'      => $form_tags_favorites->createView(),
-          'form_tags_favorites_name' => $form_tags_favorites->getName(),
-          'favorite_tags_id'         => $this->getTagsFavorites(),
-          'change_email_form'        => $change_email_form->createView(),
-          'avatar_form'              => $this->getAvatarForm()->createView()
-        )
-      );
+      return new RedirectResponse($this->generateUrl('home'));
     }
-
     
+    $form_tags_favorites = $this->getTagsFavoritesForm($user);
+    $change_email_form = $this->getChangeEmailForm();
+
+    return $this->container->get('templating')->renderResponse(
+      'MuzichUserBundle:User:account.html.twig',
+      array(
+        'form_password'            => $form->createView(),
+        'errors_pers'              => array(),
+        'user'                     => $user,
+        'form_tags_favorites'      => $form_tags_favorites->createView(),
+        'form_tags_favorites_name' => $form_tags_favorites->getName(),
+        'favorite_tags_id'         => $this->getTagsFavorites(),
+        'change_email_form'        => $change_email_form->createView(),
+        'avatar_form'              => $this->getAvatarForm()->createView(),
+        'preferences_form'         => $this->getPreferencesForm()->createView()
+      )
+    );
   }
   
   /**
@@ -500,7 +504,7 @@ class UserController extends Controller
     }
     
     // En cas d'échec
-    $form_password = $this->container->get('fos_user.change_password.form');
+    $form_password = $this->getChangePasswordForm();
     $form_tags_favorites = $this->getTagsFavoritesForm($user);
     
     return $this->container->get('templating')->renderResponse(

src/Muzich/UserBundle/Resources/views/Security/change_password_form.html.twig

@@ -11,21 +11,15 @@
 {% endif %}
     
   <div class="field">
-    {{ form_errors(form.current_password) }}
-    {{ form_label(form.current_password, 'password.actual'|trans({}, 'userform')) }}
-    {{ form_widget(form.current_password, {'attr':{'class':'niceinput'}}) }}
+    {{ form_errors(form.plain_password.first) }}
+    {{ form_label(form.plain_password.first, 'password.new.first'|trans({}, 'userform')) }}
+    {{ form_widget(form.plain_password.first, {'attr':{'class':'niceinput'}}) }}
   </div>
 
   <div class="field">
-    {{ form_errors(form.new.first) }}
-    {{ form_label(form.new.first, 'password.new.first'|trans({}, 'userform')) }}
-    {{ form_widget(form.new.first, {'attr':{'class':'niceinput'}}) }}
-  </div>
-
-  <div class="field">
-    {{ form_errors(form.new.second) }}
-    {{ form_label(form.new.second, 'password.new.second'|trans({}, 'userform')) }}
-    {{ form_widget(form.new.second, {'attr':{'class':'niceinput'}}) }}
+    {{ form_errors(form.plain_password.second) }}
+    {{ form_label(form.plain_password.second, 'password.new.second'|trans({}, 'userform')) }}
+    {{ form_widget(form.plain_password.second, {'attr':{'class':'niceinput'}}) }}
   </div>
 
 {{ form_rest(form) }}

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

@@ -56,12 +56,12 @@
 
     <h2 data-open="myaccount_favorites_password">{{ 'my_account.change_password'|trans({}, 'userui') }}</h2>
 
-    <div id="myaccount_favorites_password" class="myaccount_part" 
-      {% if not form_password|form_has_errors %}
+    <div id="myaccount_favorites_password" class="myaccount_part {% if app.request.get('open') == 'change_password' %}flashing{% endif %}" 
+      {% if not form_password|form_has_errors and not app.request.get('open') == 'change_password' %}
        style="display: none;"
       {% endif %}
      >
-      <form class="nicelabels changepassword" action="{{ path('change_password') }}" method="post" {{ form_enctype(form_password) }}>
+      <form class="nicelabels changepassword" action="{{ path('change_password', {'open':'change_password'}) }}" method="post" {{ form_enctype(form_password) }}>
 
         {% include "MuzichUserBundle:Security:change_password_form.html.twig" with { 
           'form': form_password