missing

Author: pcrespov

api/specs/web-server/_auth.py

@@ -31,7 +31,7 @@
     PhoneConfirmationBody,
     ResetPasswordConfirmation,
 )
-from simcore_service_webserver.login._registration_rest import (
+from simcore_service_webserver.login._controller.registration_rest import (
     InvitationCheck,
     InvitationInfo,
     RegisterBody,

services/web/server/src/simcore_service_webserver/login/_registration_rest.py renamed to services/web/server/src/simcore_service_webserver/login/_controller/registration_rest.py

@@ -20,20 +20,20 @@
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from simcore_postgres_database.models.users import UserStatus
 
-from .._meta import API_VTAG
-from ..groups.api import auto_add_user_to_groups, auto_add_user_to_product_group
-from ..invitations.api import is_service_invitation_code
-from ..products import products_web
-from ..products.models import Product
-from ..session.access_policies import (
+from ..._meta import API_VTAG
+from ...groups.api import auto_add_user_to_groups, auto_add_user_to_product_group
+from ...invitations.api import is_service_invitation_code
+from ...products import products_web
+from ...products.models import Product
+from ...session.access_policies import (
     on_success_grant_session_access_to,
     session_access_required,
 )
-from ..utils import MINUTE
-from ..utils_aiohttp import NextPage, envelope_json_response
-from ..utils_rate_limiting import global_rate_limit_route
-from . import _2fa_service, _auth_service, _confirmation_service, _security_service
-from ._constants import (
+from ...utils import MINUTE
+from ...utils_aiohttp import NextPage, envelope_json_response
+from ...utils_rate_limiting import global_rate_limit_route
+from .. import _2fa_service, _auth_service, _confirmation_service, _security_service
+from .._constants import (
     CODE_2FA_SMS_CODE_REQUIRED,
     MAX_2FA_CODE_RESEND,
     MAX_2FA_CODE_TRIALS,
@@ -42,25 +42,25 @@
     MSG_UNAUTHORIZED_REGISTER_PHONE,
     MSG_WEAK_PASSWORD,
 )
-from ._emails_service import get_template_path, send_email_from_template
-from ._invitations_service import (
+from .._emails_service import get_template_path, send_email_from_template
+from .._invitations_service import (
     check_and_consume_invitation,
     check_other_registrations,
     extract_email_from_invitation,
 )
-from ._login_repository_legacy import (
+from .._login_repository_legacy import (
     AsyncpgStorage,
     ConfirmationTokenDict,
     get_plugin_storage,
 )
-from ._login_service import (
+from .._login_service import (
     envelope_response,
     flash_response,
     get_user_name_from_email,
     notify_user_confirmation,
 )
-from ._models import InputSchema, check_confirm_password_match
-from .settings import (
+from .._models import InputSchema, check_confirm_password_match
+from ..settings import (
     LoginOptions,
     LoginSettingsForProduct,
     get_plugin_options,

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

@@ -25,14 +25,14 @@
 from ..rest.plugin import setup_rest
 from . import (
     _change_service,
-    _registration_rest,
 )
 from ._constants import APP_LOGIN_SETTINGS_PER_PRODUCT_KEY
 from ._controller import (
     _2fa_rest,
     auth_rest,
     confirmation_rest,
     preregistration_rest,
+    registration_rest,
 )
 from ._login_repository_legacy import APP_LOGIN_STORAGE_KEY, AsyncpgStorage
 from .settings import (
@@ -142,7 +142,7 @@ def setup_login(app: web.Application):
 
     app.router.add_routes(auth_rest.routes)
     app.router.add_routes(confirmation_rest.routes)
-    app.router.add_routes(_registration_rest.routes)
+    app.router.add_routes(registration_rest.routes)
     app.router.add_routes(preregistration_rest.routes)
     app.router.add_routes(_change_service.routes)
     app.router.add_routes(_2fa_rest.routes)

services/web/server/tests/unit/with_dbs/03/invitations/test_login_handlers_registration_invitations.py

@@ -18,7 +18,7 @@
 from servicelib.aiohttp import status
 from servicelib.rest_constants import X_PRODUCT_NAME_HEADER
 from simcore_service_webserver.invitations.api import generate_invitation
-from simcore_service_webserver.login._registration_rest import (
+from simcore_service_webserver.login._controller.registration_rest import (
     InvitationCheck,
     InvitationInfo,
 )