removes error-code from messages

Author: pcrespov

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

@@ -1,9 +1,7 @@
 from typing import Final
 
 MSG_2FA_CODE_SENT: Final[str] = "A code was sent by SMS to {phone_number}."
-MSG_2FA_UNAVAILABLE_OEC: Final[str] = (
-    "Two-factor authentication is temporarily unavailable. Please try again later. ({error_code})"
-)
+MSG_2FA_UNAVAILABLE: Final[str] = "Two-factor authentication is temporarily unavailable"
 MSG_ACTIVATED: Final[str] = "Your account has been activated."
 MSG_ACTIVATION_REQUIRED: Final[str] = (
     "Please activate your account via the email we sent before logging in."

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

@@ -1,7 +1,7 @@
-""" Core functionality and tools for user's registration
+"""Core functionality and tools for user's registration
 
-    - registration code
-    - invitation code
+- registration code
+- invitation code
 """
 
 import logging
@@ -214,9 +214,7 @@ def _invitations_request_context(invitation_code: str) -> Iterator[URL]:
 
     except (ValidationError, InvalidInvitationError) as err:
         error_code = create_error_code(err)
-        user_error_msg = (
-            f"Invalid invitation. {MSG_INVITATIONS_CONTACT_SUFFIX} [{error_code}]"
-        )
+        user_error_msg = f"Invalid invitation. {MSG_INVITATIONS_CONTACT_SUFFIX}"
 
         _logger.exception(
             **create_troubleshotting_log_kwargs(
@@ -233,7 +231,7 @@ def _invitations_request_context(invitation_code: str) -> Iterator[URL]:
 
     except InvitationsServiceUnavailableError as err:
         error_code = create_error_code(err)
-        user_error_msg = f"Unable to process your invitation since the invitations service is currently unavailable [{error_code}]"
+        user_error_msg = "Unable to process your invitation since the invitations service is currently unavailable"
 
         _logger.exception(
             **create_troubleshotting_log_kwargs(

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

@@ -7,13 +7,12 @@
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 
 from ..errors import WebServerBaseError
-from ._constants import MSG_2FA_UNAVAILABLE_OEC
+from ._constants import MSG_2FA_UNAVAILABLE
 
 _logger = logging.getLogger(__name__)
 
 
-class LoginError(WebServerBaseError, ValueError):
-    ...
+class LoginError(WebServerBaseError, ValueError): ...
 
 
 class SendingVerificationSmsError(LoginError):
@@ -32,7 +31,7 @@ async def wrapper(request: web.Request) -> web.StreamResponse:
 
         except (SendingVerificationSmsError, SendingVerificationEmailError) as exc:
             error_code = exc.error_code()
-            front_end_msg = MSG_2FA_UNAVAILABLE_OEC.format(error_code=error_code)
+            front_end_msg = MSG_2FA_UNAVAILABLE
             # in these cases I want to log the cause
             _logger.exception(
                 **create_troubleshotting_log_kwargs(

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

@@ -187,8 +187,7 @@ async def validate_confirmation_and_redirect(request: web.Request):
             error_code = create_error_code(err)
             user_error_msg = (
                 f"Sorry, we cannot confirm your {action}."
-                "Please try again in a few moments. "
-                f"If the problem persist please contact support attaching this code ({error_code})"
+                "Please try again in a few moments."
             )
 
             _logger.exception(

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

@@ -274,7 +274,7 @@ async def register(request: web.Request):
             )
         except Exception as err:  # pylint: disable=broad-except
             error_code = create_error_code(err)
-            user_error_msg = f"{MSG_CANT_SEND_MAIL} [{error_code}]"
+            user_error_msg = MSG_CANT_SEND_MAIL
 
             _logger.exception(
                 **create_troubleshotting_log_kwargs(
@@ -416,7 +416,7 @@ async def register_phone(request: web.Request):
     except Exception as err:  # pylint: disable=broad-except
         # Unhandled errors -> 503
         error_code = create_error_code(err)
-        user_error_msg = f"Currently we cannot register phone numbers [{error_code}]"
+        user_error_msg = "Currently we cannot register phone numbers"
 
         _logger.exception(
             **create_troubleshotting_log_kwargs(

services/web/server/src/simcore_service_webserver/users/_users_rest.py

@@ -59,8 +59,7 @@
     MissingGroupExtraPropertiesForProductError: HttpErrorInfo(
         status.HTTP_503_SERVICE_UNAVAILABLE,
         "The product is not ready for use until the configuration is fully completed. "
-        "Please wait and try again. "
-        "If this issue persists, contact support indicating this support code: {error_code}.",
+        "Please wait and try again. ",
     ),
 }
 

services/web/server/src/simcore_service_webserver/wallets/_handlers.py

@@ -97,7 +97,7 @@ async def wrapper(request: web.Request) -> web.StreamResponse:
         except BillingDetailsNotFoundError as exc:
 
             error_code = create_error_code(exc)
-            user_error_msg = f"{MSG_BILLING_DETAILS_NOT_DEFINED_ERROR} [{error_code}]"
+            user_error_msg = MSG_BILLING_DETAILS_NOT_DEFINED_ERROR
 
             _logger.exception(
                 **create_troubleshotting_log_kwargs(
@@ -155,10 +155,10 @@ async def create_wallet(request: web.Request):
 async def list_wallets(request: web.Request):
     req_ctx = WalletsRequestContext.model_validate(request)
 
-    wallets: list[
-        WalletGetWithAvailableCredits
-    ] = await _api.list_wallets_with_available_credits_for_user(
-        app=request.app, user_id=req_ctx.user_id, product_name=req_ctx.product_name
+    wallets: list[WalletGetWithAvailableCredits] = (
+        await _api.list_wallets_with_available_credits_for_user(
+            app=request.app, user_id=req_ctx.user_id, product_name=req_ctx.product_name
+        )
     )
 
     return envelope_json_response(wallets)

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

@@ -32,7 +32,7 @@
 )
 from simcore_service_webserver.login._constants import (
     CODE_2FA_SMS_CODE_REQUIRED,
-    MSG_2FA_UNAVAILABLE_OEC,
+    MSG_2FA_UNAVAILABLE,
 )
 from simcore_service_webserver.login.storage import AsyncpgStorage
 from simcore_service_webserver.products import products_web
@@ -456,9 +456,7 @@ async def test_2fa_sms_failure_during_login(
                 response, status.HTTP_503_SERVICE_UNAVAILABLE
             )
             assert not data
-            assert error["errors"][0]["message"].startswith(
-                MSG_2FA_UNAVAILABLE_OEC[:10]
-            )
+            assert error["errors"][0]["message"].startswith(MSG_2FA_UNAVAILABLE[:10])
 
             # Expects logs like 'Failed while setting up 2FA code and sending SMS to 157XXXXXXXX3 [OEC:140392495277888]'
             assert f"{fake_user_phone_number[:3]}" in caplog.text