Skip to content

Commit 54904a5

Browse files
pcrespovpcrespov
committed
rename
1 parent 42568b7 commit 54904a5

File tree

12 files changed

+110
-106
lines changed

12 files changed

+110
-106
lines changed

‎api/specs/web-server/_auth.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,29 @@
1515
from models_library.rest_error import EnvelopedError, Log
1616
from pydantic import BaseModel, Field, confloat
1717
from simcore_service_webserver._meta import API_VTAG
18-
from simcore_service_webserver.login._controller.auth_rest import (
18+
from simcore_service_webserver.login._controller.rest.auth import (
1919
LoginBody,
2020
LoginNextPage,
2121
LoginTwoFactorAuthBody,
2222
LogoutBody,
2323
)
24-
from simcore_service_webserver.login._controller.change_rest import (
24+
from simcore_service_webserver.login._controller.rest.change import (
2525
ChangeEmailBody,
2626
ChangePasswordBody,
2727
ResetPasswordBody,
2828
)
29-
from simcore_service_webserver.login._controller.confirmation_rest import (
29+
from simcore_service_webserver.login._controller.rest.confirmation import (
3030
PhoneConfirmationBody,
3131
ResetPasswordConfirmation,
3232
)
33-
from simcore_service_webserver.login._controller.registration_rest import (
33+
from simcore_service_webserver.login._controller.rest.registration import (
3434
InvitationCheck,
3535
InvitationInfo,
3636
RegisterBody,
3737
RegisterPhoneBody,
3838
RegisterPhoneNextPage,
3939
)
40-
from simcore_service_webserver.login._controller.twofa_rest import Resend2faBody
40+
from simcore_service_webserver.login._controller.rest.twofa import Resend2faBody
4141

4242
router = APIRouter(prefix=f"/{API_VTAG}", tags=["auth"])
4343

‎services/web/server/src/simcore_service_webserver/login/_controller/rest/__init__.py‎

Whitespace-only changes.

‎services/web/server/src/simcore_service_webserver/login/_controller/auth_rest.py‎ renamed to ‎services/web/server/src/simcore_service_webserver/login/_controller/rest/auth.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
from servicelib.request_keys import RQT_USERID_KEY
1313
from simcore_postgres_database.models.users import UserRole
1414

15-
from ..._meta import API_VTAG
16-
from ...products import products_web
17-
from ...products.models import Product
18-
from ...security import api as security_service
19-
from ...session.access_policies import (
15+
from ...._meta import API_VTAG
16+
from ....products import products_web
17+
from ....products.models import Product
18+
from ....security import api as security_service
19+
from ....session.access_policies import (
2020
on_success_grant_session_access_to,
2121
session_access_required,
2222
)
23-
from ...users import preferences_api as user_preferences_api
24-
from ...utils_aiohttp import NextPage
25-
from .. import _auth_service, _login_service, _security_service, _twofa_service
26-
from .._constants import (
23+
from ....users import preferences_api as user_preferences_api
24+
from ....utils_aiohttp import NextPage
25+
from ... import _auth_service, _login_service, _security_service, _twofa_service
26+
from ..._constants import (
2727
CODE_2FA_EMAIL_CODE_REQUIRED,
2828
CODE_2FA_SMS_CODE_REQUIRED,
2929
CODE_PHONE_NUMBER_REQUIRED,
@@ -37,10 +37,10 @@
3737
MSG_WRONG_2FA_CODE__EXPIRED,
3838
MSG_WRONG_2FA_CODE__INVALID,
3939
)
40-
from .._models import InputSchema
41-
from ..decorators import login_required
42-
from ..errors import handle_login_exceptions
43-
from ..settings import LoginSettingsForProduct, get_plugin_settings
40+
from ..._models import InputSchema
41+
from ...decorators import login_required
42+
from ...errors import handle_login_exceptions
43+
from ...settings import LoginSettingsForProduct, get_plugin_settings
4444

4545
log = logging.getLogger(__name__)
4646

‎services/web/server/src/simcore_service_webserver/login/_controller/change_rest.py‎ renamed to ‎services/web/server/src/simcore_service_webserver/login/_controller/rest/change.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,34 @@
1010
from servicelib.request_keys import RQT_USERID_KEY
1111
from simcore_postgres_database.utils_users import UsersRepo
1212

13-
from ..._meta import API_VTAG
14-
from ...db.plugin import get_database_engine
15-
from ...products import products_web
16-
from ...products.models import Product
17-
from ...security.api import check_password, encrypt_password
18-
from ...users import api as users_service
19-
from ...utils import HOUR
20-
from ...utils_rate_limiting import global_rate_limit_route
21-
from .. import _confirmation_service
22-
from .._constants import (
13+
from ...._meta import API_VTAG
14+
from ....db.plugin import get_database_engine
15+
from ....products import products_web
16+
from ....products.models import Product
17+
from ....security.api import check_password, encrypt_password
18+
from ....users import api as users_service
19+
from ....utils import HOUR
20+
from ....utils_rate_limiting import global_rate_limit_route
21+
from ... import _confirmation_service
22+
from ..._constants import (
2323
MSG_CANT_SEND_MAIL,
2424
MSG_CHANGE_EMAIL_REQUESTED,
2525
MSG_EMAIL_SENT,
2626
MSG_OFTEN_RESET_PASSWORD,
2727
MSG_PASSWORD_CHANGED,
2828
MSG_WRONG_PASSWORD,
2929
)
30-
from .._emails_service import get_template_path, send_email_from_template
31-
from .._login_repository_legacy import AsyncpgStorage, get_plugin_storage
32-
from .._login_service import (
30+
from ..._emails_service import get_template_path, send_email_from_template
31+
from ..._login_repository_legacy import AsyncpgStorage, get_plugin_storage
32+
from ..._login_service import (
3333
ACTIVE,
3434
CHANGE_EMAIL,
3535
flash_response,
3636
validate_user_status,
3737
)
38-
from .._models import InputSchema, create_password_match_validator
39-
from ..decorators import login_required
40-
from ..settings import LoginOptions, get_plugin_options
38+
from ..._models import InputSchema, create_password_match_validator
39+
from ...decorators import login_required
40+
from ...settings import LoginOptions, get_plugin_options
4141

4242
_logger = logging.getLogger(__name__)
4343

‎services/web/server/src/simcore_service_webserver/login/_controller/confirmation_rest.py‎ renamed to ‎services/web/server/src/simcore_service_webserver/login/_controller/rest/confirmation.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,35 +26,35 @@
2626
from simcore_postgres_database.aiopg_errors import UniqueViolation
2727
from yarl import URL
2828

29-
from ...products import products_web
30-
from ...products.models import Product
31-
from ...security.api import encrypt_password
32-
from ...session.access_policies import session_access_required
33-
from ...utils import HOUR, MINUTE
34-
from ...utils_aiohttp import create_redirect_to_page_response
35-
from ...utils_rate_limiting import global_rate_limit_route
36-
from .. import _confirmation_service, _security_service, _twofa_service
37-
from .._constants import (
29+
from ....products import products_web
30+
from ....products.models import Product
31+
from ....security.api import encrypt_password
32+
from ....session.access_policies import session_access_required
33+
from ....utils import HOUR, MINUTE
34+
from ....utils_aiohttp import create_redirect_to_page_response
35+
from ....utils_rate_limiting import global_rate_limit_route
36+
from ... import _confirmation_service, _security_service, _twofa_service
37+
from ..._constants import (
3838
MSG_PASSWORD_CHANGE_NOT_ALLOWED,
3939
MSG_PASSWORD_CHANGED,
4040
MSG_UNAUTHORIZED_PHONE_CONFIRMATION,
4141
)
42-
from .._invitations_service import ConfirmedInvitationData
43-
from .._login_repository_legacy import (
42+
from ..._invitations_service import ConfirmedInvitationData
43+
from ..._login_repository_legacy import (
4444
AsyncpgStorage,
4545
ConfirmationTokenDict,
4646
get_plugin_storage,
4747
)
48-
from .._login_service import (
48+
from ..._login_service import (
4949
ACTIVE,
5050
CHANGE_EMAIL,
5151
REGISTRATION,
5252
RESET_PASSWORD,
5353
flash_response,
5454
notify_user_confirmation,
5555
)
56-
from .._models import InputSchema, check_confirm_password_match
57-
from ..settings import (
56+
from ..._models import InputSchema, check_confirm_password_match
57+
from ...settings import (
5858
LoginOptions,
5959
LoginSettingsForProduct,
6060
get_plugin_options,

‎services/web/server/src/simcore_service_webserver/login/_controller/preregistration_rest.py‎ renamed to ‎services/web/server/src/simcore_service_webserver/login/_controller/rest/preregistration.py‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,25 @@
1616
from servicelib.request_keys import RQT_USERID_KEY
1717
from servicelib.utils import fire_and_forget_task
1818

19-
from ..._meta import API_VTAG
20-
from ...constants import RQ_PRODUCT_KEY
21-
from ...products import products_web
22-
from ...products.models import Product
23-
from ...security import api as security_service
24-
from ...security.decorators import permission_required
25-
from ...session.api import get_session
26-
from ...users.api import get_user_credentials, set_user_as_deleted
27-
from ...utils import MINUTE
28-
from ...utils_rate_limiting import global_rate_limit_route
29-
from .. import _preregistration_service
30-
from .._constants import CAPTCHA_SESSION_KEY, MSG_LOGGED_OUT, MSG_WRONG_CAPTCHA__INVALID
31-
from .._login_service import flash_response, notify_user_logout
32-
from ..decorators import login_required
33-
from ..settings import LoginSettingsForProduct, get_plugin_settings
19+
from ...._meta import API_VTAG
20+
from ....constants import RQ_PRODUCT_KEY
21+
from ....products import products_web
22+
from ....products.models import Product
23+
from ....security import api as security_service
24+
from ....security.decorators import permission_required
25+
from ....session.api import get_session
26+
from ....users.api import get_user_credentials, set_user_as_deleted
27+
from ....utils import MINUTE
28+
from ....utils_rate_limiting import global_rate_limit_route
29+
from ... import _preregistration_service
30+
from ..._constants import (
31+
CAPTCHA_SESSION_KEY,
32+
MSG_LOGGED_OUT,
33+
MSG_WRONG_CAPTCHA__INVALID,
34+
)
35+
from ..._login_service import flash_response, notify_user_logout
36+
from ...decorators import login_required
37+
from ...settings import LoginSettingsForProduct, get_plugin_settings
3438

3539
_logger = logging.getLogger(__name__)
3640

‎services/web/server/src/simcore_service_webserver/login/_controller/registration_rest.py‎ renamed to ‎services/web/server/src/simcore_service_webserver/login/_controller/rest/registration.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@
2020
from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
2121
from simcore_postgres_database.models.users import UserStatus
2222

23-
from ..._meta import API_VTAG
24-
from ...groups.api import auto_add_user_to_groups, auto_add_user_to_product_group
25-
from ...invitations.api import is_service_invitation_code
26-
from ...products import products_web
27-
from ...products.models import Product
28-
from ...session.access_policies import (
23+
from ...._meta import API_VTAG
24+
from ....groups.api import auto_add_user_to_groups, auto_add_user_to_product_group
25+
from ....invitations.api import is_service_invitation_code
26+
from ....products import products_web
27+
from ....products.models import Product
28+
from ....session.access_policies import (
2929
on_success_grant_session_access_to,
3030
session_access_required,
3131
)
32-
from ...utils import MINUTE
33-
from ...utils_aiohttp import NextPage, envelope_json_response
34-
from ...utils_rate_limiting import global_rate_limit_route
35-
from .. import _auth_service, _confirmation_service, _security_service, _twofa_service
36-
from .._constants import (
32+
from ....utils import MINUTE
33+
from ....utils_aiohttp import NextPage, envelope_json_response
34+
from ....utils_rate_limiting import global_rate_limit_route
35+
from ... import _auth_service, _confirmation_service, _security_service, _twofa_service
36+
from ..._constants import (
3737
CODE_2FA_SMS_CODE_REQUIRED,
3838
MAX_2FA_CODE_RESEND,
3939
MAX_2FA_CODE_TRIALS,
@@ -42,26 +42,26 @@
4242
MSG_UNAUTHORIZED_REGISTER_PHONE,
4343
MSG_WEAK_PASSWORD,
4444
)
45-
from .._emails_service import get_template_path, send_email_from_template
46-
from .._invitations_service import (
45+
from ..._emails_service import get_template_path, send_email_from_template
46+
from ..._invitations_service import (
4747
ConfirmedInvitationData,
4848
check_and_consume_invitation,
4949
check_other_registrations,
5050
extract_email_from_invitation,
5151
)
52-
from .._login_repository_legacy import (
52+
from ..._login_repository_legacy import (
5353
AsyncpgStorage,
5454
ConfirmationTokenDict,
5555
get_plugin_storage,
5656
)
57-
from .._login_service import (
57+
from ..._login_service import (
5858
envelope_response,
5959
flash_response,
6060
get_user_name_from_email,
6161
notify_user_confirmation,
6262
)
63-
from .._models import InputSchema, check_confirm_password_match
64-
from ..settings import (
63+
from ..._models import InputSchema, check_confirm_password_match
64+
from ...settings import (
6565
LoginOptions,
6666
LoginSettingsForProduct,
6767
get_plugin_options,

‎services/web/server/src/simcore_service_webserver/login/_controller/twofa_rest.py‎ renamed to ‎services/web/server/src/simcore_service_webserver/login/_controller/rest/twofa.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@
99
from servicelib.aiohttp.requests_validation import parse_request_body_as
1010
from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
1111

12-
from ...products import products_web
13-
from ...products.models import Product
14-
from ...session.access_policies import session_access_required
15-
from .. import _twofa_service
16-
from .._constants import (
12+
from ....products import products_web
13+
from ....products.models import Product
14+
from ....session.access_policies import session_access_required
15+
from ... import _twofa_service
16+
from ..._constants import (
1717
CODE_2FA_EMAIL_CODE_REQUIRED,
1818
CODE_2FA_SMS_CODE_REQUIRED,
1919
MSG_2FA_CODE_SENT,
2020
MSG_EMAIL_SENT,
2121
MSG_UNKNOWN_EMAIL,
2222
)
23-
from .._login_repository_legacy import AsyncpgStorage, get_plugin_storage
24-
from .._login_service import envelope_response
25-
from .._models import InputSchema
26-
from ..errors import handle_login_exceptions
27-
from ..settings import LoginSettingsForProduct, get_plugin_settings
23+
from ..._login_repository_legacy import AsyncpgStorage, get_plugin_storage
24+
from ..._login_service import envelope_response
25+
from ..._models import InputSchema
26+
from ...errors import handle_login_exceptions
27+
from ...settings import LoginSettingsForProduct, get_plugin_settings
2828

2929
_logger = logging.getLogger(__name__)
3030

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
from ..redis import setup_redis
2525
from ..rest.plugin import setup_rest
2626
from ._constants import APP_LOGIN_SETTINGS_PER_PRODUCT_KEY
27-
from ._controller import (
28-
auth_rest,
29-
change_rest,
30-
confirmation_rest,
31-
preregistration_rest,
32-
registration_rest,
33-
twofa_rest,
27+
from ._controller.rest import (
28+
auth,
29+
change,
30+
confirmation,
31+
preregistration,
32+
registration,
33+
twofa,
3434
)
3535
from ._login_repository_legacy import APP_LOGIN_STORAGE_KEY, AsyncpgStorage
3636
from .settings import (
@@ -138,12 +138,12 @@ def setup_login(app: web.Application):
138138

139139
# routes
140140

141-
app.router.add_routes(auth_rest.routes)
142-
app.router.add_routes(confirmation_rest.routes)
143-
app.router.add_routes(registration_rest.routes)
144-
app.router.add_routes(preregistration_rest.routes)
145-
app.router.add_routes(change_rest.routes)
146-
app.router.add_routes(twofa_rest.routes)
141+
app.router.add_routes(auth.routes)
142+
app.router.add_routes(confirmation.routes)
143+
app.router.add_routes(registration.routes)
144+
app.router.add_routes(preregistration.routes)
145+
app.router.add_routes(change.routes)
146+
app.router.add_routes(twofa.routes)
147147

148148
_setup_login_options(app)
149149
setup_login_storage(app)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from servicelib.aiohttp import status
1919
from servicelib.rest_constants import X_PRODUCT_NAME_HEADER
2020
from simcore_service_webserver.invitations.api import generate_invitation
21-
from simcore_service_webserver.login._controller.registration_rest import (
21+
from simcore_service_webserver.login._controller.rest.registration import (
2222
InvitationCheck,
2323
InvitationInfo,
2424
)

0 commit comments

Comments
 (0)