Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Allow accounts to be re-activated from the admin APIs #7847

Merged
merged 7 commits into from
Jul 15, 2020

Conversation

clokep
Copy link
Member

@clokep clokep commented Jul 14, 2020

Fixes #7220

This allows accounts to be re-activated via the admin API. There is no effort to re-join rooms, etc. it simply sets the flag on the database to set the account as active. The API requires that the password is set as well, to allow the account to log back in.

This updates the PUT /_synapse/admin/v2/users/<user_id> endpoint, but there's also a POST /_synapse/admin/v1/deactivate/<user_id> account. We can add a POST /_synapse/admin/v1/activate/<user_id> endpoint, but I don't really see the point, it would essentially be identical (minus you don't pass a "deactivated": false in the JSON).

@clokep clokep requested a review from a team July 14, 2020 15:28
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good other than some doc quibbles

docs/admin_api/user_admin_api.rst Show resolved Hide resolved
@clokep clokep requested a review from richvdh July 15, 2020 11:22
@clokep
Copy link
Member Author

clokep commented Jul 15, 2020

Thanks @richvdh! I made the changes to the documentation.

Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@clokep clokep merged commit 8c7d0f1 into develop Jul 15, 2020
@clokep clokep deleted the clokep/reactivate branch July 15, 2020 15:00
babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit 'a973bcb8a':
  Add some tiny type annotations (#7870)
  Remove obsolete comment.
  Ensure that calls to `json.dumps` are compatible with the standard library json. (#7836)
  Avoid brand new rooms in `delete_old_current_state_events` (#7854)
  Allow accounts to be re-activated from the admin APIs. (#7847)
  Fix tests
  Fix typo
  Newsfile
  Use get_users_in_room rather than state handler in typing for speed
  Fix client reader sharding tests (#7853)
  Convert E2E key and room key handlers to async/await. (#7851)
  Return the proper 403 Forbidden error during errors with JWT logins. (#7844)
  remove `retry_on_integrity_error` wrapper for persist_events (#7848)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reactivate an account
2 participants