From de3d716ae4e8ca98dabdcb2ec9c18219e05856f7 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 2 Jul 2016 14:35:52 +0200 Subject: Add option to disable registration --- .../UserBundle/Controller/RegistrationController.php | 20 ++++++++++++++++++++ .../UserBundle/Controller/SecurityController.php | 18 ++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 src/Wallabag/UserBundle/Controller/RegistrationController.php create mode 100644 src/Wallabag/UserBundle/Controller/SecurityController.php (limited to 'src/Wallabag/UserBundle/Controller') diff --git a/src/Wallabag/UserBundle/Controller/RegistrationController.php b/src/Wallabag/UserBundle/Controller/RegistrationController.php new file mode 100644 index 00000000..bba27cfb --- /dev/null +++ b/src/Wallabag/UserBundle/Controller/RegistrationController.php @@ -0,0 +1,20 @@ +container->getParameter('wallabag_user.registration_enabled')) { + parent::registerAction($request); + } + else + { + return $this->redirectToRoute('fos_user_security_login', array(), 301); + } + } +} diff --git a/src/Wallabag/UserBundle/Controller/SecurityController.php b/src/Wallabag/UserBundle/Controller/SecurityController.php new file mode 100644 index 00000000..a5f93763 --- /dev/null +++ b/src/Wallabag/UserBundle/Controller/SecurityController.php @@ -0,0 +1,18 @@ +render('FOSUserBundle:Security:login.html.twig', + array_merge( + $data, + array('registration_enabled' => $this->container->getParameter('wallabag_user.registration_enabled')) + ) + ); + } +} -- cgit v1.2.3 From 7149aa57814a9d6151f4fe049126e3cb5d86a254 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 24 Jul 2016 11:41:04 +0200 Subject: Proper parameter name, simplify logic & phpdoc --- src/Wallabag/UserBundle/Controller/RegistrationController.php | 8 +++----- src/Wallabag/UserBundle/Controller/SecurityController.php | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/Wallabag/UserBundle/Controller') diff --git a/src/Wallabag/UserBundle/Controller/RegistrationController.php b/src/Wallabag/UserBundle/Controller/RegistrationController.php index bba27cfb..d6d0fda1 100644 --- a/src/Wallabag/UserBundle/Controller/RegistrationController.php +++ b/src/Wallabag/UserBundle/Controller/RegistrationController.php @@ -10,11 +10,9 @@ class RegistrationController extends FOSRegistrationController public function registerAction(Request $request) { if ($this->container->getParameter('wallabag_user.registration_enabled')) { - parent::registerAction($request); - } - else - { - return $this->redirectToRoute('fos_user_security_login', array(), 301); + return parent::registerAction($request); } + + return $this->redirectToRoute('fos_user_security_login', array(), 301); } } diff --git a/src/Wallabag/UserBundle/Controller/SecurityController.php b/src/Wallabag/UserBundle/Controller/SecurityController.php index a5f93763..1e752b6d 100644 --- a/src/Wallabag/UserBundle/Controller/SecurityController.php +++ b/src/Wallabag/UserBundle/Controller/SecurityController.php @@ -4,6 +4,9 @@ namespace Wallabag\UserBundle\Controller; use FOS\UserBundle\Controller\SecurityController as FOSSecurityController; +/** + * Extends login form in order to pass the registration_enabled parameter. + */ class SecurityController extends FOSSecurityController { protected function renderLogin(array $data) -- cgit v1.2.3 From ee4442f42a36d2cfd7add334983a8e126718a788 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 24 Jul 2016 12:14:52 +0200 Subject: CS --- src/Wallabag/UserBundle/Controller/RegistrationController.php | 2 +- src/Wallabag/UserBundle/Controller/SecurityController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/UserBundle/Controller') diff --git a/src/Wallabag/UserBundle/Controller/RegistrationController.php b/src/Wallabag/UserBundle/Controller/RegistrationController.php index d6d0fda1..f81f3a7b 100644 --- a/src/Wallabag/UserBundle/Controller/RegistrationController.php +++ b/src/Wallabag/UserBundle/Controller/RegistrationController.php @@ -13,6 +13,6 @@ class RegistrationController extends FOSRegistrationController return parent::registerAction($request); } - return $this->redirectToRoute('fos_user_security_login', array(), 301); + return $this->redirectToRoute('fos_user_security_login', [], 301); } } diff --git a/src/Wallabag/UserBundle/Controller/SecurityController.php b/src/Wallabag/UserBundle/Controller/SecurityController.php index 1e752b6d..83fa0b20 100644 --- a/src/Wallabag/UserBundle/Controller/SecurityController.php +++ b/src/Wallabag/UserBundle/Controller/SecurityController.php @@ -14,7 +14,7 @@ class SecurityController extends FOSSecurityController return $this->render('FOSUserBundle:Security:login.html.twig', array_merge( $data, - array('registration_enabled' => $this->container->getParameter('wallabag_user.registration_enabled')) + ['registration_enabled' => $this->container->getParameter('wallabag_user.registration_enabled')] ) ); } -- cgit v1.2.3 From 152fcccd4489378a8ed9391e3e191df4aeba6435 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 30 Sep 2016 20:09:06 +0200 Subject: Add users management UI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation) --- .../UserBundle/Controller/ManageController.php | 149 +++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 src/Wallabag/UserBundle/Controller/ManageController.php (limited to 'src/Wallabag/UserBundle/Controller') diff --git a/src/Wallabag/UserBundle/Controller/ManageController.php b/src/Wallabag/UserBundle/Controller/ManageController.php new file mode 100644 index 00000000..92ee2b41 --- /dev/null +++ b/src/Wallabag/UserBundle/Controller/ManageController.php @@ -0,0 +1,149 @@ +getDoctrine()->getManager(); + + $users = $em->getRepository('WallabagUserBundle:User')->findAll(); + + return $this->render('WallabagUserBundle:Manage:index.html.twig', array( + 'users' => $users, + )); + } + + /** + * Creates a new User entity. + * + * @Route("/new", name="user_new") + * @Method({"GET", "POST"}) + */ + public function newAction(Request $request) + { + $userManager = $this->container->get('fos_user.user_manager'); + + $user = $userManager->createUser(); + // enable created user by default + $user->setEnabled(true); + + $form = $this->createForm('Wallabag\UserBundle\Form\NewUserType', $user, [ + 'validation_groups' => ['Profile'], + ]); + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + $userManager->updateUser($user); + + // dispatch a created event so the associated config will be created + $event = new UserEvent($user, $request); + $this->get('event_dispatcher')->dispatch(FOSUserEvents::USER_CREATED, $event); + + $this->get('session')->getFlashBag()->add( + 'notice', + $this->get('translator')->trans('flashes.user.notice.added', ['%username%' => $user->getUsername()]) + ); + + return $this->redirectToRoute('user_edit', array('id' => $user->getId())); + } + + return $this->render('WallabagUserBundle:Manage:new.html.twig', array( + 'user' => $user, + 'form' => $form->createView(), + )); + } + + /** + * Displays a form to edit an existing User entity. + * + * @Route("/{id}/edit", name="user_edit") + * @Method({"GET", "POST"}) + */ + public function editAction(Request $request, User $user) + { + $deleteForm = $this->createDeleteForm($user); + $editForm = $this->createForm('Wallabag\UserBundle\Form\UserType', $user); + $editForm->handleRequest($request); + + if ($editForm->isSubmitted() && $editForm->isValid()) { + $em = $this->getDoctrine()->getManager(); + $em->persist($user); + $em->flush(); + + $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->render('WallabagUserBundle:Manage:edit.html.twig', array( + 'user' => $user, + 'edit_form' => $editForm->createView(), + 'delete_form' => $deleteForm->createView(), + 'twofactor_auth' => $this->getParameter('twofactor_auth'), + )); + } + + /** + * Deletes a User entity. + * + * @Route("/{id}", name="user_delete") + * @Method("DELETE") + */ + public function deleteAction(Request $request, User $user) + { + $form = $this->createDeleteForm($user); + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + $this->get('session')->getFlashBag()->add( + 'notice', + $this->get('translator')->trans('flashes.user.notice.deleted', ['%username%' => $user->getUsername()]) + ); + + $em = $this->getDoctrine()->getManager(); + $em->remove($user); + $em->flush(); + } + + return $this->redirectToRoute('user_index'); + } + + /** + * 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() + ; + } +} -- cgit v1.2.3