Merge branch '518-keyerror-scopes-with-oauth2_provider' into 'master'

Resolve "KeyError: 'SCOPES'  with OAUTH2_PROVIDER"

Closes #518

See merge request !736

CHANGELOG.rst

@@ -6,6 +6,14 @@ 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`_.
 
+Unreleased
+----------
+
+Fixed
+~~~~~
+
+* Configuration mechanisms for OpenID Connect were broken.
+
 `2.0rc6`_ - 2021-10-11
 ----------------------
 

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/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 = {