From 2aba274fc7483e7762138e3a6e75f79c59644c18 Mon Sep 17 00:00:00 2001 From: Munyoki Kilyungi Date: Mon, 19 Feb 2024 23:09:21 +0300 Subject: Delete "edit_access_required" decorator. * gn2/wqflask/decorators.py (edit_access_required): Delete. * gn2/wqflask/resource_manager.py: Delete references to "edit_access_required". Signed-off-by: Munyoki Kilyungi --- gn2/wqflask/decorators.py | 29 ----------------------------- gn2/wqflask/resource_manager.py | 2 -- 2 files changed, 31 deletions(-) diff --git a/gn2/wqflask/decorators.py b/gn2/wqflask/decorators.py index 4fe865c9..d2224d1a 100644 --- a/gn2/wqflask/decorators.py +++ b/gn2/wqflask/decorators.py @@ -34,35 +34,6 @@ def login_required(pagename: str = ""): return __build_wrap__ -def edit_access_required(f): - """Use this for endpoints where people with admin or edit privileges -are required""" - @wraps(f) - def wrap(*args, **kwargs): - resource_id: str = "" - if request.args.get("resource-id"): - resource_id = request.args.get("resource-id") - elif kwargs.get("resource_id"): - resource_id = kwargs.get("resource_id") - response: Dict = {} - try: - user_id = ((g.user_session.record.get(b"user_id") or - b"").decode("utf-8") - or g.user_session.record.get("user_id") or "") - response = json.loads( - requests.get(urljoin( - current_app.config.get("GN2_PROXY"), - ("available?resource=" - f"{resource_id}&user={user_id}"))).content) - except: - response = {} - if max([DataRole(role) for role in response.get( - "data", ["no-access"])]) < DataRole.EDIT: - return redirect(url_for("no_access_page")) - return f(*args, **kwargs) - return wrap - - def edit_admins_access_required(f): """Use this for endpoints where ownership of a resource is required""" @wraps(f) diff --git a/gn2/wqflask/resource_manager.py b/gn2/wqflask/resource_manager.py index b0da6d6f..de397747 100644 --- a/gn2/wqflask/resource_manager.py +++ b/gn2/wqflask/resource_manager.py @@ -19,8 +19,6 @@ from gn3.authentication import get_highest_user_access_role from typing import Dict, Tuple from urllib.parse import urljoin - -from gn2.wqflask.decorators import edit_access_required from gn2.wqflask.decorators import edit_admins_access_required from gn2.wqflask.decorators import login_required -- cgit 1.4.1