Skip to content

Commit 8cc1e11

Browse files
committed
chore(controller) change urlpatterns order
1 parent 2c56ef9 commit 8cc1e11

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

rootfs/api/urls.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@
1414
# Add the generated REST URLs and login/logout endpoint
1515
app_urlpatterns = [
1616
url(r'^', include(router.urls)),
17-
url(r'^login/(?P<backend>[^/]+){0}$'.format(extra), views.auth,
18-
name='begin'),
19-
url(r'^complete/(?P<backend>[^/]+){0}$'.format(extra), views.complete,
20-
name='complete'),
21-
url('', include('social_django.urls', namespace='social')),
2217
url(r'auth/login/?$', views.AuthLoginView.as_view({"post": "login"})),
2318
url(r'auth/token/(?P<key>[-_\w]+)/?$', views.AuthTokenView.as_view({"get": "token"})),
2419
# application release components
@@ -154,6 +149,12 @@
154149
views.WorkflowManagerViewset.as_view({'post': 'block'})),
155150
url(r'^manager/(?P<type>[\w.@+-]+)s/(?P<id>{})/unblock/?$'.format(settings.APP_URL_REGEX),
156151
views.WorkflowManagerViewset.as_view({'delete': 'unblock'})),
152+
# social login is placed at the end of the URL match
153+
url(r'^login/(?P<backend>[^/]+){0}$'.format(extra), views.auth,
154+
name='begin'),
155+
url(r'^complete/(?P<backend>[^/]+){0}$'.format(extra), views.complete,
156+
name='complete'),
157+
url('', include('social_django.urls', namespace='social')),
157158
]
158159

159160
webhook_urlpatterns = [

0 commit comments

Comments
 (0)