diff --git a/src/documents/context_processors.py b/src/documents/context_processors.py index 90c856aeb..6e14707bb 100644 --- a/src/documents/context_processors.py +++ b/src/documents/context_processors.py @@ -5,4 +5,9 @@ def settings(request): return { "EMAIL_ENABLED": django_settings.EMAIL_HOST != "localhost" or django_settings.EMAIL_HOST_USER != "", + "DISABLE_NORMAL_AUTH": django_settings.SOCIAL_AUTH_DISABLE_NORMAL_AUTH, + "OIDC_ENABLE": django_settings.SOCIAL_AUTH_OIDC_ENABLE, + "OIDC_NAME": django_settings.SOCIAL_AUTH_OIDC_NAME + if django_settings.SOCIAL_AUTH_OIDC_ENABLE + else None, } diff --git a/src/documents/templates/registration/login.html b/src/documents/templates/registration/login.html index 73e80fcf8..97e5f3238 100644 --- a/src/documents/templates/registration/login.html +++ b/src/documents/templates/registration/login.html @@ -52,7 +52,7 @@ {% translate "Share link has expired." %} {% endif %} - {% if not SOCIAL_AUTH_DISABLE_NORMAL_AUTH %} + {% if not DISABLE_NORMAL_AUTH %} {% translate "Username" as i18n_username %} {% translate "Password" as i18n_password %}
@@ -72,8 +72,8 @@
{% endif %} {% endif %} - {% if SOCIAL_AUTH_OIDC_ENABLE %} - {{ SOCIAL_AUTH_OIDC_NAME }} + {% if OIDC_ENABLE %} + {{ OIDC_NAME }} {% endif %} diff --git a/src/paperless/context_processors.py b/src/paperless/context_processors.py deleted file mode 100644 index 6fd946a5b..000000000 --- a/src/paperless/context_processors.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.conf import settings as django_settings - - -def settings(request): - return {"settings": django_settings} diff --git a/src/paperless/settings.py b/src/paperless/settings.py index 1f5daef50..2738068da 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -389,8 +389,8 @@ AUTHENTICATION_BACKENDS = [ SOCIAL_AUTH_DISABLE_NORMAL_AUTH = __get_boolean("PAPERLESS_SSO_DISABLE_NORMAL_AUTH") # Only support OIDC, but it should be easy to enable more backends -if __get_boolean("PAPERLESS_SSO_OIDC_ENABLE"): - SOCIAL_AUTH_OIDC_ENABLE = True +SOCIAL_AUTH_OIDC_ENABLE = __get_boolean("PAPERLESS_SSO_OIDC_ENABLE") +if SOCIAL_AUTH_OIDC_ENABLE: AUTHENTICATION_BACKENDS.append( "social_core.backends.open_id_connect.OpenIdConnectAuth", )