updates

Author: pcrespov

services/web/server/src/simcore_service_webserver/users/_controller/rest/_rest_schemas.py

@@ -10,19 +10,16 @@
 from typing import Annotated, Any, Final
 
 import pycountry
+from common_library.basic_types import DEFAULT_FACTORY
 from models_library.api_schemas_webserver._base import InputSchema
 from models_library.api_schemas_webserver.users import PhoneNumberStr, UserAccountGet
 from models_library.emails import LowerCaseEmailStr
-from models_library.users import UserID
-from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
-from servicelib.request_keys import RQT_USERID_KEY
+from pydantic import ConfigDict, Field, field_validator, model_validator
 
-from ....constants import RQ_PRODUCT_KEY
+from ....models import AuthenticatedRequestContext
 
 
-class UsersRequestContext(BaseModel):
-    user_id: UserID = Field(..., alias=RQT_USERID_KEY)  # type: ignore[literal-required]
-    product_name: str = Field(..., alias=RQ_PRODUCT_KEY)  # type: ignore[literal-required]
+class UsersRequestContext(AuthenticatedRequestContext): ...
 
 
 MAX_BYTES_SIZE_EXTRAS: Final[int] = 512
@@ -34,15 +31,15 @@ class PreRegisteredUserGet(InputSchema):
     first_name: str
     last_name: str
     email: LowerCaseEmailStr
-    institution: str | None = Field(
-        default=None, description="company, university, ..."
-    )
+    institution: Annotated[
+        str | None, Field(description="company, university, ...")
+    ] = None
     phone: PhoneNumberStr | None
 
     # billing details
     address: str
     city: str
-    state: str | None = Field(default=None)
+    state: str | None = None
     postal_code: str
     country: str
     extras: Annotated[
@@ -51,7 +48,7 @@ class PreRegisteredUserGet(InputSchema):
             default_factory=dict,
             description="Keeps extra information provided in the request form.",
         ),
-    ]
+    ] = DEFAULT_FACTORY
 
     model_config = ConfigDict(str_strip_whitespace=True, str_max_length=200)
 
@@ -108,7 +105,7 @@ def _pre_check_and_normalize_country(cls, v):
         return v
 
 
-# asserts field names are in sync
-assert set(PreRegisteredUserGet.model_fields).issubset(
+assert set(PreRegisteredUserGet.model_fields).issubset(  # nosec
+    # asserts field names are in sync
     UserAccountGet.model_fields
-)  # nosec
+)