From bb6a4f696462b5f50e78ea8b0df20496778f6a91 Mon Sep 17 00:00:00 2001
From: adamscmRH <chadams@redhat.com>
Date: Thu, 24 May 2018 15:28:17 -0400
Subject: [PATCH] fix oauth urls & rename for clarity

---
 awx/api/urls/{user_oauth.py => oauth2.py} | 4 +---
 awx/api/urls/{oauth.py => oauth2_root.py} | 0
 awx/api/urls/urls.py                      | 8 ++++----
 awx/api/urls/user.py                      | 4 ++--
 awx/api/views.py                          | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)
 rename awx/api/urls/{user_oauth.py => oauth2.py} (90%)
 rename awx/api/urls/{oauth.py => oauth2_root.py} (100%)

diff --git a/awx/api/urls/user_oauth.py b/awx/api/urls/oauth2.py
similarity index 90%
rename from awx/api/urls/user_oauth.py
rename to awx/api/urls/oauth2.py
index 3b290dbf01..6e9eea3d9f 100644
--- a/awx/api/urls/user_oauth.py
+++ b/awx/api/urls/oauth2.py
@@ -11,7 +11,6 @@ from awx.api.views import (
     OAuth2TokenList,
     OAuth2TokenDetail,
     OAuth2TokenActivityStreamList,
-    OAuth2PersonalTokenList
 )
 
 
@@ -42,8 +41,7 @@ urls = [
         r'^tokens/(?P<pk>[0-9]+)/activity_stream/$',
         OAuth2TokenActivityStreamList.as_view(),
         name='o_auth2_token_activity_stream_list'
-    ),
-    url(r'^personal_tokens/$', OAuth2PersonalTokenList.as_view(), name='user_personal_token_list'),    
+    ),   
 ]
 
 __all__ = ['urls']
diff --git a/awx/api/urls/oauth.py b/awx/api/urls/oauth2_root.py
similarity index 100%
rename from awx/api/urls/oauth.py
rename to awx/api/urls/oauth2_root.py
diff --git a/awx/api/urls/urls.py b/awx/api/urls/urls.py
index e282a73e5f..52e9ef1cf0 100644
--- a/awx/api/urls/urls.py
+++ b/awx/api/urls/urls.py
@@ -67,8 +67,8 @@ from .schedule import urls as schedule_urls
 from .activity_stream import urls as activity_stream_urls
 from .instance import urls as instance_urls
 from .instance_group import urls as instance_group_urls
-from .user_oauth import urls as user_oauth_urls
-from .oauth import urls as oauth_urls
+from .oauth2 import urls as oauth2_urls
+from .oauth2_root import urls as oauth2_root_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]+)/tokens/$', ApplicationOAuth2TokenList.as_view(), name='application_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'
@@ -145,7 +145,7 @@ urlpatterns = [
     url(r'^logout/$', LoggedLogoutView.as_view(
         next_page='/api/', redirect_field_name='next'
     ), name='logout'),
-    url(r'^o/', include(oauth_urls)),
+    url(r'^o/', include(oauth2_root_urls)),
 ]
 if settings.SETTINGS_MODULE == 'awx.settings.development':
     from awx.api.swagger import SwaggerSchemaView
diff --git a/awx/api/urls/user.py b/awx/api/urls/user.py
index c3c896af24..ca8d531f46 100644
--- a/awx/api/urls/user.py
+++ b/awx/api/urls/user.py
@@ -16,7 +16,7 @@ from awx.api.views import (
     UserAccessList,
     OAuth2ApplicationList,
     OAuth2UserTokenList,
-    OAuth2PersonalTokenList,
+    UserPersonalTokenList,
     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]+)/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]+)/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'),
     
 ] 
 
diff --git a/awx/api/views.py b/awx/api/views.py
index bd789ef9b7..d319cb88df 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -1639,7 +1639,7 @@ class OrganizationApplicationList(SubListCreateAPIView):
     swagger_topic = 'Authentication'
 
 
-class OAuth2PersonalTokenList(SubListCreateAPIView):
+class UserPersonalTokenList(SubListCreateAPIView):
     
     view_name = _("OAuth2 Personal Access Tokens")