Return M_USER_LOCKED error when logging in with a locked account on the compatibility endpoints
#4789
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: |
6183cae
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://60a93d42.matrix-authentication-service-docs.pages.dev |
| Branch Preview URL: | https://af-user-locked-errors.matrix-authentication-service-docs.pages.dev |
sandhose
reviewed
Jul 15, 2025
| browser_session.id = %browser_session_id, | ||
| "Attempt to exchange login token but browser session is not active" | ||
| ); | ||
| return Err(RouteError::InvalidLoginToken); |
There was a problem hiding this comment.
I think it would be more readable to check if the user is locked earlier
if browser_session.user.locked_at.is_some() {
return Err(RouteError::UserLocked);
}
if !browser_session.active() || !browser_session.user.is_valid() {
// ...
}It changes a little bit what error we show in what condition, but it's an edge-case anyway, as usually we would show a user comprehensible error earlier in the UI
There was a problem hiding this comment.
On second thought, I've reverted this with 05827d1 (the commit message explains why). The logic is more precise this time, though.
Also update snapshots for token values affected by state changes
AndrewFerr
force-pushed
the
af/user-locked-errors
branch
from
d31af23 to
82e3ea6
Compare
When a user is both locked and deactivated, give precedence to deactivation errors over locked errors, as a locked error suggests that unlocking the user would make it available.
sandhose
approved these changes
Jul 17, 2025
sandhose
added
A-Compatibility-Layer
sandhose
changed the title
M_USER_LOCKED error when logging in with a locked account on the compatibility endpoints
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.
No description provided.