fixes tess

Author: pcrespov

api/specs/web-server/_users.py

@@ -17,7 +17,6 @@
     UserForAdminGet,
     UserGet,
     UsersForAdminSearchQueryParams,
-    UsersGetParams,
     UsersSearch,
 )
 from models_library.api_schemas_webserver.users_preferences import PatchRequestBody
@@ -150,14 +149,6 @@ async def list_user_permissions():
 #
 
 
-@router.get(
-    "/users/{user_id}",
-    response_model=Envelope[UserGet],
-)
-async def get_user(_path: Annotated[UsersGetParams, Depends()]):
-    ...
-
-
 @router.post(
     "/users:search",
     response_model=Envelope[list[UserGet]],

services/web/server/src/simcore_service_webserver/users/_users_rest.py

@@ -7,13 +7,11 @@
     MyProfilePatch,
     UserGet,
     UsersForAdminSearchQueryParams,
-    UsersGetParams,
     UsersSearch,
 )
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
-    parse_request_path_parameters_as,
     parse_request_query_parameters_as,
 )
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
@@ -137,22 +135,6 @@ async def update_my_profile(request: web.Request) -> web.Response:
 #
 
 
-@routes.get(f"/{API_VTAG}/users/{{user_id}}", name="get_user")
-@login_required
-@permission_required("user.read")
-@_handle_users_exceptions
-async def get_user(request: web.Request) -> web.Response:
-    req_ctx = UsersRequestContext.model_validate(request)
-    assert req_ctx.product_name  # nosec
-    path_params = parse_request_path_parameters_as(UsersGetParams, request)
-
-    user = await _users_service.get_public_user(
-        request.app, caller_id=req_ctx.user_id, user_id=path_params.user_id
-    )
-
-    return envelope_json_response(UserGet.from_model(user))
-
-
 @routes.post(f"/{API_VTAG}/users:search", name="search_users")
 @login_required
 @permission_required("user.read")
@@ -184,7 +166,7 @@ async def search_users(request: web.Request) -> web.Response:
 
 @routes.get(f"/{API_VTAG}/admin/users:search", name="search_users_for_admin")
 @login_required
-@permission_required("user.admin.get")
+@permission_required("user.admin.read")
 @_handle_users_exceptions
 async def search_users_for_admin(request: web.Request) -> web.Response:
     req_ctx = UsersRequestContext.model_validate(request)
@@ -207,7 +189,7 @@ async def search_users_for_admin(request: web.Request) -> web.Response:
     f"/{API_VTAG}/admin/users:pre-register", name="pre_register_user_for_admin"
 )
 @login_required
-@permission_required("user.admin.get")
+@permission_required("user.admin.read")
 @_handle_users_exceptions
 async def pre_register_user_for_admin(request: web.Request) -> web.Response:
     req_ctx = UsersRequestContext.model_validate(request)

services/web/server/tests/unit/with_dbs/03/invitations/test_products__invitations_handlers.py

@@ -153,7 +153,7 @@ async def test_pre_registration_and_invitation_workflow(
     ).model_dump()
 
     # Search user -> nothing
-    response = await client.get("/v0/users:search", params={"email": guest_email})
+    response = await client.get("/v0/admin/users:search", params={"email": guest_email})
     data, _ = await assert_status(response, expected_status)
     # i.e. no info of requester is found, i.e. needs pre-registration
     assert data == []
