Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-09 20:40:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove refernces to optional SSO configuration

Browse Source
This commit is contained in:
Adarnof 2016-12-29 18:34:21 -05:00
parent 04f2731517
commit 2f5529b582
4 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
alliance_auth/settings.py.example
View File

@ -111,7 +111,6 @@ TEMPLATES = [
'notifications.context_processors.user_notification_count', 'notifications.context_processors.user_notification_count',
'authentication.context_processors.states', 'authentication.context_processors.states',
'authentication.context_processors.membership_state', 'authentication.context_processors.membership_state',
'authentication.context_processors.sso',
'groupmanagement.context_processors.can_manage_groups', 'groupmanagement.context_processors.can_manage_groups',
], ],
}, },
@ -225,15 +224,13 @@ SITE_NAME = os.environ.get('AA_SITE_NAME', 'Alliance Auth')
################### ###################
# SSO Settings # SSO Settings
################### ###################
# Optional SSO.
# Get client ID and client secret from registering an app at # Get client ID and client secret from registering an app at
# https://developers.eveonline.com/ # https://developers.eveonline.com/
# Callback URL should be http://mydomain.com/sso/callback # Callback URL should be https://mydomain.com/sso/callback
# Leave callback blank to hide SSO button on login page
################### ###################
ESI_SSO_CLIENT_ID = os.environ.get('AA_EVE_SSO_CLIENT_ID', '') ESI_SSO_CLIENT_ID = os.environ.get('AA_ESI_SSO_CLIENT_ID', '')
ESI_SSO_CLIENT_SECRET = os.environ.get('AA_EVE_SSO_CLIENT_SECRET', '') ESI_SSO_CLIENT_SECRET = os.environ.get('AA_ESI_SSO_CLIENT_SECRET', '')
ESI_SSO_CALLBACK_URL = os.environ.get('AA_EVE_SSO_CALLBACK_URL', '') ESI_SSO_CALLBACK_URL = os.environ.get('AA_ESI_SSO_CALLBACK_URL', '')
######################### #########################
# Default Group Settings # Default Group Settings

6
authentication/context_processors.py
View File

@ -15,9 +15,3 @@ def states(request):
'NONE_STATE': NONE_STATE, 'NONE_STATE': NONE_STATE,
'MEMBER_BLUE_STATE': [MEMBER_STATE, BLUE_STATE], 'MEMBER_BLUE_STATE': [MEMBER_STATE, BLUE_STATE],
} }
def sso(request):
return {
'EVE_SSO_CALLBACK_URL': settings.ESI_SSO_CALLBACK_URL,
}

10
stock/templates/public/index.html
View File

@ -43,15 +43,7 @@
<body> <body>
<div id="logo"> <div id="logo">
<p style="text-align:center"> <p style="text-align:center">
<!--Uncomment the below line to use a custom logo--> <img src="{% static 'img/index_images/logo.png' %}" border="0">
<!--<img src="{% static 'img/index_images/logo.png' %}" border="0">-->
<!--Comment the below block to use a custom logo-->
{% if IS_CORP %}
<img src="https://image.eveonline.com/Corporation/{{ CORP_ID }}_256.png" border="0">
{% else %}
<img src="https://image.eveonline.com/Alliance/{{ ALLIANCE_ID }}_128.png" border="0">
{% endif %}
<!--Stop commenting here-->
</p> </p>
</div> </div>
<div id="content"> <div id="content">

2
stock/templates/public/login.html
View File

@ -75,7 +75,6 @@
<a href="{% url 'auth_register_user' %}" class="btn btn-success btn-block btn-lg">{% trans "Register" %}</a> <a href="{% url 'auth_register_user' %}" class="btn btn-success btn-block btn-lg">{% trans "Register" %}</a>
</div> </div>
</div> </div>
{% if EVE_SSO_CALLBACK_URL %}
<br> <br>
<div class="col-md-12"> <div class="col-md-12">
<p style="text-align:center"> <p style="text-align:center">
@ -84,7 +83,6 @@
</a> </a>
</p> </p>
</div> </div>
{% endif %}
</div> </div>
</div> </div>