change is rest

Author: pcrespov

api/specs/web-server/_auth.py

@@ -15,18 +15,18 @@
 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._change_service import (
-    ChangeEmailBody,
-    ChangePasswordBody,
-    ResetPasswordBody,
-)
 from simcore_service_webserver.login._controller._2fa_rest import Resend2faBody
 from simcore_service_webserver.login._controller.auth_rest import (
     LoginBody,
     LoginNextPage,
     LoginTwoFactorAuthBody,
     LogoutBody,
 )
+from simcore_service_webserver.login._controller.change_rest import (
+    ChangeEmailBody,
+    ChangePasswordBody,
+    ResetPasswordBody,
+)
 from simcore_service_webserver.login._controller.confirmation_rest import (
     PhoneConfirmationBody,
     ResetPasswordConfirmation,

services/web/server/src/simcore_service_webserver/login/_change_service.py renamed to services/web/server/src/simcore_service_webserver/login/_controller/change_rest.py

@@ -10,34 +10,34 @@
 from servicelib.request_keys import RQT_USERID_KEY
 from simcore_postgres_database.utils_users import UsersRepo
 
-from .._meta import API_VTAG
-from ..db.plugin import get_database_engine
-from ..products import products_web
-from ..products.models import Product
-from ..security.api import check_password, encrypt_password
-from ..users import api as users_service
-from ..utils import HOUR
-from ..utils_rate_limiting import global_rate_limit_route
-from . import _confirmation_service
-from ._constants import (
+from ..._meta import API_VTAG
+from ...db.plugin import get_database_engine
+from ...products import products_web
+from ...products.models import Product
+from ...security.api import check_password, encrypt_password
+from ...users import api as users_service
+from ...utils import HOUR
+from ...utils_rate_limiting import global_rate_limit_route
+from .. import _confirmation_service
+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 (
+from .._emails_service import get_template_path, send_email_from_template
+from .._login_repository_legacy import AsyncpgStorage, get_plugin_storage
+from .._login_service import (
     ACTIVE,
     CHANGE_EMAIL,
     flash_response,
     validate_user_status,
 )
-from ._models import InputSchema, create_password_match_validator
-from .decorators import login_required
-from .settings import LoginOptions, get_plugin_options
+from .._models import InputSchema, create_password_match_validator
+from ..decorators import login_required
+from ..settings import LoginOptions, get_plugin_options
 
 _logger = logging.getLogger(__name__)
 

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

@@ -23,12 +23,10 @@
 from ..products.plugin import setup_products
 from ..redis import setup_redis
 from ..rest.plugin import setup_rest
-from . import (
-    _change_service,
-)
 from ._constants import APP_LOGIN_SETTINGS_PER_PRODUCT_KEY
 from ._controller import (
     auth_rest,
+    change_rest,
     confirmation_rest,
     preregistration_rest,
     registration_rest,
@@ -144,7 +142,7 @@ def setup_login(app: web.Application):
     app.router.add_routes(confirmation_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(change_rest.routes)
     app.router.add_routes(twofa_rest.routes)
 
     _setup_login_options(app)