moving pre-registration

pcrespov · pcrespov · commit cbfea07b54bf · 2025-07-08T13:42:27.000+02:00
diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/webserver_login.py b/packages/pytest-simcore/src/pytest_simcore/helpers/webserver_login.py
@@ -5,11 +5,11 @@
 
 from aiohttp.test_utils import TestClient
 from servicelib.aiohttp import status
-from simcore_service_webserver.login._constants import MSG_LOGGED_IN
 from simcore_service_webserver.login._invitations_service import create_invitation_token
 from simcore_service_webserver.login._login_repository_legacy import (
     get_plugin_storage,
 )
+from simcore_service_webserver.login.constants import MSG_LOGGED_IN
 from simcore_service_webserver.security import security_service
 from yarl import URL
 
diff --git a/services/web/server/src/simcore_service_webserver/login/_auth_service.py b/services/web/server/src/simcore_service_webserver/login/_auth_service.py
@@ -12,8 +12,8 @@
 from ..products.models import Product
 from ..security import security_service
 from . import _login_service
-from ._constants import MSG_UNKNOWN_EMAIL, MSG_WRONG_PASSWORD
 from ._login_repository_legacy import AsyncpgStorage, get_plugin_storage
+from .constants import MSG_UNKNOWN_EMAIL, MSG_WRONG_PASSWORD
 
 
 async def get_user_by_email(app: web.Application, *, email: str) -> dict[str, Any]:
diff --git a/services/web/server/src/simcore_service_webserver/login/_controller/rest/_rest_exceptions.py b/services/web/server/src/simcore_service_webserver/login/_controller/rest/_rest_exceptions.py
@@ -8,7 +8,7 @@
     to_exceptions_handlers_map,
 )
 from ....users.exceptions import AlreadyPreRegisteredError
