From 196467bca96e68da6a97a5061bdf2a3cd43cff1a Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sun, 6 Nov 2022 11:48:55 +0100
Subject: [PATCH] Downgrade OAuth toolkit to 1.7.1 and release bugfix

---
 CHANGELOG.rst  | 9 +++++++++
 docs/conf.py   | 2 +-
 pyproject.toml | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bb1f68077..6c55f4f79 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`_.
 
+`2.12.1`_ - 2022-11-06
+----------------------
+
+Fixed
+~~~~~
+
+* An invalid backport caused OIDC clients without PKCD to fail.
+
 `2.12`_ - 2022-11-04
 --------------------
 
@@ -957,3 +965,4 @@ Fixed
 .. _2.11: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.11
 .. _2.11.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.11.1
 .. _2.12: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.12
+.. _2.12.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.12.1
diff --git a/docs/conf.py b/docs/conf.py
index 51551fae3..e8d125a40 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -31,7 +31,7 @@ author = "The AlekSIS Team"
 # The short X.Y version
 version = "2.12"
 # The full version, including alpha/beta/rc tags
-release = "2.12"
+release = "2.12.1"
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/pyproject.toml b/pyproject.toml
index 093d1ea74..93a54f084 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "AlekSIS-Core"
-version = "2.12"
+version = "2.12.1"
 packages = [
     { include = "aleksis" }
 ]
@@ -114,7 +114,7 @@ django-allauth = "^0.51.0"
 django-uwsgi-ng = "^1.1.0"
 django-extensions = "^3.1.1"
 ipython = "^8.0.0"
-django-oauth-toolkit = "^2.0.0"
+django-oauth-toolkit = "^1.7.1"
 django-redis = "^5.0.0"
 django-storages = {version = "^1.11.1", optional = true}
 boto3 = {version = "^1.17.33", optional = true}
-- 
GitLab