Evolution #743: Suppression de son compte

app/Resources/translations/flash.fr.yml

@@ -40,6 +40,9 @@ user:
     sent_recently: Un email de confirmation a déjà été envoyé récemment (pensez à vérifier votre boite SPAM)
     confirmed:     Votre email est maintenant confirmé
     failtoken:     La demande de confirmation est trop ancienne, veuillez en demander une nouvelle
+  delete:
+    fail:           Le mot de passe saisi est incorrect
+    success:        Le compte a bien été supprimé
 
 presubscription:
   success:         Un email a été envoyé a votre adresse email pour confirmation (vérifiez aussi dans vos SPAM)

app/Resources/translations/userui.fr.yml

@@ -98,6 +98,10 @@ my_account:
       playlists:    Les autres utilisateurs peuvent voir mes listes de lecture
     success:        Vos paramètres de vie privée ont bien été mises à jour
     error:          Une erreur est survenue lors de la mise à jour de vos paramètres de vie privée
+  delete:
+    title:          Supprimer mon compte
+    text:           Attention: Il vous sera impossible d'annuler cette action après avoir confirmé la suppression de votre compte !
+    submit:         Je confirme vouloir supprimer définitivement ce compte
 
 change_username:
   submit:           Changer

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

@@ -0,0 +1,26 @@
+<?php
+
+namespace Muzich\CoreBundle\Form\User;
+
+use Symfony\Component\Security\Core\Validator\Constraint\UserPassword;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\Form\AbstractType;
+
+class DeleteForm extends AbstractType
+{
+  public function buildForm(FormBuilderInterface $builder, array $options)
+  {
+    $builder->add('current_password', 'password', array(
+      'label' => 'form.current_password',
+      'translation_domain' => 'FOSUserBundle',
+      'mapped' => false,
+      'constraints' => new UserPassword(),
+    ));
+  }
+  
+  public function getName()
+  {
+    return 'delete_user_form';
+  }
+}

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

@@ -1642,7 +1642,7 @@ form.changeemail input[type="text"]
   width: 388px;
 }
 
-form.changeemail input[type="submit"], form.privacy input[type="submit"]
+form.changeemail input[type="submit"], form.privacy input[type="submit"], form.delete input[type="submit"]
 {
   float: right;
   margin-top: 5px;

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

@@ -588,4 +588,34 @@ class UserControllerTest extends FunctionalTest
     $this->isResponseSuccess();
   }
   
+  public function testDeleteUser()
+  {
+    $this->client = self::createClient();
+    
+    $joelle = $this->findUserByUsername('joelle');
+    $this->assertEquals('joelle', $joelle->getUsername());
+    $this->assertEquals('joelle@root', $joelle->getEmail());
+    $this->connectUser('joelle', 'toor');
+    $this->deleteUser('toor');
+    $joelle = $this->findOneBy('User', array('id' => $joelle->getId()));
+    $this->assertTrue('joelle' != $joelle->getUsername());
+    $this->assertTrue('joelle@mail.com' != $joelle->getEmail());
+    $this->connectUser('joelle', 'toor', null, false);
+  }
+  
+  protected function deleteUser($password)
+  {
+    $this->goToPage($this->generateUrl('my_account'));
+    $this->exist('form.delete');
+    $form = $this->selectForm('form.delete input[type="submit"]');
+    $form['delete_user_form[current_password]'] = $password;
+    $this->submit($form);
+    $this->isResponseRedirection();
+    $this->followRedirection();
+    $this->isResponseRedirection();
+    $this->followRedirection();
+    //$this->outputDebug();
+    $this->isResponseSuccess();
+  }
+  
 }

src/Muzich/CoreBundle/lib/Controller.php

@@ -693,4 +693,9 @@ class Controller extends BaseController
     return true;
   }
   
+  protected function getUserManager()
+  {
+    return $this->container->get('muzich_user_manager');
+  }
+  
 }

src/Muzich/CoreBundle/lib/FunctionalTest.php

