rename imports

Author: pcrespov

api/specs/web-server/_auth.py

@@ -15,7 +15,6 @@
 from models_library.rest_error import EnvelopedError, Log
 from pydantic import BaseModel, Field, confloat
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.login._controller._2fa_rest import Resend2faBody
 from simcore_service_webserver.login._controller.auth_rest import (
     LoginBody,
     LoginNextPage,
@@ -38,6 +37,7 @@
     RegisterPhoneBody,
     RegisterPhoneNextPage,
 )
+from simcore_service_webserver.login._controller.twofa_rest import Resend2faBody
 
 router = APIRouter(prefix=f"/{API_VTAG}", tags=["auth"])
 

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

@@ -79,11 +79,11 @@ def postgres_db(postgres_db: sa.engine.Engine):
 def mocked_twilio_service(mocker: MockerFixture) -> dict[str, Mock]:
     return {
         "send_sms_code_for_registration": mocker.patch(
-            "simcore_service_webserver.login._controller.registration_rest._2fa_service.send_sms_code",
+            "simcore_service_webserver.login._controller.registration_rest.twofa_service.send_sms_code",
             autospec=True,
         ),
         "send_sms_code_for_login": mocker.patch(
-            "simcore_service_webserver.login._controller.auth_rest._2fa_service.send_sms_code",
+            "simcore_service_webserver.login._controller.auth_rest.twofa_service.send_sms_code",
             autospec=True,
         ),
     }
@@ -421,7 +421,7 @@ async def test_2fa_sms_failure_during_login(
 
     mocker.patch(
         # MD: Emulates error in graylog https://monitoring.osparc.io/graylog/search/649e7619ce6e0838a96e9bf1?q=%222FA%22&rangetype=relative&from=172800
-        "simcore_service_webserver.login._2fa_service.twilio.rest.Client",
+        "simcore_service_webserver.login.twofa_service.twilio.rest.Client",
         autospec=True,
         side_effect=TwilioRestException(
             status=400,

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

@@ -82,21 +82,21 @@ async def test_resend_2fa_workflow(
 
     # spy send functions
     mocker.patch(
-        "simcore_service_webserver.login._controller.2fa_rest._2fa_service.send_sms_code",
+        "simcore_service_webserver.login._controller.twofa_rest._twofa_service.send_sms_code",
         autospec=True,
     )
     mock_send_sms_code2 = mocker.patch(
-        "simcore_service_webserver.login._controller.auth_rest._2fa_service.send_sms_code",
+        "simcore_service_webserver.login._controller.auth_rest._twofa_service.send_sms_code",
         autospec=True,
     )
 
     mock_send_email_code = mocker.patch(
-        "simcore_service_webserver.login._controller.2fa_rest._2fa_service.send_email_code",
+        "simcore_service_webserver.login._controller.twofa_rest._twofa_service.send_email_code",
         autospec=True,
     )
 
     mock_get_2fa_code = mocker.patch(
-        "simcore_service_webserver.login._controller.2fa_rest._2fa_service.get_2fa_code",
+        "simcore_service_webserver.login._controller.twofa_rest._twofa_service.get_2fa_code",
         autospec=True,
         return_value=None,  # <-- Emulates code expired
     )