Merge branch 'prepare-release-2.0rc7' into 'release/2.0'

Prepare release 2.0rc7

See merge request !742

CHANGELOG.rst

@@ -6,6 +6,22 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog`_,
 and this project adheres to `Semantic Versioning`_.
 
+`2.0rc7`_ - 2021-10-18
+----------------------
+
+Fixed
+~~~~~
+
+* Configuration mechanisms for OpenID Connect were broken.
+* Set a fixed version for django-sass-processor to avoid a bug with searching ``style.css`` in the wrong storage.
+* Correct the z-index of the navbar to display the main title again on mobile devices.
+
+Removed
+~~~~~~~
+
+* Leftovers from a functionality already dropped in the development process
+  (custom authentication backends and alternative login views).
+
 `2.0rc6`_ - 2021-10-11
 ----------------------
 
@@ -360,3 +376,4 @@ Fixed
 .. _2.0rc4: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0rc4
 .. _2.0rc5: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0rc5
 .. _2.0rc6: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0rc6
+.. _2.0rc7: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0rc7

aleksis/core/apps.py

@@ -5,6 +5,7 @@ from django.apps import apps
 from django.conf import settings
 from django.http import HttpRequest
 from django.utils.module_loading import autodiscover_modules
+from django.utils.translation import gettext as _
 
 from dynamic_preferences.registries import preference_models
 from health_check.plugins import plugin_dir

aleksis/core/preferences.py

@@ -246,20 +246,6 @@ class SchoolNameOfficial(StringPreference):
     verbose_name = _("Official name of the school, e.g. as given by supervisory authority")
 
 
-@site_preferences_registry.register
-class AuthenticationBackends(MultipleChoicePreference):
-    """Authentication backends of your AlekSIS instance."""
-
-    section = auth
-    name = "backends"
-    default = None
-    verbose_name = _("Enabled custom authentication backends")
-    field_attribute = {"initial": []}
-
-    def get_choices(self):
-        return [(b, b) for b in settings.CUSTOM_AUTHENTICATION_BACKENDS]
-
-
 @site_preferences_registry.register
 class AllowPasswordChange(BooleanPreference):
     section = auth

aleksis/core/settings.py

@@ -338,16 +338,6 @@ if _settings.get("oauth2.oidc.enabled", False):
             #        "OIDC_ISS_ENDPOINT": _settings.get("oauth2.oidc.issuer_name", "example.com"),
         }
     )
-    OAUTH2_PROVIDER["SCOPES"].update(
-        {
-            "openid": _("OpenID Connect scope"),
-            "profile": _("Given name, family name, link to profile and picture if existing."),
-            "address": _("Full home postal address"),
-            "email": _("Email address"),
-            "phone": _("Home and mobile phone"),
-            "groups": _("Groups"),
-        }
-    )
 
 # Configuration for REST framework
 REST_FRAMEWORK = {
@@ -448,9 +438,6 @@ if _settings.get("ldap.uri", None):
                 "is_superuser"
             ]
 
-CUSTOM_AUTHENTICATION_BACKENDS = []
-merge_app_settings("AUTHENTICATION_BACKENDS", CUSTOM_AUTHENTICATION_BACKENDS)
-
 # Add ModelBckend last so all other backends get a chance
 # to verify passwords first
 AUTHENTICATION_BACKENDS.append("django.contrib.auth.backends.ModelBackend")
@@ -458,10 +445,6 @@ AUTHENTICATION_BACKENDS.append("django.contrib.auth.backends.ModelBackend")
 # Authentication backend for django-allauth.
 AUTHENTICATION_BACKENDS.append("allauth.account.auth_backends.AuthenticationBackend")
 
-# Structure of items: backend, URL name, icon name, button title
-ALTERNATIVE_LOGIN_VIEWS = []
-merge_app_settings("ALTERNATIVE_LOGIN_VIEWS", ALTERNATIVE_LOGIN_VIEWS, True)
-
 # Internationalization
 # https://docs.djangoproject.com/en/2.1/topics/i18n/
 

aleksis/core/static/style.scss

@@ -87,12 +87,6 @@ header, main, footer {
   width: auto;
 }
 
-@media only screen and (max-width: 993px) {
-  header div.nav-wrapper {
-    z-index: -5;
-  }
-}
-
 
 /********/
 /* MAIN */

aleksis/core/util/core_helpers.py

@@ -210,14 +210,6 @@ def custom_information_processor(request: HttpRequest) -> dict:
 
     return {
         "FOOTER_MENU": CustomMenu.get_default("footer"),
-        "ALTERNATIVE_LOGIN_VIEWS_LIST": [
-            a[0]
-            for a in settings.ALTERNATIVE_LOGIN_VIEWS
-            if a[0] in settings.AUTHENTICATION_BACKENDS
-        ],
-        "ALTERNATIVE_LOGIN_VIEWS": [
-            a for a in settings.ALTERNATIVE_LOGIN_VIEWS if a[0] in settings.AUTHENTICATION_BACKENDS
-        ],
         "ADMINS": settings.ADMINS,
         "PWA_ICONS": regrouped_pwa_icons,
     }

docs/conf.py

@@ -31,7 +31,7 @@ author = "AlekSIS team"
 # The short X.Y version
 version = "2.0"
 # The full version, including alpha/beta/rc tags
-release = "2.0rc6"
+release = "2.0rc7"
 
 
 # -- General configuration ---------------------------------------------------

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-Core"
-version = "2.0rc6"
+version = "2.0rc7"
 packages = [
     { include = "aleksis" }
 ]
@@ -53,7 +53,7 @@ django-debug-toolbar = "^3.2"
 django-menu-generator-ng = "^1.2.3"
 django-tables2 = "^2.1"
 django-phonenumber-field = {version = "^5.2", extras = ["phonenumbers"]}
-django-sass-processor = "^1.0"
+django-sass-processor = "1.0"
 libsass = "^0.21.0"
 colour = "^0.1.5"
 dynaconf = {version = "^3.1", extras = ["yaml", "toml", "ini"]}