Added URL compatibility

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

diff --git a/app/config/security.yml b/app/config/security.yml
index 5f3bf0b61e9b9485398474fcd8f4d67b35eb0d27..60500d15733896ed835920984d7b64df8b55dbf9 100644 (file)
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -63,6 +63,7 @@ security:
         - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: /tags/(.*).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/feed, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } # For backwards compatibility
         - { path: ^/share, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
         - { path: ^/annotations, roles: ROLE_USER }

diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php
index 57de0e53a0469c6b1b669b0e8b90cef8bb9360e8..a2b29e727831913d6a42b18615b8df6986bc2d9a 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/RssController.php
+++ b/src/Wallabag/CoreBundle/Controller/RssController.php
@@ -22,6 +22,7 @@ class RssController extends Controller
      * Shows unread entries for current user.
      *
      * @Route("/feed/{username}/{token}/unread/{page}", name="unread_rss", defaults={"page": 1})
+     * @Route("/{username}/{token}/unread.xml", defaults={"page": 1})
      * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
      *
      * @param User $user
@@ -38,6 +39,7 @@ class RssController extends Controller
      * Shows read entries for current user.
      *
      * @Route("/feed/{username}/{token}/archive/{page}", name="archive_rss", defaults={"page": 1})
+     * @Route("/{username}/{token}/archive.xml", defaults={"page": 1})
      * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
      *
      * @param User $user
@@ -54,6 +56,7 @@ class RssController extends Controller
      * Shows starred entries for current user.
      *
      * @Route("/feed/{username}/{token}/starred/{page}", name="starred_rss", defaults={"page": 1})
+     * @Route("/{username}/{token}/starred.xml", defaults={"page": 1})
      * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
      *
      * @param User $user