🐛 web-server: fixes invitation data used in approval endpoint (#7831)

Author: pcrespov

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

@@ -135,10 +135,23 @@ class ProductUIGet(OutputSchema):
 ExtraCreditsUsdRangeInt: TypeAlias = Annotated[int, Field(ge=0, lt=500)]
 
 
+TrialAccountAnnotated: TypeAlias = Annotated[
+    PositiveInt | None,
+    Field(
+        description="Expiration time in days for trial accounts; `null` means not a trial account"
+    ),
+]
+
+WelcomeCreditsAnnotated: TypeAlias = Annotated[
+    ExtraCreditsUsdRangeInt | None,
+    Field(description="Welcome credits in USD; `null` means no welcome credits"),
+]
+
+
 class InvitationGenerate(InputSchema):
     guest: LowerCaseEmailStr
-    trial_account_days: PositiveInt | None = None
-    extra_credits_in_usd: ExtraCreditsUsdRangeInt | None = None
+    trial_account_days: TrialAccountAnnotated = None
+    extra_credits_in_usd: WelcomeCreditsAnnotated = None
 
 
 class InvitationGenerated(OutputSchema):

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

@@ -41,7 +41,7 @@
     OutputSchemaWithoutCamelCase,
 )
 from .groups import MyGroupsGet
-from .products import InvitationGenerate
+from .products import TrialAccountAnnotated, WelcomeCreditsAnnotated
 from .users_preferences import AggregatedPreferences
 
 #
@@ -255,9 +255,14 @@ class UsersForAdminListFilter(Filters):
 class UsersAccountListQueryParams(UsersForAdminListFilter, PageQueryParameters): ...
 
 
+class _InvitationDetails(InputSchema):
+    trial_account_days: TrialAccountAnnotated = None
+    extra_credits_in_usd: WelcomeCreditsAnnotated = None
+
+
 class UserAccountApprove(InputSchema):
     email: EmailStr
-    invitation: InvitationGenerate | None = None
+    invitation: _InvitationDetails | None = None
 
 
 class UserAccountReject(InputSchema):

services/web/server/VERSION

@@ -1 +1 @@
-0.68.0
+0.68.1

services/web/server/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.68.0
+current_version = 0.68.1
 commit = True
 message = services/webserver api version: {current_version} → {new_version}
 tag = False

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

@@ -2,7 +2,7 @@ openapi: 3.1.0
 info:
   title: simcore-service-webserver
   description: Main service with an interface (http-API & websockets) to the web front-end
-  version: 0.68.0
+  version: 0.68.1
 servers:
 - url: ''
   description: webserver
@@ -12211,6 +12211,8 @@ components:
             minimum: 0
           - type: 'null'
           title: Trialaccountdays
+          description: Expiration time in days for trial accounts; `null` means not
+            a trial account
         extraCreditsInUsd:
           anyOf:
           - type: integer
@@ -12219,6 +12221,7 @@ components:
             maximum: 500
           - type: 'null'
           title: Extracreditsinusd
+          description: Welcome credits in USD; `null` means no welcome credits
       type: object
       required:
       - guest
@@ -17009,7 +17012,7 @@ components:
           title: Email
         invitation:
           anyOf:
-          - $ref: '#/components/schemas/InvitationGenerate'
+          - $ref: '#/components/schemas/_InvitationDetails'
           - type: 'null'
       type: object
       required:
@@ -17702,6 +17705,28 @@ components:
       - write
       - delete
       title: WorkspacesGroupsBodyParams
+    _InvitationDetails:
+      properties:
+        trialAccountDays:
+          anyOf:
+          - type: integer
+            exclusiveMinimum: true
+            minimum: 0
+          - type: 'null'
+          title: Trialaccountdays
+          description: Expiration time in days for trial accounts; `null` means not
+            a trial account
+        extraCreditsInUsd:
+          anyOf:
+          - type: integer
+            exclusiveMaximum: true
+            minimum: 0
+            maximum: 500
+          - type: 'null'
+          title: Extracreditsinusd
+          description: Welcome credits in USD; `null` means no welcome credits
+      type: object
+      title: _InvitationDetails
     _ItisVipResourceRestData:
       properties:
         source: