returns pre-registration

Author: pcrespov

api/specs/web-server/_users.py

@@ -15,6 +15,7 @@
     MyProfilePatch,
     MyTokenCreate,
     MyTokenGet,
+    ResendConfirmationCode,
     UserApprove,
     UserForAdminGet,
     UserGet,
@@ -180,7 +181,7 @@ async def reject_user_account(_body: UserReject): ...
     tags=_extra_tags,
     include_in_schema=False,  # UNDER DEVELOPMENT
 )
-async def resend_user_confirmation_email(_body: UserApprove): ...
+async def resend_user_confirmation_email(_body: ResendConfirmationCode): ...
 
 
 @router.get(

packages/models-library/src/models_library/api_schemas_webserver/users.py

@@ -294,6 +294,7 @@ class UserForAdminGet(OutputSchema):
     ] = DEFAULT_FACTORY
 
     # pre-registration
+    pre_registration_id: int | None
     invited_by: str | None = None
     account_request_status: AccountRequestStatus | None
     account_request_reviewed_by: UserID | None = None

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

@@ -729,6 +729,7 @@ async def search_merged_pre_and_registered_users(
 
     async with pass_or_acquire_connection(engine, connection) as conn:
         columns = (
+            users_pre_registration_details.c.id,
             users.c.first_name,
             users.c.last_name,
             users.c.email,
@@ -830,6 +831,7 @@ async def list_merged_pre_and_registered_users(
     # We need to left join with users to identify if the pre-registered user is already in the system
     pre_reg_query = (
         sa.select(
+            users_pre_registration_details.c.id,
             users_pre_registration_details.c.pre_email.label("email"),
             users_pre_registration_details.c.pre_first_name.label("first_name"),
             users_pre_registration_details.c.pre_last_name.label("last_name"),
@@ -864,6 +866,7 @@ async def list_merged_pre_and_registered_users(
     # Query for users that are associated with the product through groups
     users_query = (
         sa.select(
+            sa.literal(None).label("id"),
             users.c.email,
             users.c.first_name,
             users.c.last_name,

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

@@ -200,7 +200,9 @@ async def list_users_for_admin(request: web.Request) -> web.Response:
     )
 
     def _to_domain_model(user: dict[str, Any]) -> UserForAdminGet:
-        return UserForAdminGet(extras=user.pop("extras") or {}, **user)
+        return UserForAdminGet(
+            extras=user.pop("extras") or {}, pre_registration_id=user.pop("id"), **user
+        )
 
     page = Page[UserForAdminGet].model_validate(
         paginate_data(
@@ -243,7 +245,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("admin.users.read")
+@permission_required("admin.users.write")
 @_handle_users_exceptions
 async def pre_register_user_for_admin(request: web.Request) -> web.Response:
     req_ctx = UsersRequestContext.model_validate(request)
@@ -273,9 +275,13 @@ async def approve_user_account(request: web.Request) -> web.Response:
 
     if approval_data.invitation:
         _logger.debug(
-            "TODO: User %s is being approved with invitation %s. Generating invitation ... ",
+            "TODO: User is being approved with invitation %s: \n"
+            "1. Approve user account\n"
+            "2. Generate invitation\n"
+            "3. Store invitation in extras\n"
+            "4. Send invitation to user %s\n",
+            approval_data.invitation.model_dump_json(indent=1),
             approval_data.email,
-            approval_data.invitation,
         )
 
     # Approve the user account, passing the current user's ID as the reviewer