updates app_environemnt

ITISFoundation · Nov 4, 2024 · ad1dd58 · ad1dd58
1 parent 7d17535
commit ad1dd58
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/services/web/server/src/simcore_service_webserver/folders/_trash_handlers.py b/services/web/server/src/simcore_service_webserver/folders/_trash_handlers.py
@@ -8,6 +8,7 @@
 )
 
 from .._meta import API_VTAG as VTAG
+from ..application_settings_utils import requires_dev_feature_enabled
 from ..login.decorators import get_user_id, login_required
 from ..products.api import get_product_name
 from ..security.decorators import permission_required
@@ -22,6 +23,7 @@
 
 
 @routes.post(f"/{VTAG}/folders/{{folder_id}}:trash", name="trash_folder")
+@requires_dev_feature_enabled
 @login_required
 @permission_required("folder.delete")
 @handle_plugin_requests_exceptions
@@ -45,6 +47,7 @@ async def trash_folder(request: web.Request):
 
 
 @routes.post(f"/{VTAG}/folders/{{folder_id}}:untrash", name="untrash_folder")
+@requires_dev_feature_enabled
 @login_required
 @permission_required("folder.delete")
 @handle_plugin_requests_exceptions

diff --git a/services/web/server/src/simcore_service_webserver/projects/_trash_handlers.py b/services/web/server/src/simcore_service_webserver/projects/_trash_handlers.py
@@ -8,6 +8,7 @@
 )
 
 from .._meta import API_VTAG as VTAG
+from ..application_settings_utils import requires_dev_feature_enabled
 from ..exceptions_handlers import (
     ExceptionToHttpErrorMap,
     HttpErrorInfo,
@@ -57,6 +58,7 @@
 
 
 @routes.delete(f"/{VTAG}/trash", name="empty_trash")
+@requires_dev_feature_enabled
 @login_required
 @permission_required("project.delete")
 @_handle_exceptions
@@ -72,6 +74,7 @@ async def empty_trash(request: web.Request):
 
 
 @routes.post(f"/{VTAG}/projects/{{project_id}}:trash", name="trash_project")
+@requires_dev_feature_enabled
 @login_required
 @permission_required("project.delete")
 @_handle_exceptions
@@ -95,6 +98,7 @@ async def trash_project(request: web.Request):
 
 
 @routes.post(f"/{VTAG}/projects/{{project_id}}:untrash", name="untrash_project")
+@requires_dev_feature_enabled
 @login_required
 @permission_required("project.delete")
 @_handle_exceptions

diff --git a/services/web/server/tests/unit/with_dbs/03/test_trash.py b/services/web/server/tests/unit/with_dbs/03/test_trash.py
@@ -18,12 +18,23 @@
 from models_library.rest_pagination import Page
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
+from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
+from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from servicelib.aiohttp import status
 from simcore_service_webserver.db.models import UserRole
 from simcore_service_webserver.projects.models import ProjectDict
 
 
+@pytest.fixture
+def app_environment(
+    app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch
+) -> EnvVarsDict:
+    return app_environment | setenvs_from_dict(
+        monkeypatch, {"WEBSERVER_DEV_FEATURES_ENABLED": "1"}
+    )
+
+
 @pytest.fixture
 def user_role() -> UserRole:
     return UserRole.USER