Merged
Conversation
Member
Author
|
@ruKurz please squash and merge if appropriate |
mrsimpson
commented
Nov 10, 2017
ThomasRoehl
approved these changes
Nov 10, 2017
ThomasRoehl
left a comment
There was a problem hiding this comment.
Tested:
- deactivating a user
- logging in with a deactivated user
- reset password from deactivated user
- reactivating user
- logging in with reactivated user
- reset password of reactivated user
- tested with the same with user as admin
Everything is working like expected.
The code is understandable and correctly formatted.
vickyokrm
pushed a commit
that referenced
this pull request
Feb 14, 2018
…to feature/#142-ask-question-from-room
3 tasks
ThomasRoehl
pushed a commit
that referenced
this pull request
Feb 23, 2018
…stify/Rocket.Chat into feature/#142-ask-question-from-room
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 #140
@ruKurz Before this fix, the information about being disabled was intentionally hidden from the user.
I guess this could have been done intentionally so that blocked users don't know they are blocked.
Now, this information is propagated and presented to the user.
As you can see, the fix is minor. There is no semantical difference in the accounts validation callback whether
falseis returned or an exception is thrown:In addition to propagating this information on login, I also threw the same error once a disabled user tries to reset his password.