-from ..._constants import MSG_2FA_UNAVAILABLE
+from ...constants import MSG_2FA_UNAVAILABLE
 from ...errors import SendingVerificationEmailError, SendingVerificationSmsError
 
 _TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {
diff --git a/services/web/server/src/simcore_service_webserver/login/_controller/rest/auth.py b/services/web/server/src/simcore_service_webserver/login/_controller/rest/auth.py
@@ -23,7 +23,8 @@
 from ....users import preferences_api as user_preferences_api
 from ....utils_aiohttp import NextPage
 from ... import _auth_service, _login_service, _security_service, _twofa_service
-from ..._constants import (
+from ..._models import InputSchema
+from ...constants import (
     CODE_2FA_EMAIL_CODE_REQUIRED,
     CODE_2FA_SMS_CODE_REQUIRED,
     CODE_PHONE_NUMBER_REQUIRED,
@@ -37,7 +38,6 @@
     MSG_WRONG_2FA_CODE__EXPIRED,
     MSG_WRONG_2FA_CODE__INVALID,
 )
-from ..._models import InputSchema
 from ...decorators import login_required
 from ...settings import LoginSettingsForProduct, get_plugin_settings
 from ._rest_exceptions import handle_rest_requests_exceptions
diff --git a/services/web/server/src/simcore_service_webserver/login/_controller/rest/change.py b/services/web/server/src/simcore_service_webserver/login/_controller/rest/change.py
@@ -19,14 +19,6 @@
 from ....utils import HOUR
 from ....utils_rate_limiting import global_rate_limit_route
 from ... import _confirmation_service, _confirmation_web
-from ..._constants import (
-    MSG_CANT_SEND_MAIL,
-    MSG_CHANGE_EMAIL_REQUESTED,
-    MSG_EMAIL_SENT,
-    MSG_OFTEN_RESET_PASSWORD,
-    MSG_PASSWORD_CHANGED,
-    MSG_WRONG_PASSWORD,
-)
 from ..._emails_service import get_template_path, send_email_from_template
 from ..._login_repository_legacy import AsyncpgStorage, get_plugin_storage
 from ..._login_service import (
@@ -36,6 +28,14 @@
     validate_user_status,
 )
 from ..._models import InputSchema, create_password_match_validator
+from ...constants import (
+    MSG_CANT_SEND_MAIL,
+    MSG_CHANGE_EMAIL_REQUESTED,
+    MSG_EMAIL_SENT,
+    MSG_OFTEN_RESET_PASSWORD,
+    MSG_PASSWORD_CHANGED,
+    MSG_WRONG_PASSWORD,
+)
 from ...decorators import login_required
 from ...settings import LoginOptions, get_plugin_options
 
diff --git a/services/web/server/src/simcore_service_webserver/login/_controller/rest/confirmation.py b/services/web/server/src/simcore_service_webserver/login/_controller/rest/confirmation.py
@@ -34,11 +34,6 @@
 from ....utils_aiohttp import create_redirect_to_page_response
 from ....utils_rate_limiting import global_rate_limit_route
 from ... import _confirmation_service, _security_service, _twofa_service
-from ..._constants import (
-    MSG_PASSWORD_CHANGE_NOT_ALLOWED,
-    MSG_PASSWORD_CHANGED,
-    MSG_UNAUTHORIZED_PHONE_CONFIRMATION,
-)
 from ..._invitations_service import ConfirmedInvitationData
 from ..._login_repository_legacy import (
     AsyncpgStorage,
@@ -54,6 +49,11 @@
     notify_user_confirmation,
 )
 from ..._models import InputSchema, check_confirm_password_match
+from ...constants import (
+    MSG_PASSWORD_CHANGE_NOT_ALLOWED,
+    MSG_PASSWORD_CHANGED,
+    MSG_UNAUTHORIZED_PHONE_CONFIRMATION,
+)
 from ...settings import (
     LoginOptions,
     LoginSettingsForProduct,
diff --git a/services/web/server/src/simcore_service_webserver/login/_controller/rest/registration.py b/services/web/server/src/simcore_service_webserver/login/_controller/rest/registration.py
@@ -33,15 +33,6 @@
 from ....utils_aiohttp import NextPage, envelope_json_response
 from ....utils_rate_limiting import global_rate_limit_route
 from ... import _auth_service, _confirmation_web, _security_service, _twofa_service
-from ..._constants import (
-    CODE_2FA_SMS_CODE_REQUIRED,
-    MAX_2FA_CODE_RESEND,
-    MAX_2FA_CODE_TRIALS,
-    MSG_2FA_CODE_SENT,
-    MSG_CANT_SEND_MAIL,
-    MSG_UNAUTHORIZED_REGISTER_PHONE,
-    MSG_WEAK_PASSWORD,
-)
 from ..._emails_service import get_template_path, send_email_from_template
 from ..._invitations_service import (
     ConfirmedInvitationData,
@@ -61,6 +52,15 @@
     notify_user_confirmation,
 )
 from ..._models import InputSchema, check_confirm_password_match
+from ...constants import (
+    CODE_2FA_SMS_CODE_REQUIRED,
+    MAX_2FA_CODE_RESEND,
+    MAX_2FA_CODE_TRIALS,
+    MSG_2FA_CODE_SENT,
+    MSG_CANT_SEND_MAIL,
+    MSG_UNAUTHORIZED_REGISTER_PHONE,
+    MSG_WEAK_PASSWORD,
+)
 from ...settings import (
     LoginOptions,
     LoginSettingsForProduct,
diff --git a/services/web/server/src/simcore_service_webserver/login/_controller/rest/twofa.py b/services/web/server/src/simcore_service_webserver/login/_controller/rest/twofa.py
@@ -13,16 +13,16 @@
 from ....products.models import Product
 from ....session.access_policies import session_access_required
 from ... import _twofa_service
-from ..._constants import (
+from ..._login_repository_legacy import AsyncpgStorage, get_plugin_storage
+from ..._login_service import envelope_response
+from ..._models import InputSchema
+from ...constants import (
     CODE_2FA_EMAIL_CODE_REQUIRED,
     CODE_2FA_SMS_CODE_REQUIRED,
     MSG_2FA_CODE_SENT,
     MSG_EMAIL_SENT,
     MSG_UNKNOWN_EMAIL,
 )
-from ..._login_repository_legacy import AsyncpgStorage, get_plugin_storage
-from ..._login_service import envelope_response
-from ..._models import InputSchema
 from ...settings import LoginSettingsForProduct, get_plugin_settings
 from ._rest_exceptions import handle_rest_requests_exceptions
 
diff --git a/services/web/server/src/simcore_service_webserver/login/_invitations_service.py b/services/web/server/src/simcore_service_webserver/login/_invitations_service.py
@@ -41,16 +41,16 @@
 )
 from ..products.models import Product
 from . import _confirmation_service
-from ._constants import (
-    MSG_EMAIL_ALREADY_REGISTERED,
-    MSG_INVITATIONS_CONTACT_SUFFIX,
-    MSG_USER_DISABLED,
-)
 from ._login_repository_legacy import (
     AsyncpgStorage,
     BaseConfirmationTokenDict,
     ConfirmationTokenDict,
 )
+from .constants import (
+    MSG_EMAIL_ALREADY_REGISTERED,
+    MSG_INVITATIONS_CONTACT_SUFFIX,
+    MSG_USER_DISABLED,
+)
 from .settings import LoginOptions
 
 _logger = logging.getLogger(__name__)
diff --git a/services/web/server/src/simcore_service_webserver/login/_login_service.py b/services/web/server/src/simcore_service_webserver/login/_login_service.py
@@ -12,7 +12,7 @@
 from simcore_postgres_database.models.users import UserRole
 
 from ..db.models import ConfirmationAction, UserStatus
-from ._constants import (
+from .constants import (
     MSG_ACTIVATION_REQUIRED,
     MSG_USER_BANNED,
     MSG_USER_DELETED,
diff --git a/services/web/server/src/simcore_service_webserver/login/_models.py b/services/web/server/src/simcore_service_webserver/login/_models.py
@@ -2,7 +2,7 @@
 
 from pydantic import BaseModel, ConfigDict, SecretStr, ValidationInfo
 
-from ._constants import MSG_PASSWORD_MISMATCH
+from .constants import MSG_PASSWORD_MISMATCH
 
 
 class InputSchema(BaseModel):
diff --git a/services/web/server/src/simcore_service_webserver/login/_security_service.py b/services/web/server/src/simcore_service_webserver/login/_security_service.py
@@ -7,8 +7,8 @@
 from servicelib.logging_utils import get_log_record_extra, log_context
 
 from ..security import security_web
-from ._constants import MSG_LOGGED_IN
 from ._login_service import flash_response
+from .constants import MSG_LOGGED_IN
 
 _logger = logging.getLogger(__name__)
 
diff --git a/services/web/server/src/simcore_service_webserver/login/constants.py b/services/web/server/src/simcore_service_webserver/login/constants.py
diff --git a/services/web/server/src/simcore_service_webserver/login/plugin.py b/services/web/server/src/simcore_service_webserver/login/plugin.py
@@ -22,22 +22,22 @@
 from ..email.plugin import setup_email
 from ..email.settings import get_plugin_settings as get_email_plugin_settings
 from ..invitations.plugin import setup_invitations
+from ..login_account._controller.rest import preregistration
 from ..login_auth.plugin import setup_login_auth
 from ..products import products_service
 from ..products.models import ProductName
 from ..products.plugin import setup_products
 from ..redis import setup_redis
 from ..rest.plugin import setup_rest
-from ._constants import APP_LOGIN_SETTINGS_PER_PRODUCT_KEY
 from ._controller.rest import (
     auth,
     change,
     confirmation,
-    preregistration,
     registration,
     twofa,
 )
 from ._login_repository_legacy import APP_LOGIN_STORAGE_KEY, AsyncpgStorage
+from .constants import APP_LOGIN_SETTINGS_PER_PRODUCT_KEY
 from .settings import (
     APP_LOGIN_OPTIONS_KEY,
     LoginOptions,
diff --git a/services/web/server/src/simcore_service_webserver/login/settings.py b/services/web/server/src/simcore_service_webserver/login/settings.py
@@ -10,7 +10,7 @@
 from settings_library.twilio import TwilioSettings
 from simcore_postgres_database.models.products import ProductLoginSettingsDict
 
-from ._constants import APP_LOGIN_SETTINGS_PER_PRODUCT_KEY
+from .constants import APP_LOGIN_SETTINGS_PER_PRODUCT_KEY
 
 _DAYS: Final[float] = 1.0  # in days
 _MINUTES: Final[float] = 1.0 / 24.0 / 60.0  # in days
diff --git a/services/web/server/src/simcore_service_webserver/login_account/__init__.py b/services/web/server/src/simcore_service_webserver/login_account/__init__.py
@@ -0,0 +1,3 @@
+"""
+Account management
+"""
diff --git a/services/web/server/src/simcore_service_webserver/login_account/_controller/__init__.py b/services/web/server/src/simcore_service_webserver/login_account/_controller/__init__.py
diff --git a/services/web/server/src/simcore_service_webserver/login_account/_controller/rest/__init__.py b/services/web/server/src/simcore_service_webserver/login_account/_controller/rest/__init__.py
diff --git a/services/web/server/src/simcore_service_webserver/login_account/_controller/rest/preregistration.py b/services/web/server/src/simcore_service_webserver/login_account/_controller/rest/preregistration.py
@@ -6,17 +6,23 @@
     AccountRequestInfo,
     UnregisterCheck,
 )
-from models_library.users import UserID
-from pydantic import BaseModel, Field
 from servicelib.aiohttp import status
 from servicelib.aiohttp.application_keys import APP_FIRE_AND_FORGET_TASKS_KEY
 from servicelib.aiohttp.requests_validation import parse_request_body_as
 from servicelib.logging_utils import get_log_record_extra, log_context
-from servicelib.request_keys import RQT_USERID_KEY
 from servicelib.utils import fire_and_forget_task
 
 from ...._meta import API_VTAG
-from ....constants import RQ_PRODUCT_KEY
+from ....login._controller.rest._rest_exceptions import handle_rest_requests_exceptions
+from ....login._login_service import flash_response, notify_user_logout
+from ....login.constants import (
+    CAPTCHA_SESSION_KEY,
+    MSG_LOGGED_OUT,
+    MSG_WRONG_CAPTCHA__INVALID,
+)
+from ....login.settings import LoginSettingsForProduct, get_plugin_settings
+from ....login_auth.decorators import login_required
+from ....models import AuthenticatedRequestContext
 from ....products import products_web
 from ....products.models import Product
 from ....security import security_service, security_web
@@ -27,15 +33,6 @@
 from ....utils import MINUTE
 from ....utils_rate_limiting import global_rate_limit_route
 from ... import _preregistration_service
-from ..._constants import (
-    CAPTCHA_SESSION_KEY,
-    MSG_LOGGED_OUT,
-    MSG_WRONG_CAPTCHA__INVALID,
-)
-from ..._login_service import flash_response, notify_user_logout
-from ...decorators import login_required
-from ...settings import LoginSettingsForProduct, get_plugin_settings
-from ._rest_exceptions import handle_rest_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 
@@ -97,17 +94,12 @@ async def request_product_account(request: web.Request):
     return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
-class _AuthenticatedContext(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]
-
-
 @routes.post(f"/{API_VTAG}/auth/unregister", name="unregister_account")
 @login_required
 @permission_required("user.profile.delete")
 @handle_rest_requests_exceptions
 async def unregister_account(request: web.Request):
-    req_ctx = _AuthenticatedContext.model_validate(request)
+    req_ctx = AuthenticatedRequestContext.model_validate(request)
     body = await parse_request_body_as(UnregisterCheck, request)
 
     product: Product = products_web.get_current_product(request)
diff --git a/services/web/server/src/simcore_service_webserver/login_account/_preregistration_service.py b/services/web/server/src/simcore_service_webserver/login_account/_preregistration_service.py
diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_auth.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_auth.py
@@ -23,7 +23,7 @@
 from simcore_postgres_database.models.users import UserRole
 from simcore_service_webserver.constants import APP_SETTINGS_KEY
 from simcore_service_webserver.db.models import UserStatus
-from simcore_service_webserver.login._constants import (
+from simcore_service_webserver.login.constants import (
     MSG_ACTIVATION_REQUIRED,
     MSG_LOGGED_IN,
     MSG_UNKNOWN_EMAIL,
diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_change_email.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_change_email.py
@@ -8,7 +8,7 @@
 from pytest_simcore.helpers.webserver_login import LoggedUser, NewUser, parse_link
 from servicelib.aiohttp import status
 from simcore_service_webserver.constants import INDEX_RESOURCE_NAME
-from simcore_service_webserver.login._constants import (
+from simcore_service_webserver.login.constants import (
     MSG_CHANGE_EMAIL_REQUESTED,
     MSG_LOGGED_IN,
     MSG_LOGGED_OUT,
diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_change_password.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_change_password.py
@@ -9,7 +9,7 @@
 from pytest_simcore.helpers.webserver_login import LoggedUser
 from servicelib.aiohttp import status
 from servicelib.rest_responses import unwrap_envelope
-from simcore_service_webserver.login._constants import (
+from simcore_service_webserver.login.constants import (
     MSG_LOGGED_IN,
     MSG_PASSWORD_CHANGED,
     MSG_PASSWORD_MISMATCH,
diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_preregistration.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_preregistration.py
@@ -20,7 +20,7 @@
 from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
 from servicelib.aiohttp import status
 from simcore_postgres_database.models.users import UserRole
-from simcore_service_webserver.login._constants import MSG_USER_DELETED
+from simcore_service_webserver.login.constants import MSG_USER_DELETED
 from simcore_service_webserver.products.products_service import get_product
 
 
diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_registration.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_registration.py
@@ -20,13 +20,13 @@
 from simcore_service_webserver.db.models import UserStatus
 from simcore_service_webserver.groups.api import auto_add_user_to_product_group
 from simcore_service_webserver.login._confirmation_web import _url_for_confirmation
-from simcore_service_webserver.login._constants import (
+from simcore_service_webserver.login._login_repository_legacy import AsyncpgStorage
+from simcore_service_webserver.login.constants import (
     MSG_EMAIL_ALREADY_REGISTERED,
     MSG_LOGGED_IN,
     MSG_PASSWORD_MISMATCH,
     MSG_WEAK_PASSWORD,
 )
-from simcore_service_webserver.login._login_repository_legacy import AsyncpgStorage
 from simcore_service_webserver.login.settings import (
     LoginOptions,
     LoginSettingsForProduct,
diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_reset_password.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_reset_password.py
@@ -18,18 +18,18 @@
 from servicelib.utils_secrets import generate_password
 from simcore_service_webserver.db.models import ConfirmationAction, UserStatus
 from simcore_service_webserver.groups import api as groups_service
-from simcore_service_webserver.login._constants import (
+from simcore_service_webserver.login._login_repository_legacy import (
+    AsyncpgStorage,
+    ConfirmationTokenDict,
+)
+from simcore_service_webserver.login.constants import (
     MSG_ACTIVATION_REQUIRED,
     MSG_EMAIL_SENT,
     MSG_LOGGED_IN,
     MSG_PASSWORD_CHANGED,
     MSG_USER_BANNED,
     MSG_USER_EXPIRED,
 )
-from simcore_service_webserver.login._login_repository_legacy import (
-    AsyncpgStorage,
-    ConfirmationTokenDict,
-)
 from simcore_service_webserver.login.settings import LoginOptions
 from simcore_service_webserver.users import api as users_service
 from yarl import URL
diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_twofa.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_twofa.py
diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_twofa_resend.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_twofa_resend.py
diff --git a/services/web/server/tests/unit/with_dbs/03/test_email.py b/services/web/server/tests/unit/with_dbs/03/test_email.py
diff --git a/services/web/server/tests/unit/with_dbs/03/test_session_access_policies.py b/services/web/server/tests/unit/with_dbs/03/test_session_access_policies.py

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`to_exceptions_handlers_map,`
`9`	`9`	`)`
`10`	`10`	`from ....users.exceptions import AlreadyPreRegisteredError`
`11`		`-from ..._constants import MSG_2FA_UNAVAILABLE`
	`11`	`+from ...constants import MSG_2FA_UNAVAILABLE`
`12`	`12`	`from ...errors import SendingVerificationEmailError, SendingVerificationSmsError`
`13`	`13`
`14`	`14`	`_TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {`