Flaschengeist/flaschengeist
Flaschengeist
/
flaschengeist
7
0
Fork 0
Code Issues 20 Pull Requests Packages Projects Releases 2 Wiki Activity

[Plugin] Remove redundant code, balance and roles

This commit is contained in:
Ferdinand Thiessen 2020-10-31 18:03:04 +01:00
parent 39f34ff434
commit 7b2334bd98
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flaschengeist/plugins/balance/__init__.py
View File

@ -84,7 +84,7 @@ def set_limit(userid, current_session: Session):
@balance_bp.route("/users/<userid>/balance", methods=["GET"]) @balance_bp.route("/users/<userid>/balance", methods=["GET"])
@login_required() @login_required(permission=permissions.SHOW)
def get_balance(userid, current_session: Session): def get_balance(userid, current_session: Session):
"""Get balance of user, optionally filtered """Get balance of user, optionally filtered
@ -99,9 +99,7 @@ def get_balance(userid, current_session: Session):
Returns: Returns:
JSON object containing credit, debit and balance or HTTP error JSON object containing credit, debit and balance or HTTP error
""" """
if (userid == current_session._user.userid and not current_session._user.has_permission(permissions.SHOW)) or ( if userid != current_session._user.userid and not current_session._user.has_permission(permissions.SHOW_OTHER):
userid != current_session._user.userid and not current_session._user.has_permission(permissions.SHOW_OTHER)
):
raise Forbidden raise Forbidden
# Might raise NotFound # Might raise NotFound

7
flaschengeist/plugins/roles/__init__.py
View File

@ -13,12 +13,11 @@ from flaschengeist.controller import roleController
roles_bp = Blueprint("roles", __name__) roles_bp = Blueprint("roles", __name__)
_permission_edit = "roles_edit" _permission_edit = "roles_edit"
_permission_delete = "roles_delete"
class RolesPlugin(Plugin): class RolesPlugin(Plugin):
def __init__(self, config): def __init__(self, config):
super().__init__(config, roles_bp, permissions=[_permission_edit, _permission_delete]) super().__init__(config, roles_bp, permissions=[_permission_edit])
@roles_bp.route("/roles", methods=["GET"]) @roles_bp.route("/roles", methods=["GET"])
@ -125,7 +124,7 @@ def edit_role(role_name, current_session):
@roles_bp.route("/roles/<role_name>", methods=["DELETE"]) @roles_bp.route("/roles/<role_name>", methods=["DELETE"])
@login_required(permission=_permission_delete) @login_required(permission=_permission_edit)
def delete_role(role_name, current_session): def delete_role(role_name, current_session):
"""Delete role """Delete role
@ -136,7 +135,7 @@ def delete_role(role_name, current_session):
current_session: Session sent with Authorization Header current_session: Session sent with Authorization Header
Returns: Returns:
HTTP-200 or HTTP error HTTP-204 or HTTP error
""" """
role = roleController.get(role_name) role = roleController.get(role_name)
roleController.delete(role) roleController.delete(role)