From 8bd7e5e590fc32d9866ee68e1ddf206428ac8ae0 Mon Sep 17 00:00:00 2001 From: msramalho <19508417+msramalho@users.noreply.github.com> Date: Tue, 4 Feb 2025 14:05:59 +0000 Subject: [PATCH] drops /groups endpoint, no longer used --- src/endpoints/default.py | 7 +------ src/tests/endpoints/test_default.py | 28 +++------------------------- 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/src/endpoints/default.py b/src/endpoints/default.py index 616ea8c..1b8dc61 100644 --- a/src/endpoints/default.py +++ b/src/endpoints/default.py @@ -40,13 +40,8 @@ async def active( return {"active": user.active} -@default_router.get("/groups", deprecated=True) # DEPRECATED, only used by extension -def get_user_groups(email=Depends(get_user_auth)) -> list[str]: - return crud.get_user_groups(email) - - @default_router.get("/permissions") -def get_user_groups( +def get_user_permissions( user: UserState = Depends(get_user_state), ) -> Dict[str, GroupPermissions]: return user.permissions diff --git a/src/tests/endpoints/test_default.py b/src/tests/endpoints/test_default.py index fa371d1..da0385a 100644 --- a/src/tests/endpoints/test_default.py +++ b/src/tests/endpoints/test_default.py @@ -5,7 +5,6 @@ from core.config import VERSION from tests.db.test_crud import test_data - def test_endpoint_home(client_with_auth): r = client_with_auth.get("/") assert r.status_code == 200 @@ -55,6 +54,7 @@ def test_endpoint_active_true_user(client_with_auth): assert r.status_code == 200 assert r.json() == {"active": True} + def test_endpoint_active_false_user(app): from web.security import get_user_auth @@ -66,30 +66,6 @@ def test_endpoint_active_false_user(app): assert r.json() == {"active": False} -def test_endpoint_groups_no_auth(client, test_no_auth): - test_no_auth(client.get, "/groups") - - -def test_endpoint_groups_rick_and_morty(client_with_auth): - r = client_with_auth.get("/groups") - assert r.status_code == 200 - assert len(j := r.json()) == 2 - assert 'animated-characters' in j - assert 'spaceship' in j - - -@patch("endpoints.default.crud.get_user_groups", return_value=["group1", "group2"]) -def test_endpoint_groups(m1, app): - from web.security import get_user_auth - app.dependency_overrides[get_user_auth] = lambda: True - client = TestClient(app) - - r = client.get("/groups") - - assert r.status_code == 200 - assert r.json() == ["group1", "group2"] - - def test_no_serve_local_archive_by_default(client_with_auth): r = client_with_auth.get("/app/local_archive_test/temp.txt") assert r.status_code == 404 @@ -104,9 +80,11 @@ def test_favicon(client_with_auth): def test_endpoint_test_prometheus_no_auth(client, test_no_auth): test_no_auth(client.get, "/metrics") + def test_endpoint_test_prometheus_no_user_auth(client_with_auth, test_no_auth): test_no_auth(client_with_auth.get, "/metrics") + @pytest.mark.asyncio async def test_prometheus_metrics(test_data, client_with_token, get_settings): # before metrics calculation