Skip to content

Commit c7a6255

Browse files
committed
updates models
1 parent ecbb33b commit c7a6255

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

services/web/server/src/simcore_service_webserver/login/_controller/rest/registration_schemas.py

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import logging
2-
from typing import Literal
2+
from typing import Annotated, Literal
33

44
from models_library.emails import LowerCaseEmailStr
55
from pydantic import (
@@ -18,20 +18,23 @@
1818

1919

2020
class InvitationCheck(InputSchema):
21-
invitation: str = Field(..., description="Invitation code")
21+
invitation: Annotated[str, Field(description="Invitation code")]
2222

2323

2424
class InvitationInfo(InputSchema):
25-
email: LowerCaseEmailStr | None = Field(
26-
None, description="Email associated to invitation or None"
27-
)
25+
email: Annotated[
26+
LowerCaseEmailStr | None,
27+
Field(description="Email associated to invitation or None"),
28+
] = None
2829

2930

3031
class RegisterBody(InputSchema):
3132
email: LowerCaseEmailStr
3233
password: SecretStr
33-
confirm: SecretStr | None = Field(None, description="Password confirmation")
34-
invitation: str | None = Field(None, description="Invitation code")
34+
confirm: Annotated[SecretStr | None, Field(description="Password confirmation")] = (
35+
None
36+
)
37+
invitation: Annotated[str | None, Field(description="Invitation code")] = None
3538

3639
_password_confirm_match = field_validator("confirm")(check_confirm_password_match)
3740
model_config = ConfigDict(
@@ -50,15 +53,21 @@ class RegisterBody(InputSchema):
5053

5154
class RegisterPhoneBody(InputSchema):
5255
email: LowerCaseEmailStr
53-
phone: str = Field(
54-
..., description="Phone number E.164, needed on the deployments with 2FA"
55-
)
56+
phone: Annotated[
57+
str, Field(description="Phone number E.164, needed on the deployments with 2FA")
58+
]
5659

5760

5861
class _PageParams(BaseModel):
5962
expiration_2fa: PositiveInt | None = None
6063

6164

65+
class RegisterPhoneNextPage(NextPage[_PageParams]):
66+
logger: str = "user"
67+
level: Literal["INFO", "WARNING", "ERROR"] = "INFO"
68+
message: str
69+
70+
6271
class RegisterPhoneNextPage(NextPage[_PageParams]):
6372
logger: str = Field("user", deprecated=True)
6473
level: Literal["INFO", "WARNING", "ERROR"] = "INFO"

0 commit comments

Comments
 (0)