From 2f5529b58291cc6538941452666df7299db140e9 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Thu, 29 Dec 2016 18:34:21 -0500 Subject: [PATCH] Remove refernces to optional SSO configuration --- alliance_auth/settings.py.example | 11 ++++------- authentication/context_processors.py | 6 ------ stock/templates/public/index.html | 12 ++---------- stock/templates/public/login.html | 18 ++++++++---------- 4 files changed, 14 insertions(+), 33 deletions(-) diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index f977a268..ede008a7 100644 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -111,7 +111,6 @@ TEMPLATES = [ 'notifications.context_processors.user_notification_count', 'authentication.context_processors.states', 'authentication.context_processors.membership_state', - 'authentication.context_processors.sso', 'groupmanagement.context_processors.can_manage_groups', ], }, @@ -225,15 +224,13 @@ SITE_NAME = os.environ.get('AA_SITE_NAME', 'Alliance Auth') ################### # SSO Settings ################### -# Optional SSO. # Get client ID and client secret from registering an app at # https://developers.eveonline.com/ -# Callback URL should be http://mydomain.com/sso/callback -# Leave callback blank to hide SSO button on login page +# Callback URL should be https://mydomain.com/sso/callback ################### -ESI_SSO_CLIENT_ID = os.environ.get('AA_EVE_SSO_CLIENT_ID', '') -ESI_SSO_CLIENT_SECRET = os.environ.get('AA_EVE_SSO_CLIENT_SECRET', '') -ESI_SSO_CALLBACK_URL = os.environ.get('AA_EVE_SSO_CALLBACK_URL', '') +ESI_SSO_CLIENT_ID = os.environ.get('AA_ESI_SSO_CLIENT_ID', '') +ESI_SSO_CLIENT_SECRET = os.environ.get('AA_ESI_SSO_CLIENT_SECRET', '') +ESI_SSO_CALLBACK_URL = os.environ.get('AA_ESI_SSO_CALLBACK_URL', '') ######################### # Default Group Settings diff --git a/authentication/context_processors.py b/authentication/context_processors.py index 6641ad57..1f3084f9 100644 --- a/authentication/context_processors.py +++ b/authentication/context_processors.py @@ -15,9 +15,3 @@ def states(request): 'NONE_STATE': NONE_STATE, 'MEMBER_BLUE_STATE': [MEMBER_STATE, BLUE_STATE], } - - -def sso(request): - return { - 'EVE_SSO_CALLBACK_URL': settings.ESI_SSO_CALLBACK_URL, - } diff --git a/stock/templates/public/index.html b/stock/templates/public/index.html index f2b41bbf..f0e8d755 100644 --- a/stock/templates/public/index.html +++ b/stock/templates/public/index.html @@ -43,16 +43,8 @@

diff --git a/stock/templates/public/login.html b/stock/templates/public/login.html index c8ecfa23..03ec37d9 100644 --- a/stock/templates/public/login.html +++ b/stock/templates/public/login.html @@ -75,16 +75,14 @@ {% trans "Register" %}

- {% if EVE_SSO_CALLBACK_URL %} -
-
-

- - - -

-
- {% endif %} +
+
+

+ + + +

+