Logout user before deleting it

And add a smal description
This commit is contained in:
Jeremy Benoist 2016-10-08 19:39:12 +02:00
parent c3396c65ef
commit eed812afd0
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
2 changed files with 28 additions and 17 deletions

View file

@ -261,11 +261,13 @@ class ConfigController extends Controller
* *
* @Route("/account/delete", name="delete_account") * @Route("/account/delete", name="delete_account")
* *
* @param Request $request
*
* @throws AccessDeniedHttpException * @throws AccessDeniedHttpException
* *
* @return \Symfony\Component\HttpFoundation\RedirectResponse * @return \Symfony\Component\HttpFoundation\RedirectResponse
*/ */
public function deleteAccountAction() public function deleteAccountAction(Request $request)
{ {
$enabledUsers = $this->getDoctrine() $enabledUsers = $this->getDoctrine()
->getRepository('WallabagUserBundle:User') ->getRepository('WallabagUserBundle:User')
@ -275,14 +277,15 @@ class ConfigController extends Controller
throw new AccessDeniedHttpException(); 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 = $this->get('fos_user.user_manager');
$em->deleteUser($this->getUser()); $em->deleteUser($user);
$this->get('session')->getFlashBag()->add( return $this->redirect($this->generateUrl('fos_user_security_login'));
'notice',
'flashes.account.notice.account_deleted'
);
return $this->redirect($this->generateUrl('fos_user_security_logout'));
} }
} }

View file

@ -169,7 +169,15 @@
</form> </form>
{% if enabled_users > 1 %} {% 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 %} {% endif %}
</div> </div>