schema split

Author: pcrespov

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

@@ -1,10 +1,7 @@
 import logging
-from typing import Literal
 
 from aiohttp import web
 from aiohttp.web import RouteTableDef
-from models_library.emails import LowerCaseEmailStr
-from pydantic import Field
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import parse_request_body_as
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
@@ -15,7 +12,6 @@
 from ....web_utils import envelope_response
 from ... import _twofa_service
 from ..._login_repository_legacy import AsyncpgStorage, get_plugin_storage
-from ..._models import InputSchema
 from ...constants import (
     CODE_2FA_EMAIL_CODE_REQUIRED,
     CODE_2FA_SMS_CODE_REQUIRED,
@@ -25,18 +21,14 @@
 )
 from ...settings import LoginSettingsForProduct, get_plugin_settings
 from ._rest_exceptions import handle_rest_requests_exceptions
+from .twofa_schemas import Resend2faBody
 
 _logger = logging.getLogger(__name__)
 
 
 routes = RouteTableDef()
 
 
-class Resend2faBody(InputSchema):
-    email: LowerCaseEmailStr = Field(..., description="User email (identifier)")
-    via: Literal["SMS", "Email"] = "SMS"
-
-
 @routes.post("/v0/auth/two_factor:resend", name="auth_resend_2fa_code")
 @session_access_required(
     name="auth_resend_2fa_code",

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

@@ -0,0 +1,11 @@
+from typing import Literal
+
+from models_library.emails import LowerCaseEmailStr
+from pydantic import Field
+
+from ..._models import InputSchema
+
+
+class Resend2faBody(InputSchema):
+    email: LowerCaseEmailStr = Field(..., description="User email (identifier)")
+    via: Literal["SMS", "Email"] = "SMS"

services/web/server/tests/unit/with_dbs/03/login/test_login_twofa_resend.py

@@ -13,7 +13,7 @@
 from servicelib.aiohttp import status
 from simcore_postgres_database.models.products import ProductLoginSettingsDict, products
 from simcore_service_webserver.application_settings import ApplicationSettings
-from simcore_service_webserver.login._controller.rest.auth import (
+from simcore_service_webserver.login._controller.rest.auth_schemas import (
     CodePageParams,
     NextPage,
 )