2 files changed, 32 insertions, 21 deletions

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 70a641f7..662da2a0 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -261,28 +261,31 @@ class ConfigController extends Controller
       *
       * @Route("/account/delete", name="delete_account")
       *
+      * @param Request $request
+      *
       * @throws AccessDeniedHttpException
       *
       * @return \Symfony\Component\HttpFoundation\RedirectResponse
       */
-     public function deleteAccountAction()
-     {
-         $enabledUsers = $this->getDoctrine()
-             ->getRepository('WallabagUserBundle:User')
-             ->getSumEnabledUsers();
-
-         if ($enabledUsers <= 1) {
-             throw new AccessDeniedHttpException();
-         }
-
-         $em = $this->get('fos_user.user_manager');
-         $em->deleteUser($this->getUser());
-
-         $this->get('session')->getFlashBag()->add(
-             'notice',
-             'flashes.account.notice.account_deleted'
-         );
-
-         return $this->redirect($this->generateUrl('fos_user_security_logout'));
-     }
+    public function deleteAccountAction(Request $request)
+    {
+        $enabledUsers = $this->getDoctrine()
+            ->getRepository('WallabagUserBundle:User')
+            ->getSumEnabledUsers();
+
+        if ($enabledUsers <= 1) {
+            throw new AccessDeniedHttpException();
+        }
+
+        $user = $this->getUser();
+
+        // logout current user
+        $this->get('security.token_storage')->setToken(null);
+        $request->getSession()->invalidate();
+
+        $em = $this->get('fos_user.user_manager');
+        $em->deleteUser($user);
+
+        return $this->redirect($this->generateUrl('fos_user_security_login'));
+    }
 }
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index a8a3f9dc..25d259b8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -169,7 +169,15 @@
                         </form>
 
                         {% if enabled_users > 1 %}
-                        <a class='btn red delete-account' href='{{ path('delete_account') }}'>{{ 'config.form_user.delete_account' | trans }}</a>
+                            <br /><hr /><br />
+
+                            <div class="row">
+                                <h5>{{ 'config.delete.title'|trans }}</h5>
+                                <p>{{ 'config.delete.description'|trans }}</p>
+                                <a href="{{ path('delete_account') }}" onclick="return confirm('{{ 'config.delete.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red delete-account">
+                                    {{ 'config.form_user.delete_account' | trans }}
+                                </a>
+                            </div>
                         {% endif %}
                     </div>