use Pagerfanta\Adapter\DoctrineORMAdapter;
use Pagerfanta\Exception\OutOfRangeCurrentPageException;
use Pagerfanta\Pagerfanta;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Form\SearchUserType;
/**
* Creates a new User entity.
*
- * @Route("/new", name="user_new")
- * @Method({"GET", "POST"})
+ * @Route("/new", name="user_new", methods={"GET", "POST"})
*/
public function newAction(Request $request)
{
/**
* Displays a form to edit an existing User entity.
*
- * @Route("/{id}/edit", name="user_edit")
- * @Method({"GET", "POST"})
+ * @Route("/{id}/edit", name="user_edit", methods={"GET", "POST"})
*/
public function editAction(Request $request, User $user)
{
+ $userManager = $this->container->get('fos_user.user_manager');
+
$deleteForm = $this->createDeleteForm($user);
- $editForm = $this->createForm('Wallabag\UserBundle\Form\UserType', $user);
- $editForm->handleRequest($request);
+ $form = $this->createForm('Wallabag\UserBundle\Form\UserType', $user);
+ $form->handleRequest($request);
- if ($editForm->isSubmitted() && $editForm->isValid()) {
- $em = $this->getDoctrine()->getManager();
- $em->persist($user);
- $em->flush();
+ // `googleTwoFactor` isn't a field within the User entity, we need to define it's value in a different way
+ if ($this->getParameter('twofactor_auth') && true === $user->isGoogleAuthenticatorEnabled() && false === $form->isSubmitted()) {
+ $form->get('googleTwoFactor')->setData(true);
+ }
+
+ if ($form->isSubmitted() && $form->isValid()) {
+ // handle creation / reset of the OTP secret if checkbox changed from the previous state
+ if ($this->getParameter('twofactor_auth')) {
+ if (true === $form->get('googleTwoFactor')->getData() && false === $user->isGoogleAuthenticatorEnabled()) {
+ $user->setGoogleAuthenticatorSecret($this->get('scheb_two_factor.security.google_authenticator')->generateSecret());
+ $user->setEmailTwoFactor(false);
+ } elseif (false === $form->get('googleTwoFactor')->getData() && true === $user->isGoogleAuthenticatorEnabled()) {
+ $user->setGoogleAuthenticatorSecret(null);
+ }
+ }
+
+ $userManager->updateUser($user);
$this->get('session')->getFlashBag()->add(
'notice',
return $this->render('WallabagUserBundle:Manage:edit.html.twig', [
'user' => $user,
- 'edit_form' => $editForm->createView(),
+ 'edit_form' => $form->createView(),
'delete_form' => $deleteForm->createView(),
'twofactor_auth' => $this->getParameter('twofactor_auth'),
]);
/**
* Deletes a User entity.
*
- * @Route("/{id}", name="user_delete")
- * @Method("DELETE")
+ * @Route("/{id}", name="user_delete", methods={"DELETE"})
*/
public function deleteAction(Request $request, User $user)
{
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
- $this->get('logger')->info('searching users');
-
$searchTerm = (isset($request->get('search_user')['term']) ? $request->get('search_user')['term'] : '');
$qb = $em->getRepository('WallabagUserBundle:User')->getQueryBuilderForSearch($searchTerm);
}
/**
- * Creates a form to delete a User entity.
+ * Create a form to delete a User entity.
*
* @param User $user The User entity
*