From 811fd29d97c351a1c65678e86de135b5f5d790c9 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sun, 1 Aug 2021 22:29:05 +0200
Subject: [PATCH] Allow apps to dynamically generate OAuth scopes
This replaces the settings merging for the static
`OAUTH2_PROVIDER["SCOPES"]` setting.
Attention: Breaking change, only release with next major version. Can
be backported to minor release if support for old mechanism is glued
into the new one, with a deprecation warning.
(cherry picked from commit 1aabacaeb74f76b426bae21c7305bdc6fdeee7c3)
---
aleksis/core/apps.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/aleksis/core/apps.py b/aleksis/core/apps.py
index fec8a1bd8..c14af908f 100644
--- a/aleksis/core/apps.py
+++ b/aleksis/core/apps.py
@@ -138,12 +138,8 @@ class CoreConfig(AppConfig):
# Save the associated person to pick up defaults
user.person.save()
-<<<<<<< HEAD
@classmethod
def get_all_scopes(cls) -> dict[str, str]:
-=======
- def get_all_scopes(self) -> dict[str, str]:
->>>>>>> 1aabacae (Allow apps to dynamically generate OAuth scopes)
scopes = {
"read": "Read anything the resource owner can read",
"write": "Write anything the resource owner can write",
--
GitLab