From e22b0f75b8a2b95dc720e13b65b6f06c98aeb07b Mon Sep 17 00:00:00 2001
From: Chris Church <chris@ninemoreminutes.com>
Date: Tue, 15 Nov 2016 00:58:33 -0500
Subject: [PATCH 1/2] Fix social auth callback URLs to depend on TOWER_URL_BASE
 so they are updated when it changes.

---
 awx/sso/conf.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/awx/sso/conf.py b/awx/sso/conf.py
index 45f75b35af..f799642d17 100644
--- a/awx/sso/conf.py
+++ b/awx/sso/conf.py
@@ -510,6 +510,7 @@ register(
                 'callback URL for your application.'),
     category=_('Google OAuth2'),
     category_slug='google-oauth2',
+    depends_on=['TOWER_URL_BASE'],
 )
 
 register(
@@ -600,6 +601,7 @@ register(
                 'as the callback URL for your application.'),
     category=_('GitHub OAuth2'),
     category_slug='github',
+    depends_on=['TOWER_URL_BASE'],
 )
 
 register(
@@ -662,6 +664,7 @@ register(
                 'Provide this URL as the callback URL for your application.'),
     category=_('GitHub Organization OAuth2'),
     category_slug='github-org',
+    depends_on=['TOWER_URL_BASE'],
 )
 
 register(
@@ -735,6 +738,7 @@ register(
                 'Provide this URL as the callback URL for your application.'),
     category=_('GitHub Team OAuth2'),
     category_slug='github-team',
+    depends_on=['TOWER_URL_BASE'],
 )
 
 register(
@@ -810,6 +814,7 @@ register(
                 'and this callback URL for your application.'),
     category=_('SAML'),
     category_slug='saml',
+    depends_on=['TOWER_URL_BASE'],
 )
 
 register(

From 89c629e796b160383502f63fa1fa6cc9cca59826 Mon Sep 17 00:00:00 2001
From: Chris Church <chris@ninemoreminutes.com>
Date: Tue, 15 Nov 2016 00:59:10 -0500
Subject: [PATCH 2/2] Never return database values for read-only fields.

---
 awx/conf/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/conf/views.py b/awx/conf/views.py
index f6af0329d2..b1065ae453 100644
--- a/awx/conf/views.py
+++ b/awx/conf/views.py
@@ -68,7 +68,7 @@ class SettingSingletonDetail(RetrieveUpdateDestroyAPIView):
         if self.category_slug not in category_slugs:
             raise PermissionDenied()
 
-        registered_settings = settings_registry.get_registered_settings(category_slug=self.category_slug)
+        registered_settings = settings_registry.get_registered_settings(category_slug=self.category_slug, read_only=False)
         if self.category_slug == 'user':
             return Setting.objects.filter(key__in=registered_settings, user=self.request.user)
         else: