Skip to content

Commit

Permalink
unify naming (#1367)
Browse files Browse the repository at this point in the history
  • Loading branch information
mikkonie committed Jun 21, 2024
1 parent b1ecde4 commit 15bbbd5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions config/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,9 +440,9 @@
# OpenID configuration
# ------------------------------------------------------------------------------

ENABLE_OPENIDC = env.bool('ENABLE_OPENIDC', False)
ENABLE_OIDC = env.bool('ENABLE_OIDC', False)

if ENABLE_OPENIDC:
if ENABLE_OIDC:
INSTALLED_APPS.append('social_django')
AUTHENTICATION_BACKENDS = tuple(
itertools.chain(
Expand Down
2 changes: 1 addition & 1 deletion config/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
path('examples/site/', include('example_site_app.urls')),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

if settings.ENABLE_OPENIDC:
if settings.ENABLE_OIDC:
urlpatterns.append(path('social/', include('social_django.urls')))

if settings.DEBUG:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<div class="col-md-4 mx-auto mt-4">
<a role="button" class="btn btn-md btn-info btn-block"
id="sodar-login-openid-submit"
id="sodar-login-oidc-link"
href="{% url 'social:begin' 'oidc' %}">
<i class="iconify" data-icon="mdi:login-variant"></i> OpenIDC Login
<i class="iconify" data-icon="mdi:login-variant"></i> OpenID Connect Login
</a>
</div>
10 changes: 5 additions & 5 deletions projectroles/templates/projectroles/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ <h2 class="sodar-pr-content-title">Login</h2>
{# Path for template includes #}
{% get_django_setting 'PROJECTROLES_TEMPLATE_INCLUDE_PATH' as template_include_path %}

{# OpenIDC auth #}
{% get_django_setting 'ENABLE_OPENIDC' as enable_openidc %}
{% template_exists template_include_path|add:'/_login_openidc.html' as tpl_openidc %}
{% if enable_openidc and tpl_openidc %}
{% include template_include_path|add:'/_login_openidc.html' %}
{# OpenID Connect auth #}
{% get_django_setting 'ENABLE_OIDC' as enable_oidc %}
{% template_exists template_include_path|add:'/_login_oidc.html' as tpl_oidc %}
{% if enable_oidc and tpl_oidc %}
{% include template_include_path|add:'/_login_oidc.html' %}
{% endif %}

{# Optional template for additional login page HTML #}
Expand Down

0 comments on commit 15bbbd5

Please sign in to comment.