Re-Activating account when local passwords are disabled (#9587)

Fixes: #8393
matrix-org · Mar 11, 2021 · 70d1b6a · 70d1b6a
1 parent a7a3790
commit 70d1b6a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/changelog.d/9587.bugfix b/changelog.d/9587.bugfix
@@ -0,0 +1 @@
+Re-Activating account with admin API when local passwords are disabled.
diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py
@@ -269,7 +269,10 @@ async def on_PUT(
                         target_user.to_string(), False, requester, by_admin=True
                     )
                 elif not deactivate and user["deactivated"]:
-                    if "password" not in body:
+                    if (
+                        "password" not in body
+                        and self.hs.config.password_localdb_enabled
+                    ):
                         raise SynapseError(
                             400, "Must provide a password to re-activate an account."
                         )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Re-Activating account with admin API when local passwords are disabled.