@@ -164,17 +164,21 @@ async def test_pre_registration_and_invitation_workflow(
     # assert response.status == status.HTTP_409_CONFLICT
 
     # Accept user for registration and create invitation for her
-    response = await client.post("/v0/users:pre-register", json=requester_info)
+    response = await client.post("/v0/admin/users:pre-register", json=requester_info)
     data, _ = await assert_status(response, expected_status)
 
     # Can only  pre-register once
     for _ in range(MANY_TIMES):
-        response = await client.post("/v0/users:pre-register", json=requester_info)
+        response = await client.post(
+            "/v0/admin/users:pre-register", json=requester_info
+        )
         await assert_status(response, status.HTTP_409_CONFLICT)
 
     # Search user again
     for _ in range(MANY_TIMES):
-        response = await client.get("/v0/users:search", params={"email": guest_email})
+        response = await client.get(
+            "/v0/admin/users:search", params={"email": guest_email}
+        )
         data, _ = await assert_status(response, expected_status)
         assert len(data) == 1
         user_found = data[0]
@@ -203,7 +207,7 @@ async def test_pre_registration_and_invitation_workflow(
     await assert_status(response, status.HTTP_200_OK)
 
     # find registered user
-    response = await client.get("/v0/users:search", params={"email": guest_email})
+    response = await client.get("/v0/admin/users:search", params={"email": guest_email})
     data, _ = await assert_status(response, expected_status)
     assert len(data) == 1
     user_found = data[0]

services/web/server/tests/unit/with_dbs/03/test_users.py

@@ -103,18 +103,6 @@ async def test_get_and_search_public_users(
         assert private_user["id"] != logged_user["id"]
         assert public_user["id"] != logged_user["id"]
 
-        # GET user
-        url = client.app.router["get_user"].url_for(user_id=f'{public_user["id"]}')
-        resp = await client.get(f"{url}")
-        data, _ = await assert_status(resp, status.HTTP_200_OK)
-
-        # check privacy
-        got = UserGet.model_validate(data)
-        assert got.user_id == public_user["id"]
-        assert got.user_name == public_user["name"]
-        assert got.first_name == public_user.get("first_name")
-        assert got.last_name == public_user.get("last_name")
-
         # SEARCH by partial email
         partial_email = "@find.m"
         assert partial_email in private_user["email"]
@@ -127,7 +115,11 @@ async def test_get_and_search_public_users(
         found = TypeAdapter(list[UserGet]).validate_python(data)
         assert found
         assert len(found) == 1
-        assert found[0] == got
+        assert found[0].user_id == public_user["id"]
+        assert found[0].user_name == public_user["name"]
+        assert found[0].email == public_user["email"]
+        assert found[0].first_name == public_user.get("first_name")
+        assert found[0].last_name == public_user.get("last_name")
 
         # SEARCH by partial username
         partial_username = "ie01"
@@ -141,7 +133,7 @@ async def test_get_and_search_public_users(
         found = TypeAdapter(list[UserGet]).validate_python(data)
         assert found
         assert len(found) == 2
-        assert found[1] == got
+        assert found[1].user_id == public_user["id"]
         # check privacy
         assert found[0].user_name == private_user["name"]
         assert found[0].email is None
@@ -477,8 +469,8 @@ async def test_access_rights_on_search_users_only_product_owners_can_access(
 ):
     assert client.app
 
-    url = client.app.router["search_users"].url_for()
-    assert url.path == "/v0/users:search"
+    url = client.app.router["search_users_for_admin"].url_for()
+    assert url.path == "/v0/admin/users:search"
 
     resp = await client.get(url.path, params={"email": "[email protected]"})
     await assert_status(resp, expected)
@@ -528,7 +520,9 @@ async def test_search_and_pre_registration(
     assert client.app
 
     # ONLY in `users` and NOT `users_pre_registration_details`
-    resp = await client.get("/v0/users:search", params={"email": logged_user["email"]})
+    resp = await client.get(
+        "/v0/admin/users:search", params={"email": logged_user["email"]}
+    )
     assert resp.status == status.HTTP_200_OK
 
     found, _ = await assert_status(resp, status.HTTP_200_OK)
@@ -562,11 +556,11 @@ async def test_search_and_pre_registration(
     # NOT in `users` and ONLY `users_pre_registration_details`
 
     # create pre-registration
-    resp = await client.post("/v0/users:pre-register", json=account_request_form)
+    resp = await client.post("/v0/admin/users:pre-register", json=account_request_form)
     assert resp.status == status.HTTP_200_OK
 
     resp = await client.get(
-        "/v0/users:search", params={"email": account_request_form["email"]}
+        "/v0/admin/users:search", params={"email": account_request_form["email"]}
     )
     found, _ = await assert_status(resp, status.HTTP_200_OK)
     assert len(found) == 1
@@ -589,7 +583,7 @@ async def test_search_and_pre_registration(
     )
 
     resp = await client.get(
-        "/v0/users:search", params={"email": account_request_form["email"]}
+        "/v0/admin/users:search", params={"email": account_request_form["email"]}
     )
     found, _ = await assert_status(resp, status.HTTP_200_OK)
     assert len(found) == 1