use Pagerfanta\Adapter\DoctrineORMAdapter;
use Pagerfanta\Exception\OutOfRangeCurrentPageException;
use Pagerfanta\Pagerfanta;
-use Symfony\Component\HttpFoundation\Request;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Form\SearchUserType;
*/
class ManageController extends Controller
{
- /**
- * Lists all User entities.
- *
- * @Route("/index/{page}", name="user_index")
- * @Method("GET")
- *
- * @param int $page
- *
- * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
- */
- public function indexAction($page = 1)
- {
- $em = $this->getDoctrine()->getManager();
-
- $qb = $em->getRepository('WallabagUserBundle:User')->createQueryBuilder('u');
- $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
- $pagerFanta = new Pagerfanta($pagerAdapter);
- $pagerFanta->setMaxPerPage(50);
-
- try {
- $pagerFanta->setCurrentPage($page);
- } catch (OutOfRangeCurrentPageException $e) {
- if ($page > 1) {
- return $this->redirect($this->generateUrl('user_index', ['page' => $pagerFanta->getNbPages()]), 302);
- }
- }
-
- return $this->render('WallabagUserBundle:Manage:index.html.twig', array(
- 'users' => $pagerFanta,
- ));
- }
-
/**
* 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)
{
// enable created user by default
$user->setEnabled(true);
- $form = $this->createForm('Wallabag\UserBundle\Form\NewUserType', $user, [
- 'validation_groups' => ['Profile'],
- ]);
+ $form = $this->createForm('Wallabag\UserBundle\Form\NewUserType', $user);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$this->get('translator')->trans('flashes.user.notice.added', ['%username%' => $user->getUsername()])
);
- return $this->redirectToRoute('user_edit', array('id' => $user->getId()));
+ return $this->redirectToRoute('user_edit', ['id' => $user->getId()]);
}
- return $this->render('WallabagUserBundle:Manage:new.html.twig', array(
+ return $this->render('WallabagUserBundle:Manage:new.html.twig', [
'user' => $user,
'form' => $form->createView(),
- ));
+ ]);
}
/**
* 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',
$this->get('translator')->trans('flashes.user.notice.updated', ['%username%' => $user->getUsername()])
);
- return $this->redirectToRoute('user_edit', array('id' => $user->getId()));
+ return $this->redirectToRoute('user_edit', ['id' => $user->getId()]);
}
- return $this->render('WallabagUserBundle:Manage:edit.html.twig', array(
+ 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)
{
}
/**
- * Creates a form to delete a User entity.
- *
- * @param User $user The User entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
- private function createDeleteForm(User $user)
- {
- return $this->createFormBuilder()
- ->setAction($this->generateUrl('user_delete', array('id' => $user->getId())))
- ->setMethod('DELETE')
- ->getForm()
- ;
- }
-
- /**
- * @param Request $request
- * @param int $page
+ * @param int $page
*
- * @Route("/search/{page}", name="user-search", defaults={"page" = 1})
+ * @Route("/list/{page}", name="user_index", defaults={"page" = 1})
*
* Default parameter for page is hardcoded (in duplication of the defaults from the Route)
* because this controller is also called inside the layout template without any page as argument
*
* @return \Symfony\Component\HttpFoundation\Response
*/
- public function searchFormAction(Request $request, $page = 1, $currentRoute = null)
+ public function searchFormAction(Request $request, $page = 1)
{
- // fallback to retrieve currentRoute from query parameter instead of injected one (when using inside a template)
- if (null === $currentRoute && $request->query->has('currentRoute')) {
- $currentRoute = $request->query->get('currentRoute');
- }
+ $em = $this->getDoctrine()->getManager();
+ $qb = $em->getRepository('WallabagUserBundle:User')->createQueryBuilder('u');
$form = $this->createForm(SearchUserType::class);
-
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
- $this->get('logger')->info('searching users');
- $em = $this->getDoctrine()->getManager();
-
$searchTerm = (isset($request->get('search_user')['term']) ? $request->get('search_user')['term'] : '');
$qb = $em->getRepository('WallabagUserBundle:User')->getQueryBuilderForSearch($searchTerm);
+ }
- $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
- $pagerFanta = new Pagerfanta($pagerAdapter);
- $pagerFanta->setMaxPerPage(50);
+ $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
+ $pagerFanta = new Pagerfanta($pagerAdapter);
+ $pagerFanta->setMaxPerPage(50);
- try {
- $pagerFanta->setCurrentPage($page);
- } catch (OutOfRangeCurrentPageException $e) {
- if ($page > 1) {
- return $this->redirect($this->generateUrl('user_index', ['page' => $pagerFanta->getNbPages()]), 302);
- }
+ try {
+ $pagerFanta->setCurrentPage($page);
+ } catch (OutOfRangeCurrentPageException $e) {
+ if ($page > 1) {
+ return $this->redirect($this->generateUrl('user_index', ['page' => $pagerFanta->getNbPages()]), 302);
}
-
- return $this->render('WallabagUserBundle:Manage:index.html.twig', array(
- 'users' => $pagerFanta,
- ));
}
- return $this->render('WallabagUserBundle:Manage:search_form.html.twig', [
- 'form' => $form->createView(),
- 'currentRoute' => $currentRoute,
+ return $this->render('WallabagUserBundle:Manage:index.html.twig', [
+ 'searchForm' => $form->createView(),
+ 'users' => $pagerFanta,
]);
}
+
+ /**
+ * Create a form to delete a User entity.
+ *
+ * @param User $user The User entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
+ private function createDeleteForm(User $user)
+ {
+ return $this->createFormBuilder()
+ ->setAction($this->generateUrl('user_delete', ['id' => $user->getId()]))
+ ->setMethod('DELETE')
+ ->getForm()
+ ;
+ }
}
projects / github / wallabag / wallabag.git / blobdiff