New admin API endpoint to reactivate users & align what lock/unlock/deactivate does in the admin API #4768
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Deploying matrix-authentication-service-docs with
|
| Latest commit: |
8ac2770
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://9d9449c8.matrix-authentication-service-docs.pages.dev |
| Branch Preview URL: | https://af-rest-reactivate.matrix-authentication-service-docs.pages.dev |
|
Marking this as draft until it makes use of #4775 to test the updating of the |
sandhose
requested changes
Jul 15, 2025
AndrewFerr
force-pushed
the
af/rest-reactivate
branch
from
9e89708 to
4c40c25
Compare
sandhose
requested changes
Jul 16, 2025
- Allow the admin API to deactivate a user without locking it, and to unlock a user without reactivating it. - Make unlock-and-reactivate flows unset the "deactivated_at" timestamp. - Revert adding an "unlock" parameter on `ReactivateUserJob`, as the option is used only by the admin API which doesn't use a job.
Unify the admin API, CLI, and GraphQL API in not having the unlock command also reactivate, or the deactivate command also lock. Still let the unlock command of the CLI and GraphQL API to also reactivate the target user, albeit as a non-default option.
Unlike the CLI and admin API, leave the behaviour of the GraphQL's unlock handler unchanged from before, so as to not break internal tooling that depends on it. Also update its documentation description to make note of the fact that it reactivates in addition to unlocks.
AndrewFerr
force-pushed
the
af/rest-reactivate
branch
from
43806cd to
8ac2770
Compare
sandhose
approved these changes
Jul 17, 2025
sandhose
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #4740
This changes the lock/unlock/deactivate endpoints to: