Skip to content

Commit 8277e0f

Browse files
committed
rm legacy and move models
1 parent 06c9451 commit 8277e0f

File tree

5 files changed

+22
-33
lines changed

5 files changed

+22
-33
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
_security_service,
3131
_twofa_service,
3232
)
33-
from ..._login_repository_legacy import (
34-
ConfirmationTokenDict,
35-
)
3633
from ..._login_service import (
3734
ACTIVE,
3835
CHANGE_EMAIL,
3936
REGISTRATION,
4037
RESET_PASSWORD,
4138
notify_user_confirmation,
4239
)
43-
from ..._models import Confirmation
40+
from ..._models import (
41+
Confirmation,
42+
ConfirmationTokenDict,
43+
)
4444
from ...constants import (
4545
MSG_PASSWORD_CHANGE_NOT_ALLOWED,
4646
MSG_PASSWORD_CHANGED,

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
)
1313

1414
from ..._invitations_service import ConfirmedInvitationData
15-
from ..._login_repository_legacy import (
15+
from ..._models import (
1616
ConfirmationTokenDict,
17+
InputSchema,
18+
check_confirm_password_match,
1719
)
18-
from ..._models import InputSchema, check_confirm_password_match
1920

2021

2122
class CodePathParam(BaseModel):

services/web/server/src/simcore_service_webserver/login/_invitations_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
from ..users import users_service
4444
from . import _auth_service
4545
from ._controller.rest._rest_dependencies import get_confirmation_service
46-
from ._login_repository_legacy import (
46+
from ._models import (
4747
BaseConfirmationTokenDict,
4848
ConfirmationTokenDict,
4949
)

services/web/server/src/simcore_service_webserver/login/_login_repository_legacy.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

services/web/server/src/simcore_service_webserver/login/_models.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from collections.abc import Callable
22
from datetime import datetime
3-
from typing import Literal
3+
from typing import Literal, TypedDict
44

55
from models_library.users import UserID
66
from pydantic import BaseModel, ConfigDict, SecretStr, ValidationInfo
@@ -12,6 +12,19 @@
1212
]
1313

1414

15+
class BaseConfirmationTokenDict(TypedDict):
16+
code: str
17+
action: ActionLiteralStr
18+
19+
20+
class ConfirmationTokenDict(BaseConfirmationTokenDict):
21+
# SEE packages/postgres-database/src/simcore_postgres_database/models/confirmations.py
22+
user_id: int
23+
created_at: datetime
24+
# SEE handlers_confirmation.py::email_confirmation to determine what type is associated to each action
25+
data: str | None
26+
27+
1528
class Confirmation(BaseModel):
1629
code: str
1730
user_id: UserID

0 commit comments

Comments
 (0)