@@ -88,7 +88,7 @@ class FunctionalTest extends WebTestCase
     ;
   }
   
-  protected function connectUser($login, $password, $client = null)
+  protected function connectUser($login, $password, $client = null, $success = true)
   {
     if (!$client)
     {
@@ -118,20 +118,27 @@ class FunctionalTest extends WebTestCase
     $this->isResponseSuccess();
 
     $user = $this->getUser();
-    if ('anon.' != $user)
+    if ($success)
     {
-      if (strpos($login, '@') === false)
+      if ('anon.' != $user)
       {
-        $this->assertEquals($login, $user->getUsername());
+        if (strpos($login, '@') === false)
+        {
+          $this->assertEquals($login, $user->getUsername());
+        }
+        else
+        {
+          $this->assertEquals($login, $user->getEmail());
+        }
       }
       else
       {
-        $this->assertEquals($login, $user->getEmail());
+        $this->assertTrue(false);
       }
     }
     else
     {
-      $this->assertTrue(false);
+      $this->assertEquals('anon.', $user);
     }
   }
   

src/Muzich/UserBundle/Controller/UserController.php

@@ -15,6 +15,7 @@ use Muzich\UserBundle\Form\Type\RegistrationFormType;
 use Muzich\CoreBundle\Entity\User;
 use Muzich\CoreBundle\Form\User\PasswordForm;
 use Muzich\CoreBundle\Form\User\PrivacyForm;
+use Muzich\CoreBundle\Form\User\DeleteForm;
 
 class UserController extends Controller
 {
@@ -50,6 +51,11 @@ class UserController extends Controller
     return $this->createForm(new PrivacyForm(), $this->getUser());
   }
   
+  protected function getDeleteForm()
+  {
+    return $this->createForm(new DeleteForm(), $this->getUser());
+  }
+  
   protected function getTagsFavoritesForm($user)
   {
     $ids = array();
@@ -98,7 +104,8 @@ class UserController extends Controller
       'change_email_form'        => $change_email_form->createView(),
       'avatar_form'              => $this->getAvatarForm()->createView(),
       'preferences_form'         => $this->getPreferencesForm()->createView(),
-      'privacy_form'             => $this->getPrivacyForm()->createView()
+      'privacy_form'             => $this->getPrivacyForm()->createView(),
+      'delete_form'              => $this->getDeleteForm()->createView()
     );
   }
   
@@ -257,7 +264,6 @@ class UserController extends Controller
     }
     
     $form_tags_favorites = $this->getTagsFavoritesForm($user);
-    $change_email_form = $this->getChangeEmailForm();
 
     return $this->container->get('templating')->renderResponse(
       'MuzichUserBundle:User:account.html.twig',
@@ -268,10 +274,11 @@ class UserController extends Controller
         '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(),
+        'change_email_form'        => $this->getChangeEmailForm()->createView(),
         'avatar_form'              => $this->getAvatarForm()->createView(),
         'preferences_form'         => $this->getPreferencesForm()->createView(),
-        'privacy_form'             => $this->getPrivacyForm()->createView()
+        'privacy_form'             => $this->getPrivacyForm()->createView(),
+        'delete_form'              => $this->getDeleteForm()->createView()
       )
     );
   }
@@ -450,7 +457,8 @@ class UserController extends Controller
         'change_email_form'        => $change_email_form->createView(),
         'avatar_form'              => $this->getAvatarForm()->createView(),
         'preferences_form'         => $this->getPreferencesForm()->createView(),
-        'privacy_form'             => $this->getPrivacyForm()->createView()
+        'privacy_form'             => $this->getPrivacyForm()->createView(),
+        'delete_form'              => $this->getDeleteForm()->createView()
       )
     );
   }
@@ -783,4 +791,36 @@ class UserController extends Controller
     ));
   }
   
