|
14 | 14 | # Add the generated REST URLs and login/logout endpoint |
15 | 15 | app_urlpatterns = [ |
16 | 16 | 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')), |
22 | 17 | url(r'auth/login/?$', views.AuthLoginView.as_view({"post": "login"})), |
23 | 18 | url(r'auth/token/(?P<key>[-_\w]+)/?$', views.AuthTokenView.as_view({"get": "token"})), |
24 | 19 | # application release components |
|
154 | 149 | views.WorkflowManagerViewset.as_view({'post': 'block'})), |
155 | 150 | url(r'^manager/(?P<type>[\w.@+-]+)s/(?P<id>{})/unblock/?$'.format(settings.APP_URL_REGEX), |
156 | 151 | 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')), |
157 | 158 | ] |
158 | 159 |
|
159 | 160 | webhook_urlpatterns = [ |
|
0 commit comments