yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-05 09:49:23 +02:00
Code Issues Releases Wiki Activity

Fix #877: Ensure API urls answer with and without a trailing slash

Browse source
This commit is contained in:
Eliot Berriot 2019-07-02 14:31:47 +02:00
parent 98c6e10351
commit 53b826c81a
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
15 changed files with 75 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

7
api/config/api_urls.py
View file

@ -6,11 +6,12 @@ from rest_framework_jwt import views as jwt_views
from funkwhale_api.activity import views as activity_views
from funkwhale_api.common import views as common_views
from funkwhale_api.common import routers as common_routers
from funkwhale_api.music import views
from funkwhale_api.playlists import views as playlists_views
from funkwhale_api.subsonic.views import SubsonicViewSet
router = routers.SimpleRouter()
router = common_routers.OptionalSlashRouter()
router.register(r"settings", GlobalPreferencesViewSet, basename="settings")
router.register(r"activity", activity_views.ActivityViewSet, "activity")
router.register(r"tags", views.TagViewSet, "tags")
@ -79,8 +80,8 @@ v1_patterns += [
r"^oauth/",
include(("funkwhale_api.users.oauth.urls", "oauth"), namespace="oauth"),
),
url(r"^token/$", jwt_views.obtain_jwt_token, name="token"),
url(r"^token/refresh/$", jwt_views.refresh_jwt_token, name="token_refresh"),
url(r"^token/?$", jwt_views.obtain_jwt_token, name="token"),
url(r"^token/refresh/?$", jwt_views.refresh_jwt_token, name="token_refresh"),
]
urlpatterns = [