mode names

Author: pcrespov

api/specs/web-server/_users.py

@@ -15,11 +15,11 @@
     MyProfilePatch,
     MyTokenCreate,
     MyTokenGet,
+    UserAccountApprove,
     UserAccountGet,
+    UserAccountReject,
     UserAccountSearchQueryParams,
-    UserApprove,
     UserGet,
-    UserReject,
     UsersAccountListQueryParams,
     UsersSearch,
 )
@@ -163,15 +163,15 @@ async def list_users_accounts(
     status_code=status.HTTP_204_NO_CONTENT,
     tags=_extra_tags,
 )
-async def approve_user_account(_body: UserApprove): ...
+async def approve_user_account(_body: UserAccountApprove): ...
 
 
 @router.post(
     "/admin/user-accounts:reject",
     status_code=status.HTTP_204_NO_CONTENT,
     tags=_extra_tags,
 )
-async def reject_user_account(_body: UserReject): ...
+async def reject_user_account(_body: UserAccountReject): ...
 
 
 @router.get(

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

@@ -255,12 +255,12 @@ class UsersForAdminListFilter(Filters):
 class UsersAccountListQueryParams(UsersForAdminListFilter, PageQueryParameters): ...
 
 
-class UserApprove(InputSchema):
+class UserAccountApprove(InputSchema):
     email: EmailStr
     invitation: InvitationGenerate | None = None
 
 
-class UserReject(InputSchema):
+class UserAccountReject(InputSchema):
     email: EmailStr
 
 

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

@@ -1416,7 +1416,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/UserApprove'
+              $ref: '#/components/schemas/UserAccountApprove'
         required: true
       responses:
         '204':
@@ -1432,7 +1432,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/UserReject'
+              $ref: '#/components/schemas/UserAccountReject'
         required: true
       responses:
         '204':
@@ -1442,7 +1442,7 @@ paths:
       tags:
       - users
       - admin
-      summary: Search User Account
+      summary: Search User Accounts
       operationId: search_user_accounts
       parameters:
       - name: email
@@ -16996,6 +16996,20 @@ components:
       - number
       - e_tag
       title: UploadedPart
+    UserAccountApprove:
+      properties:
+        email:
+          type: string
+          format: email
+          title: Email
+        invitation:
+          anyOf:
+          - $ref: '#/components/schemas/InvitationGenerate'
+          - type: 'null'
+      type: object
+      required:
+      - email
+      title: UserAccountApprove
     UserAccountGet:
       properties:
         firstName:
@@ -17112,20 +17126,16 @@ components:
       - registered
       - status
       title: UserAccountGet
-    UserApprove:
+    UserAccountReject:
       properties:
         email:
           type: string
           format: email
           title: Email
-        invitation:
-          anyOf:
-          - $ref: '#/components/schemas/InvitationGenerate'
-          - type: 'null'
       type: object
       required:
       - email
-      title: UserApprove
+      title: UserAccountReject
     UserGet:
       properties:
         userId:
@@ -17287,16 +17297,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_rest.py

@@ -7,11 +7,11 @@
 from models_library.api_schemas_webserver.users import (
     MyProfileGet,
     MyProfilePatch,
+    UserAccountApprove,
     UserAccountGet,
+    UserAccountReject,
     UserAccountSearchQueryParams,
-    UserApprove,
     UserGet,
-    UserReject,
     UsersAccountListQueryParams,
     UsersSearch,
 )
@@ -276,7 +276,7 @@ async def approve_user_account(request: web.Request) -> web.Response:
     req_ctx = UsersRequestContext.model_validate(request)
     assert req_ctx.product_name  # nosec
 
-    approval_data = await parse_request_body_as(UserApprove, request)
+    approval_data = await parse_request_body_as(UserAccountApprove, request)
 
     if approval_data.invitation:
         _logger.debug(
@@ -309,7 +309,7 @@ async def reject_user_account(request: web.Request) -> web.Response:
     req_ctx = UsersRequestContext.model_validate(request)
     assert req_ctx.product_name  # nosec
 
-    rejection_data = await parse_request_body_as(UserReject, request)
+    rejection_data = await parse_request_body_as(UserAccountReject, request)
 
     # Reject the user account, passing the current user's ID as the reviewer
     pre_registration_id = await _users_service.reject_user_account(