Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
70d1b6ab
Unverified
Commit
70d1b6ab
authored
4 years ago
by
Dirk Klimpel
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Re-Activating account when local passwords are disabled (#9587)
Fixes: #8393
parent
a7a37900
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/9587.bugfix
+1
-0
1 addition, 0 deletions
changelog.d/9587.bugfix
synapse/rest/admin/users.py
+4
-1
4 additions, 1 deletion
synapse/rest/admin/users.py
with
5 additions
and
1 deletion
changelog.d/9587.bugfix
0 → 100644
+
1
−
0
View file @
70d1b6ab
Re-Activating account with admin API when local passwords are disabled.
\ No newline at end of file
This diff is collapsed.
Click to expand it.
synapse/rest/admin/users.py
+
4
−
1
View file @
70d1b6ab
...
...
@@ -269,7 +269,10 @@ class UserRestServletV2(RestServlet):
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.
"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment