From f6917aaac785e7947ce4c2366ce3abebebf8231d Mon Sep 17 00:00:00 2001 From: Wilmer Ramones Date: Wed, 6 Jul 2016 15:24:18 -0400 Subject: [PATCH] trabajamos redirecciones de login y de exito --- .idea/workspace.xml | 652 +++++++++------------ app/Resources/views/security/login.html.twig | 3 +- app/sessions/sess_17mmdi4dbu0iop1qs5mui1b4n7 | 1 + app/sessions/sess_86jfvdk9490d7f1h5m3efgubc1 | 1 - app/sessions/sess_b7cg3j7u2h7vmm5hs6fpq885p6 | 1 - .../Controller/RegistrationController.php | 7 +- src/AppBundle/Controller/SecurityController.php | 15 + src/AppBundle/Entity/Usuarios.php | 5 + 8 files changed, 312 insertions(+), 373 deletions(-) create mode 100644 app/sessions/sess_17mmdi4dbu0iop1qs5mui1b4n7 delete mode 100644 app/sessions/sess_86jfvdk9490d7f1h5m3efgubc1 delete mode 100644 app/sessions/sess_b7cg3j7u2h7vmm5hs6fpq885p6 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ea4551a..027dc70 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,255 +2,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -275,86 +33,70 @@ - - + + - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - + + @@ -373,7 +115,6 @@ @@ -500,6 +242,166 @@ - - - - - - - - @@ -840,20 +734,6 @@ - - - - - - - - - - - - - - @@ -964,14 +844,6 @@ - - - - - - - - @@ -990,14 +862,6 @@ - - - - - - - - @@ -1014,61 +878,111 @@ + + + + + + + + + + + + + + + + + + + + - + - + - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + - + - - + + - + + + + + + + + + + + + + - + - - + + - + - + - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/Resources/views/security/login.html.twig b/app/Resources/views/security/login.html.twig index cadf73a..5d4083a 100644 --- a/app/Resources/views/security/login.html.twig +++ b/app/Resources/views/security/login.html.twig @@ -20,7 +20,8 @@ value="{{ csrf_token('authenticate') }}" > - + + diff --git a/app/sessions/sess_17mmdi4dbu0iop1qs5mui1b4n7 b/app/sessions/sess_17mmdi4dbu0iop1qs5mui1b4n7 new file mode 100644 index 0000000..fa9af18 --- /dev/null +++ b/app/sessions/sess_17mmdi4dbu0iop1qs5mui1b4n7 @@ -0,0 +1 @@ +_sf2_attributes|a:4:{s:15:"_csrf/solicitar";s:43:"tOsKi5IH297TDpeeh_W3DMFKji4j1SILw8ijxhP2F14";s:18:"_csrf/authenticate";s:43:"HaqywcAjtuH_2ISxmXoB1297by0479lJtv6rwNNsY8c";s:14:"_security_main";s:387:"C:74:"Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken":299:{a:3:{i:0;N;i:1;s:4:"main";i:2;s:259:"a:4:{i:0;C:25:"AppBundle\Entity\Usuarios":106:{a:3:{i:0;i:11;i:1;s:8:"wramones";i:2;s:60:"$2y$13$UN60aw0H6QLaO5k.ghyvIOrQjW1UPt210b6ReDJUgQGZ7VK9SwoeK";}}i:1;b:1;i:2;a:1:{i:0;C:21:"AppBundle\Entity\Role":38:{a:2:{i:0;i:3;i:1;s:12:"ROLE_DOCENTE";}}}i:3;a:0:{}}";}}";s:10:"_csrf/user";s:43:"Vs5OUa-VjbU7lUOhdb34i1IeoO_L70Xj2wX_57c5JBw";}_sf2_flashes|a:0:{}_sf2_meta|a:3:{s:1:"u";i:1467832962;s:1:"c";i:1467832662;s:1:"l";s:1:"0";} \ No newline at end of file diff --git a/app/sessions/sess_86jfvdk9490d7f1h5m3efgubc1 b/app/sessions/sess_86jfvdk9490d7f1h5m3efgubc1 deleted file mode 100644 index 723c2e3..0000000 --- a/app/sessions/sess_86jfvdk9490d7f1h5m3efgubc1 +++ /dev/null @@ -1 +0,0 @@ -_sf2_attributes|a:5:{s:15:"_csrf/solicitar";s:43:"Av1hAaxkQK9zdhtgXChPQEV-h2LqClommAYH4KynK-M";s:26:"_security.main.target_path";s:30:"http://localhost:8000/register";s:18:"_csrf/authenticate";s:43:"gvsoxUKF7rv4jBx73EKsYymAyS6RWg3bldrbp6lImvU";s:14:"_security_main";s:387:"C:74:"Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken":299:{a:3:{i:0;N;i:1;s:4:"main";i:2;s:259:"a:4:{i:0;C:25:"AppBundle\Entity\Usuarios":106:{a:3:{i:0;i:11;i:1;s:8:"wramones";i:2;s:60:"$2y$13$UN60aw0H6QLaO5k.ghyvIOrQjW1UPt210b6ReDJUgQGZ7VK9SwoeK";}}i:1;b:1;i:2;a:1:{i:0;C:21:"AppBundle\Entity\Role":38:{a:2:{i:0;i:3;i:1;s:12:"ROLE_DOCENTE";}}}i:3;a:0:{}}";}}";s:10:"_csrf/user";s:43:"RdCC_Bhbcw07kBYGRa26p2Jm-965c_5QNO9xp0C-lks";}_sf2_flashes|a:0:{}_sf2_meta|a:3:{s:1:"u";i:1467829517;s:1:"c";i:1467807959;s:1:"l";s:1:"0";} \ No newline at end of file diff --git a/app/sessions/sess_b7cg3j7u2h7vmm5hs6fpq885p6 b/app/sessions/sess_b7cg3j7u2h7vmm5hs6fpq885p6 deleted file mode 100644 index 93fb7ca..0000000 --- a/app/sessions/sess_b7cg3j7u2h7vmm5hs6fpq885p6 +++ /dev/null @@ -1 +0,0 @@ -_sf2_attributes|a:4:{s:26:"_security.main.target_path";s:30:"http://localhost:8000/register";s:18:"_csrf/authenticate";s:43:"UQ6zMyyvroC7RDUqoinJjUIuMqhAIEW0UnGThan_ACc";s:14:"_security_main";s:386:"C:74:"Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken":298:{a:3:{i:0;N;i:1;s:4:"main";i:2;s:258:"a:4:{i:0;C:25:"AppBundle\Entity\Usuarios":105:{a:3:{i:0;i:1;i:1;s:8:"wramones";i:2;s:60:"$2y$13$BdGlK17e5E0JKPeYjc6khOC0YcR.5M5G9VpzAe1/zx8nOZExCwpqu";}}i:1;b:1;i:2;a:1:{i:0;C:21:"AppBundle\Entity\Role":38:{a:2:{i:0;i:1;i:1;s:12:"ROLE_DOCENTE";}}}i:3;a:0:{}}";}}";s:10:"_csrf/user";s:43:"Bhz7lOqWcj-kkbA4sEIFGGCd88lwqn2cyW7Nz2gjqmM";}_sf2_flashes|a:0:{}_sf2_meta|a:3:{s:1:"u";i:1467757191;s:1:"c";i:1467713451;s:1:"l";s:1:"0";} \ No newline at end of file diff --git a/src/AppBundle/Controller/RegistrationController.php b/src/AppBundle/Controller/RegistrationController.php index d58b9d6..f81f358 100644 --- a/src/AppBundle/Controller/RegistrationController.php +++ b/src/AppBundle/Controller/RegistrationController.php @@ -23,7 +23,12 @@ class RegistrationController extends Controller */ public function registerAction(Request $request) { - + //si ya se adscribió redirigirlo + if($this->getDoctrine()->getRepository('AppBundle:Adscripcion')->findOneByIdRolInstitucion($this->getUser()->getIdRolInstitucion()->getId())){ + return $this->redirect($this->generateUrl('homepage')); + } + + $adscripcion = new Adscripcion(); $escala = new DocenteEscala(); diff --git a/src/AppBundle/Controller/SecurityController.php b/src/AppBundle/Controller/SecurityController.php index 245d099..dc6515d 100644 --- a/src/AppBundle/Controller/SecurityController.php +++ b/src/AppBundle/Controller/SecurityController.php @@ -37,4 +37,19 @@ class SecurityController extends Controller ) ); } + + /** + * @Route("/verificar", name="user_roles") + */ + public function verificarAction(Request $request) + { + if (!$this->get('security.authorization_checker')->isGranted('IS_AUTHENTICATED_FULLY')) { + return $this->redirect($this->generateUrl('login')); + } + + + if($this->isGranted('ROLE_DOCENTE')){ + return $this->redirect($this->generateUrl('user_registration')); + } + } } \ No newline at end of file diff --git a/src/AppBundle/Entity/Usuarios.php b/src/AppBundle/Entity/Usuarios.php index fd2abe5..511ed19 100644 --- a/src/AppBundle/Entity/Usuarios.php +++ b/src/AppBundle/Entity/Usuarios.php @@ -259,6 +259,11 @@ class Usuarios implements UserInterface, \Serializable $this->plainPassword = $password; } + public function isGranted($rol) + { + return in_array($rol, $this->getRoles()); + } + /** * Returns the salt that was originally used to encode the password. -- 2.0.0