zerver/views/users.py: Remove duplication and add func to validate user id. #9570
Conversation
This file contains 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
timabbott
reviewed
May 28, 2018
zerver/views/users.py
Outdated
| bot = get_user_profile_by_id_in_realm(bot_id, user_profile.realm) | ||
| except UserProfile.DoesNotExist: | ||
| return json_error(_('No such user')) | ||
| bot = access_user_by_id(user_profile, bot_id) |
There was a problem hiding this comment.
I think most of these functions should be calling an access_bot_by_id, that does the "not a bot" and can_admin_user checks as well.
And the access_* methods should go in zerver/lib/users.py.
…ate bot id. Add function `access_bot_by_id` to access bot id within same realm.
|
@timabbott Thanks for reviewing! Updated. |
|
Nice, I cleaned up the commit message and merged, thanks @YJDave! As a follow-up, should we make a version for getting a human user (looks like we have 3 calls points for that too)? We'll probably want a flag for whether inactive users are allowed/required (for |
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.
Followup of #9449
Add function
access_user_by_idto access user_id within same realm.Testing Plan:
GIFs or Screenshots: