-
Notifications
You must be signed in to change notification settings - Fork 449
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Revoke a user's admin role #54
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
from flask import request | ||
from flask_restplus import Resource | ||
from flask_jwt import jwt_required, current_identity | ||
|
||
from run import api | ||
from app.api.models.admin import * | ||
from app.api.dao.admin import AdminDAO | ||
|
@@ -17,17 +18,38 @@ class AssignNewUserAdmin(Resource): | |
|
||
@classmethod | ||
@jwt_required() | ||
@admin_ns.expect(auth_header_parser, assign_new_admin_request_body, validate=True) | ||
@admin_ns.expect(auth_header_parser, assign_and_revoke_user_admin_request_body, validate=True) | ||
def post(cls): | ||
""" | ||
Assigns a User as a new Admin. | ||
""" | ||
|
||
if current_identity.is_admin: | ||
data = request.json | ||
return DAO.assign_new_user(data) | ||
return DAO.assign_new_user(current_identity.id, data) | ||
|
||
else: | ||
return { | ||
"message": "You don't have admin status. You can't assign other user as admin." | ||
}, 403 | ||
|
||
|
||
@admin_ns.route('admin/remove') | ||
class RevokeUserAdmin(Resource): | ||
|
||
@classmethod | ||
@jwt_required() | ||
@admin_ns.expect(auth_header_parser, assign_and_revoke_user_admin_request_body, validate=True) | ||
def post(cls): | ||
""" | ||
Revoke admin status from another User Admin. | ||
""" | ||
|
||
if current_identity.is_admin: | ||
data = request.json | ||
return DAO.revoke_admin_user(current_identity.id, data) | ||
|
||
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." | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 403 Forbidden There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also fixed @m-murad |
||
}, 403 |
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
403 Forbidden
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is fixed @m-murad (it does not show here because you commented on the line above)