diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6cffc8650ae871b8470d0d4bce8ec60588ccb86c..43236562e8a71b65a6456d735c799f145d57f3b5 100644 --- a/CHANGELOG.rst +++ b/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 ---------------------- diff --git a/aleksis/core/apps.py b/aleksis/core/apps.py index c14af908faab80f884372e60c6a7ba3ccb8378d0..b549995264811d731cb61a8ed934e579dcefc33e 100644 --- a/aleksis/core/apps.py +++ b/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 diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py index b606113f3fd765e7c4d7116770db5a8b00f738f9..25fe9257282488bbcd3948ed5c3f7e6d8bee771b 100644 --- a/aleksis/core/settings.py +++ b/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 = {