✨ users: Add account request status fields and update user approval/rejection endpoints

Author: pcrespov

api/specs/web-server/_users.py

@@ -170,6 +170,7 @@ async def approve_user_account(_body: UserApprove): ...
     "/admin/users:reject",
     status_code=status.HTTP_204_NO_CONTENT,
     tags=_extra_tags,
+    include_in_schema=False,  # UNDER DEVELOPMENT
 )
 async def reject_user_account(_body: UserReject): ...
 
@@ -178,6 +179,7 @@ async def reject_user_account(_body: UserReject): ...
     "/admin/users:resendConfirmationEmail",
     status_code=status.HTTP_204_NO_CONTENT,
     tags=_extra_tags,
+    include_in_schema=False,  # UNDER DEVELOPMENT
 )
 async def resend_user_confirmation_email(_body: UserApprove): ...
 

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

@@ -1,12 +1,12 @@
 import re
-from datetime import date
+from datetime import date, datetime
 from enum import Enum
 from typing import Annotated, Any, Literal, Self
 
 import annotated_types
 from common_library.basic_types import DEFAULT_FACTORY
 from common_library.dict_tools import remap_keys
-from common_library.users_enums import UserStatus
+from common_library.users_enums import AccountRequestStatus, UserStatus
 from models_library.groups import AccessRightsDict
 from models_library.rest_filters import Filters
 from models_library.rest_pagination import PageQueryParameters
@@ -303,8 +303,11 @@ class UserForAdminGet(OutputSchema):
         ),
     ] = DEFAULT_FACTORY
 
-    # authorization
+    # pre-registration
     invited_by: str | None = None
+    account_request_status: AccountRequestStatus | None
+    account_request_reviewed_by: UserID | None = None
+    account_request_reviewed_at: datetime | None = None
 
     # user status
     registered: bool

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -1373,15 +1373,6 @@ paths:
       summary: List Users For Admin
       operationId: list_users_for_admin
       parameters:
-      - name: status
-        in: query
-        required: false
-        schema:
-          anyOf:
-          - const: PENDING
-            type: string
-          - type: 'null'
-          title: Status
       - name: limit
         in: query
         required: false
@@ -1396,6 +1387,15 @@ paths:
           type: integer
           default: 0
           title: Offset
+      - name: status
+        in: query
+        required: false
+        schema:
+          anyOf:
+          - const: PENDING
+            type: string
+          - type: 'null'
+          title: Status
       responses:
         '200':
           description: Successful Response
@@ -1410,42 +1410,6 @@ paths:
       - admin
       summary: Approve User Account
       operationId: approve_user_account
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/UserApprove'
-        required: true
-      responses:
-        '200':
-          description: Successful Response
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Envelope_Page_UserForAdminGet__'
-  /v0/admin/users:reject:
-    post:
-      tags:
-      - users
-      - admin
-      summary: Reject User Account
-      operationId: reject_user_account
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/UserReject'
-        required: true
-      responses:
-        '204':
-          description: Successful Response
-  /v0/admin/users:resendConfirmationEmail:
-    post:
-      tags:
-      - users
-      - admin
-      summary: Resend User Confirmation Email
-      operationId: resend_user_confirmation_email
       requestBody:
         content:
           application/json:
@@ -8405,6 +8369,14 @@ components:
           phone: +1 123456789
           postalCode: '98001'
           privacyPolicy: true
+    AccountRequestStatus:
+      type: string
+      enum:
+      - PENDING
+      - APPROVED
+      - REJECTED
+      title: AccountRequestStatus
+      description: Status of the request for an account
     Activity:
       properties:
         stats:
@@ -17076,6 +17048,23 @@ components:
           - type: string
           - type: 'null'
           title: Invitedby
+        accountRequestStatus:
+          anyOf:
+          - $ref: '#/components/schemas/AccountRequestStatus'
+          - type: 'null'
+        accountRequestReviewedBy:
+          anyOf:
+          - type: integer
+            exclusiveMinimum: true
+            minimum: 0
+          - type: 'null'
+          title: Accountrequestreviewedby
+        accountRequestReviewedAt:
+          anyOf:
+          - type: string
+            format: date-time
+          - type: 'null'
+          title: Accountrequestreviewedat
         registered:
           type: boolean
           title: Registered
@@ -17104,6 +17093,7 @@ components:
       - state
       - postalCode
       - country
+      - accountRequestStatus
       - registered
       - status
       title: UserForAdminGet
@@ -17268,16 +17258,6 @@ components:
       required:
       - read
       title: UserNotificationPatch
-    UserReject:
-      properties:
-        email:
-          type: string
-          format: email
-          title: Email
-      type: object
-      required:
-      - email
-      title: UserReject
     UserStatus:
       type: string
       enum:

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

@@ -840,6 +840,8 @@ async def list_merged_pre_and_registered_users(
             users_pre_registration_details.c.extras,
             users_pre_registration_details.c.created,
             users_pre_registration_details.c.account_request_status,
+            users_pre_registration_details.c.account_request_reviewed_by,
+            users_pre_registration_details.c.account_request_reviewed_at,
             users.c.id.label("user_id"),
             users.c.name.label("user_name"),
             users.c.status,
@@ -872,6 +874,8 @@ async def list_merged_pre_and_registered_users(
             sa.literal(None).label("extras"),
             users.c.created_at.label("created"),
             sa.literal(None).label("account_request_status"),
+            sa.literal(None).label("account_request_reviewed_by"),
+            sa.literal(None).label("account_request_reviewed_at"),
             users.c.id.label("user_id"),
             users.c.name.label("user_name"),
             users.c.status,