From 17a2433b0dcd9659d53703e8d94d5c4488d250cf Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Wed, 15 Apr 2020 10:36:33 -0400
Subject: [PATCH] Add notes to the changelog about an additional SSO template.
 (#7259)

---
 CHANGES.md              | 12 ++++++++----
 changelog.d/7259.bugfix |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/7259.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 96021a5e69..6f25b26a55 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,10 +1,14 @@
 Next version
 ============
 
-* A new template (`sso_auth_confirm.html`) was added to Synapse. If your Synapse
-  is configured to use SSO and a custom `sso_redirect_confirm_template_dir`
-  configuration then this template will need to be duplicated into that
-  directory.
+* Two new templates (`sso_auth_confirm.html` and `sso_account_deactivated.html`)
+  were added to Synapse. If your Synapse is configured to use SSO and a custom 
+  `sso_redirect_confirm_template_dir` configuration then these templates will
+  need to be duplicated into that directory.
+
+* Plugins using the `complete_sso_login` method of `synapse.module_api.ModuleApi`
+  should update to using the async/await version `complete_sso_login_async` which
+  includes additional checks. The non-async version is considered deprecated.
 
 Synapse 1.12.3 (2020-04-03)
 ===========================
diff --git a/changelog.d/7259.bugfix b/changelog.d/7259.bugfix
new file mode 100644
index 0000000000..55bb06be8c
--- /dev/null
+++ b/changelog.d/7259.bugfix
@@ -0,0 +1 @@
+ Do not allow a deactivated user to login via SSO.
-- 
GitLab