From 15bbbd5768b0e9f146fafe4faa874e105bb5d226 Mon Sep 17 00:00:00 2001
From: Mikko Nieminen <mikko.nieminen@bih-charite.de>
Date: Wed, 17 Apr 2024 15:17:43 +0200
Subject: [PATCH] unify naming (#1367)

---
 config/settings/base.py                                |  4 ++--
 config/urls.py                                         |  2 +-
 .../include/{_login_openidc.html => _login_oidc.html}  |  4 ++--
 projectroles/templates/projectroles/login.html         | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename example_site/templates/include/{_login_openidc.html => _login_oidc.html} (85%)

diff --git a/config/settings/base.py b/config/settings/base.py
index bd7268c3..7805dc15 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -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(
diff --git a/config/urls.py b/config/urls.py
index 3e285700..9917ba37 100644
--- a/config/urls.py
+++ b/config/urls.py
@@ -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:
diff --git a/example_site/templates/include/_login_openidc.html b/example_site/templates/include/_login_oidc.html
similarity index 85%
rename from example_site/templates/include/_login_openidc.html
rename to example_site/templates/include/_login_oidc.html
index 6481e6e4..c5f97381 100644
--- a/example_site/templates/include/_login_openidc.html
+++ b/example_site/templates/include/_login_oidc.html
@@ -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>
diff --git a/projectroles/templates/projectroles/login.html b/projectroles/templates/projectroles/login.html
index f40fcccc..7acfdffa 100644
--- a/projectroles/templates/projectroles/login.html
+++ b/projectroles/templates/projectroles/login.html
@@ -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 #}