Revoke a user's admin role #54
Merged
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
isabelcosta
force-pushed
the
remove-admin-role
branch
from
04f5441
to
ffcfb5b
Compare
isabelcosta
force-pushed
the
remove-admin-role
branch
from
ffcfb5b
to
9c25ed4
Compare
isabelcosta
force-pushed
the
remove-admin-role
branch
2 times, most recently
from
c621b0b
to
c71a2b0
Compare
m-murad
suggested changes
Jun 23, 2018
app/api/dao/admin.py
Outdated
| new_admin_user = UserModel.find_by_id(new_admin_user_id) | ||
|
|
||
| if new_admin_user: | ||
|
|
||
| if new_admin_user.is_admin: | ||
| return {"message": "User is already an Admin"}, 201 | ||
| return {"message": "User is already an Admin."}, 200 |
There was a problem hiding this comment.
The response should be a bad requestand code 400
|
|
||
| else: | ||
| return { | ||
| "message": "You don't have admin status. You can't assign other user as admin." |
There was a problem hiding this comment.
This is fixed @m-murad (it does not show here because you commented on the line above)
|
|
||
| else: | ||
| return { | ||
| "message": "You don't have admin status. You can't assign another admin" | ||
| }, 401 | ||
| "message": "You don't have admin status. You can't revoke other admin user." |
app/api/dao/admin.py
Outdated
|
|
||
| return {"message": "User does not exist"}, 401 | ||
| return {"message": "User does not exist."}, 400 |
app/api/dao/admin.py
Outdated
| return {"message": "User is now an Admin"}, 201 | ||
| return {"message": "User is now an Admin."}, 200 | ||
|
|
||
| return {"message": "User does not exist."}, 400 |
app/api/dao/admin.py
Outdated
|
|
||
| new_admin_user_id = data['user_id'] | ||
|
|
||
| if assigner_user_id is new_admin_user_id: | ||
| return {"message": "You cannot assign yourself as an Admin."}, 400 |
app/api/dao/admin.py
Outdated
| admin_user_id = data['user_id'] | ||
|
|
||
| if revoker_user_id is admin_user_id: | ||
| return {"message": "You cannot revoke your admin status."}, 400 |
app/api/dao/user.py
Outdated
| if user: | ||
| user.delete_from_db() | ||
| return {"message": "User was deleted successfully"}, 201 | ||
|
|
||
| return {"message": "User does not exist"}, 201 | ||
| return {"message": "User does not exist"}, 400 |
|
wow thank you @m-murad , those error code reviews are very helpful |
isabelcosta
force-pushed
the
remove-admin-role
branch
from
c71a2b0
to
5c1f067
Compare
Dilu9218
approved these changes
Jun 25, 2018
m-murad
approved these changes
Jun 25, 2018
isabelcosta
added
the
Program: GSOC
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.
Description
Fixes #17
Type of Change:
Code/Quality Assurance Only
How Has This Been Tested?
Added 3 tests for the AdminDAO function that revokes admin roles for the following cases:
Tested on Swagger UI, the same tests above to test the API response.
Checklist:
Code/Quality Assurance Only