External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix oauth urls & rename for clarity

Browse Source
This commit is contained in:
adamscmRH
2018-05-24 15:28:17 -04:00
parent 3d5605f4b5
commit bb6a4f6964
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/urls/user_oauth.py → awx/api/urls/oauth2.py
View File

@@ -11,7 +11,6 @@ from awx.api.views import (
OAuth2TokenList, OAuth2TokenList,
OAuth2TokenDetail, OAuth2TokenDetail,
OAuth2TokenActivityStreamList, OAuth2TokenActivityStreamList,
OAuth2PersonalTokenList
) )
@@ -43,7 +42,6 @@ urls = [
OAuth2TokenActivityStreamList.as_view(), OAuth2TokenActivityStreamList.as_view(),
name='o_auth2_token_activity_stream_list' name='o_auth2_token_activity_stream_list'
), ),
url(r'^personal_tokens/$', OAuth2PersonalTokenList.as_view(), name='user_personal_token_list'),
] ]
__all__ = ['urls'] __all__ = ['urls']

0
awx/api/urls/oauth.py → awx/api/urls/oauth2_root.py
View File

8
awx/api/urls/urls.py
View File

@@ -67,8 +67,8 @@ from .schedule import urls as schedule_urls
from .activity_stream import urls as activity_stream_urls from .activity_stream import urls as activity_stream_urls
from .instance import urls as instance_urls from .instance import urls as instance_urls
from .instance_group import urls as instance_group_urls from .instance_group import urls as instance_group_urls
from .user_oauth import urls as user_oauth_urls from .oauth2 import urls as oauth2_urls
from .oauth import urls as oauth_urls from .oauth2_root import urls as oauth2_root_urls
v1_urls = [ v1_urls = [
@@ -130,7 +130,7 @@ v2_urls = [
url(r'^applications/(?P<pk>[0-9]+)/$', OAuth2ApplicationDetail.as_view(), name='o_auth2_application_detail'), url(r'^applications/(?P<pk>[0-9]+)/$', OAuth2ApplicationDetail.as_view(), name='o_auth2_application_detail'),
url(r'^applications/(?P<pk>[0-9]+)/tokens/$', ApplicationOAuth2TokenList.as_view(), name='application_o_auth2_token_list'), url(r'^applications/(?P<pk>[0-9]+)/tokens/$', ApplicationOAuth2TokenList.as_view(), name='application_o_auth2_token_list'),
url(r'^tokens/$', OAuth2TokenList.as_view(), name='o_auth2_token_list'), url(r'^tokens/$', OAuth2TokenList.as_view(), name='o_auth2_token_list'),
url(r'^', include(user_oauth_urls)), url(r'^', include(oauth2_urls)),
] ]
app_name = 'api' app_name = 'api'
@@ -145,7 +145,7 @@ urlpatterns = [
url(r'^logout/$', LoggedLogoutView.as_view( url(r'^logout/$', LoggedLogoutView.as_view(
next_page='/api/', redirect_field_name='next' next_page='/api/', redirect_field_name='next'
), name='logout'), ), name='logout'),
url(r'^o/', include(oauth_urls)), url(r'^o/', include(oauth2_root_urls)),
] ]
if settings.SETTINGS_MODULE == 'awx.settings.development': if settings.SETTINGS_MODULE == 'awx.settings.development':
from awx.api.swagger import SwaggerSchemaView from awx.api.swagger import SwaggerSchemaView

4
awx/api/urls/user.py
View File

@@ -16,7 +16,7 @@ from awx.api.views import (
UserAccessList, UserAccessList,
OAuth2ApplicationList, OAuth2ApplicationList,
OAuth2UserTokenList, OAuth2UserTokenList,
OAuth2PersonalTokenList, UserPersonalTokenList,
UserAuthorizedTokenList, UserAuthorizedTokenList,
) )
@@ -34,7 +34,7 @@ urls = [
url(r'^(?P<pk>[0-9]+)/applications/$', OAuth2ApplicationList.as_view(), name='o_auth2_application_list'), url(r'^(?P<pk>[0-9]+)/applications/$', OAuth2ApplicationList.as_view(), name='o_auth2_application_list'),
url(r'^(?P<pk>[0-9]+)/tokens/$', OAuth2UserTokenList.as_view(), name='o_auth2_token_list'), url(r'^(?P<pk>[0-9]+)/tokens/$', OAuth2UserTokenList.as_view(), name='o_auth2_token_list'),
url(r'^(?P<pk>[0-9]+)/authorized_tokens/$', UserAuthorizedTokenList.as_view(), name='user_authorized_token_list'), url(r'^(?P<pk>[0-9]+)/authorized_tokens/$', UserAuthorizedTokenList.as_view(), name='user_authorized_token_list'),
url(r'^(?P<pk>[0-9]+)/personal_tokens/$', OAuth2PersonalTokenList.as_view(), name='user_personal_token_list'), url(r'^(?P<pk>[0-9]+)/personal_tokens/$', UserPersonalTokenList.as_view(), name='user_personal_token_list'),
] ]

2
awx/api/views.py
View File

@@ -1639,7 +1639,7 @@ class OrganizationApplicationList(SubListCreateAPIView):
swagger_topic = 'Authentication' swagger_topic = 'Authentication'
class OAuth2PersonalTokenList(SubListCreateAPIView): class UserPersonalTokenList(SubListCreateAPIView):
view_name = _("OAuth2 Personal Access Tokens") view_name = _("OAuth2 Personal Access Tokens")