+  public function deleteAction(Request $request)
+  {
+    $form = $this->getDeleteForm();
+    $form->bind($request);
+    
+    if ($form->isValid())
+    {
+      $this->getUserManager()->disableUser($form->getData());
+      $this->setFlash('success', 'user.delete.success');
+      return $this->redirect($this->generateUrl('fos_user_security_logout'));
+    }
+    
+    $this->setFlash('error', 'user.delete.fail');
+    $form_tags_favorites = $this->getTagsFavoritesForm($form->getData());
+    return $this->container->get('templating')->renderResponse(
+      'MuzichUserBundle:User:account.html.twig',
+      array(
+        'form_password'            => $this->getChangePasswordForm($form->getData())->createView(),
+        'errors_pers'              => array(),
+        'user'                     => $form->getData(),
+        'form_tags_favorites'      => $form_tags_favorites->createView(),
+        'form_tags_favorites_name' => $form_tags_favorites->getName(),
+        'favorite_tags_id'         => $this->getTagsFavorites(),
+        'change_email_form'        => $this->getChangeEmailForm()->createView(),
+        'avatar_form'              => $this->getAvatarForm()->createView(),
+        'preferences_form'         => $this->getPreferencesForm()->createView(),
+        'privacy_form'             => $this->getPrivacyForm()->createView(),
+        'delete_form'              => $form->createView()
+      )
+    );
+  }
+  
 }

src/Muzich/UserBundle/Entity/UserManager.php

@@ -11,6 +11,7 @@ use FOS\UserBundle\Util\CanonicalizerInterface;
 use Doctrine\ORM\EntityManager;
 //use FOS\UserBundle\Entity\UserManager as UserManagerBase; UPGRADE FOSUserBundle 1.3
 use FOS\UserBundle\Doctrine\UserManager as UserManagerBase;
+use Muzich\CoreBundle\Entity\User;
 
 /**
  */
@@ -85,5 +86,13 @@ class UserManager extends UserManagerBase
   {
     return $this->emailCanonicalizer->canonicalize($email);
   }
+  
+  public function disableUser(User $user)
+  {
+    $user->setEnabled(false);
+    $user->setUsername(time());
+    $user->setEmail('deleted_'.time().'@mail.com');
+    $this->updateUser($user);
+  }
 
 }

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

@@ -94,4 +94,9 @@ send_email_confirmation:
 helpbox_tags_favorites:
   pattern: /account/favorites-tags
   defaults: { _controller: MuzichUserBundle:User:favoriteTagsHelpbox }
-    
+
+delete_user:
+  pattern: /account/delete
+  defaults: { _controller: MuzichUserBundle:User:delete }
+  requirements:
+    _method:  POST

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

@@ -57,7 +57,7 @@
     <h2 data-open="myaccount_favorites_password">{{ 'my_account.change_password'|trans({}, 'userui') }}</h2>
 
     <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' %}
+      {% if not app.request.get('open') == 'change_password' %}
        style="display: none;"
       {% endif %}
      >
@@ -150,5 +150,35 @@
     </div>
     <div style="clear:both;"></div>
     
+    
+    <h2 data-open="myaccount_delete">{{ 'my_account.delete.title'|trans({}, 'userui') }}</h2>
+  
+    <div id="myaccount_delete" class="myaccount_part"
+      {% if not delete_form|form_has_errors and not app.request.get('open') == 'delete' %}
+        style="display: none;"
+      {% endif %}
+    >
+      
+      <p class="warning info">{{ 'my_account.delete.text'|trans({}, 'userui') }}
+      </p>
+      
+      <form
+        class="delete"
+        action="{{ path('delete_user', {'open':'delete'}) }}"
+        method="post"
+      >
+        
+        <div class="field">
+          {{ form_label(delete_form.current_password) }}
+          {{ form_widget(delete_form.current_password) }}
+        </div>
+        
+        {{ form_rest(delete_form) }}
+      
+          <input type="submit" class="button" value="{{ 'my_account.delete.submit'|trans({}, 'userui') }}" />
+      </form>
+    </div>
+    <div style="clear:both;"></div>
+    
   </div>
 {% endblock %}