updated errors

Author: pcrespov

services/web/server/src/simcore_service_webserver/constants.py

@@ -1,6 +1,5 @@
 # pylint:disable=unused-import
 
-from sys import version
 from typing import Final
 
 from common_library.user_messages import user_message

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

@@ -0,0 +1,35 @@
+from common_library.user_messages import user_message
+from servicelib.aiohttp import status
+
+from ....exception_handling import (
+    ExceptionToHttpErrorMap,
+    HttpErrorInfo,
+    exception_handling_decorator,
+    to_exceptions_handlers_map,
+)
+from ....users.exceptions import AlreadyPreRegisteredError
+from ..._constants import MSG_2FA_UNAVAILABLE
+from ...errors import SendingVerificationEmailError, SendingVerificationSmsError
+
+_TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {
+    AlreadyPreRegisteredError: HttpErrorInfo(
+        status.HTTP_409_CONFLICT,
+        user_message(
+            "An account for the email {email} has been submitted. If you haven't received any updates, please contact support.",
+            _version=1,
+        ),
+    ),
+    SendingVerificationSmsError: HttpErrorInfo(
+        status.HTTP_503_SERVICE_UNAVAILABLE,
+        MSG_2FA_UNAVAILABLE,
+    ),
+    SendingVerificationEmailError: HttpErrorInfo(
+        status.HTTP_503_SERVICE_UNAVAILABLE,
+        MSG_2FA_UNAVAILABLE,
+    ),
+}
+
+
+handle_rest_requests_exceptions = exception_handling_decorator(
+    to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP)
+)

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

@@ -39,8 +39,8 @@
 )
 from ..._models import InputSchema
 from ...decorators import login_required
-from ...errors import handle_login_exceptions
 from ...settings import LoginSettingsForProduct, get_plugin_settings
+from ._rest_exceptions import handle_rest_requests_exceptions
 
 log = logging.getLogger(__name__)
 
@@ -75,7 +75,7 @@ class LoginNextPage(NextPage[CodePageParams]): ...
     name="auth_resend_2fa_code",
     max_access_count=MAX_2FA_CODE_RESEND,
 )
-@handle_login_exceptions
+@handle_rest_requests_exceptions
 async def login(request: web.Request):
     """Login: user submits an email (identification) and a password
 
@@ -218,6 +218,7 @@ class LoginTwoFactorAuthBody(InputSchema):
     "auth_login_2fa",
     unauthorized_reason=MSG_UNAUTHORIZED_LOGIN_2FA,
 )
+@handle_rest_requests_exceptions
 async def login_2fa(request: web.Request):
     """Login (continuation): Submits 2FA code"""
     product: Product = products_web.get_current_product(request)
@@ -266,6 +267,7 @@ class LogoutBody(InputSchema):
 
 @routes.post(f"/{API_VTAG}/auth/logout", name="auth_logout")
 @login_required
+@handle_rest_requests_exceptions
 async def logout(request: web.Request) -> web.Response:
     user_id = request.get(RQT_USERID_KEY, -1)
 

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

@@ -23,8 +23,8 @@
 from ..._login_repository_legacy import AsyncpgStorage, get_plugin_storage
 from ..._login_service import envelope_response
 from ..._models import InputSchema
-from ...errors import handle_login_exceptions
 from ...settings import LoginSettingsForProduct, get_plugin_settings
+from ._rest_exceptions import handle_rest_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 
@@ -42,7 +42,7 @@ class Resend2faBody(InputSchema):
     name="auth_resend_2fa_code",
     one_time_access=False,
 )
-@handle_login_exceptions
+@handle_rest_requests_exceptions
 async def resend_2fa_code(request: web.Request):
     """Resends 2FA code via SMS/Email"""
     product: Product = products_web.get_current_product(request)

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

@@ -219,3 +219,5 @@ async def test_request_an_account(
         assert not user.registered
         assert user.status is None
         assert user.account_request_status == AccountRequestStatus.PENDING
+
+    # TODO add a test for reregistration `AlreadyPreRegisteredError`