Rename Factory/RepositoryFactory in Factory

[userbundle] / Resources / config / routes / rapsys_user.yaml

diff --git a/Resources/config/routes/rapsys_user.yaml b/Resources/config/routes/rapsys_user.yaml
index c68813723767286d0eeb0ccd63ca5a8cd3dfbc5d..fed2abde69a1893c4cfec3c3bbc48b417957bfe1 100644 (file)
--- a/Resources/config/routes/rapsys_user.yaml
+++ b/Resources/config/routes/rapsys_user.yaml
@@ -1,30 +1,53 @@
-rapsys_user_login:
-    path: /login
-    controller: Rapsys\UserBundle\Controller\DefaultController::login
-    methods: GET|POST
-
-rapsys_user_recover:
-    path: /recover
-    controller: Rapsys\UserBundle\Controller\DefaultController::recover
+rapsys_user_confirm:
+    path: /confirm/{hash}/{mail}
+    controller: Rapsys\UserBundle\Controller\UserController::registerMail
+    requirements:
+        hash: '[a-zA-Z0-9=_-]+'
+        mail: '[a-zA-Z0-9=_-]+'

     methods: GET|POST
 
     methods: GET|POST
 

-rapsys_user_recover_mail:
-    path: /recover/{recipient}/{hash}
-    controller: Rapsys\UserBundle\Controller\DefaultController::recoverMail
+rapsys_user_edit:
+    path: /user/{hash}/{mail}
+    controller: Rapsys\UserBundle\Controller\UserController::edit

     requirements:
     requirements:

-        recipient: '[a-zA-Z0-9=_-]+'

         hash: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'

+        mail: '[a-zA-Z0-9=_-]+'

     methods: GET|POST
 
     methods: GET|POST
 

-rapsys_user_register:
-    path: /register
-    controller: Rapsys\UserBundle\Controller\DefaultController::register
+rapsys_user_index:
+    path: /
+    controller: Rapsys\UserBundle\Controller\UserController::index
+    methods: GET
+
+rapsys_user_login:
+    path: /login/{hash}/{mail}
+    controller: Rapsys\UserBundle\Controller\UserController::login
+    defaults:
+        hash: ~
+        mail: ~
+    requirements:
+        hash: '[a-zA-Z0-9=_-]+'
+        mail: '[a-zA-Z0-9=_-]+'

     methods: GET|POST
 
 rapsys_user_logout:
     path: /logout
     methods: GET
 
     methods: GET|POST
 
 rapsys_user_logout:
     path: /logout
     methods: GET
 

-rapsys_user_index:
-    path: /
-    methods: GET
+rapsys_user_recover:
+    path: /recover/{hash}/{pass}/{mail}
+    controller: Rapsys\UserBundle\Controller\UserController::recover
+    defaults:
+        hash: ~
+        pass: ~
+        mail: ~
+    requirements:
+        hash: '[a-zA-Z0-9=_-]+'
+        pass: '[a-zA-Z0-9=_-]+'
+        mail: '[a-zA-Z0-9=_-]+'
+    methods: GET|POST
+
+rapsys_user_register:
+    path: /register
+    controller: Rapsys\UserBundle\Controller\UserController::register
+    methods: GET|POST