From: Raphaƫl Gertz Date: Wed, 11 Aug 2021 18:47:17 +0000 (+0200) Subject: Set mail as last field as it may be empty X-Git-Tag: 0.2.0~64 X-Git-Url: https://git.rapsys.eu/userbundle/commitdiff_plain/67386c1992816b267b3c482352a6500dd1424e0c?ds=sidebyside Set mail as last field as it may be empty Set hash as first field as it should never be empty --- diff --git a/Resources/config/routes/rapsys_user.yaml b/Resources/config/routes/rapsys_user.yaml index b1f9142..e2af83c 100644 --- a/Resources/config/routes/rapsys_user.yaml +++ b/Resources/config/routes/rapsys_user.yaml @@ -1,14 +1,13 @@ rapsys_user_confirm: - path: /confirm/{mail}/{extra}/{hash} + path: /confirm/{hash}/{mail} 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: - path: /login/{mail}/{hash} + path: /login/{hash}/{mail} controller: Rapsys\UserBundle\Controller\DefaultController::login defaults: mail: ~ @@ -23,7 +22,7 @@ rapsys_user_logout: methods: GET rapsys_user_recover: - path: /recover/{mail}/{pass}/{hash} + path: /recover/{hash}/{pass}/{mail} controller: Rapsys\UserBundle\Controller\DefaultController::recover defaults: mail: ~ @@ -36,21 +35,24 @@ rapsys_user_recover: methods: GET|POST rapsys_user_register: - path: /register/{field}/{hash} + path: /register/{hash}/{field}/{mail} controller: Rapsys\UserBundle\Controller\DefaultController::register defaults: + mail: ~ field: ~ hash: ~ requirements: + mail: '[a-zA-Z0-9=_-]+' field: '[a-zA-Z0-9=_-]+' hash: '[a-zA-Z0-9=_-]+' methods: GET|POST rapsys_user_edit: - path: /user/{mail} + path: /user/{hash}/{mail} controller: Rapsys\UserBundle\Controller\DefaultController::edit requirements: mail: '[a-zA-Z0-9=_-]+' + hash: '[a-zA-Z0-9=_-]+' methods: GET|POST rapsys_user_index: