Add extra field on confirm url

Add mail and hash field on login url
Add pass field on recover url
Rename fields to field

diff --git a/Resources/config/routes/rapsys_user.yaml b/Resources/config/routes/rapsys_user.yaml
index 3fbe262df21dd523e73b9f8990db818c9c5408c5..b1f914213dc43a988d6ba24c437d5b34541e886a 100644 (file)
--- a/Resources/config/routes/rapsys_user.yaml
+++ b/Resources/config/routes/rapsys_user.yaml
@@ -1,14 +1,21 @@
 rapsys_user_confirm:
 rapsys_user_confirm:

-    path: /confirm/{mail}/{hash}
+    path: /confirm/{mail}/{extra}/{hash}

     controller: Rapsys\UserBundle\Controller\DefaultController::registerMail
     requirements:
         mail: '[a-zA-Z0-9=_-]+'
     controller: Rapsys\UserBundle\Controller\DefaultController::registerMail
     requirements:
         mail: '[a-zA-Z0-9=_-]+'

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

         hash: '[a-zA-Z0-9=_-]+'
     methods: GET|POST
 
 rapsys_user_login:
         hash: '[a-zA-Z0-9=_-]+'
     methods: GET|POST
 
 rapsys_user_login:

-    path: /login
+    path: /login/{mail}/{hash}

     controller: Rapsys\UserBundle\Controller\DefaultController::login
     controller: Rapsys\UserBundle\Controller\DefaultController::login

+    defaults:
+        mail: ~
+        hash: ~
+    requirements:
+        mail: '[a-zA-Z0-9=_-]+'
+        hash: '[a-zA-Z0-9=_-]+'

     methods: GET|POST
 
 rapsys_user_logout:
     methods: GET|POST
 
 rapsys_user_logout:


@@ -16,7 +23,7 @@ rapsys_user_logout:
     methods: GET
 
 rapsys_user_recover:
     methods: GET
 
 rapsys_user_recover:

-    path: /recover/{mail}/pass/{hash}
+    path: /recover/{mail}/{pass}/{hash}

     controller: Rapsys\UserBundle\Controller\DefaultController::recover
     defaults:
         mail: ~
     controller: Rapsys\UserBundle\Controller\DefaultController::recover
     defaults:
         mail: ~


@@ -29,13 +36,13 @@ rapsys_user_recover:
     methods: GET|POST
 
 rapsys_user_register:
     methods: GET|POST
 
 rapsys_user_register:

-    path: /register/{fields}/{hash}
+    path: /register/{field}/{hash}

     controller: Rapsys\UserBundle\Controller\DefaultController::register
     defaults:
     controller: Rapsys\UserBundle\Controller\DefaultController::register
     defaults:

-        fields: ~
+        field: ~

         hash: ~
     requirements:
         hash: ~
     requirements:

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

         hash: '[a-zA-Z0-9=_-]+'
     methods: GET|POST
 
         hash: '[a-zA-Z0-9=_-]+'
     methods: GET|POST