raises verification errors and logs them in handler

Author: pcrespov

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

@@ -11,10 +11,9 @@
 import logging
 
 from aiohttp import web
-from models_library.error_codes import create_error_code
 from models_library.users import UserID
 from pydantic import BaseModel, Field
-from servicelib.logging_utils import LogExtra, get_log_record_extra, log_decorator
+from servicelib.logging_utils import log_decorator
 from servicelib.utils_secrets import generate_passcode
 from settings_library.twilio import TwilioSettings
 from twilio.base.exceptions import TwilioException  # type: ignore[import-untyped]
@@ -132,15 +131,11 @@ def _sender():
         await asyncio.get_event_loop().run_in_executor(executor=None, func=_sender)
 
     except TwilioException as exc:
-        error_code = create_error_code(exc)
-        log_extra: LogExtra = get_log_record_extra(user_id=user_id) or {}
-        log.exception(
-            "Failed while setting up 2FA code and sending SMS to %s [%s]",
-            mask_phone_number(phone_number),
-            f"{error_code}",
-            extra={"error_code": error_code, **log_extra},
-        )
-        raise SendingVerificationSmsError(reason=exc) from exc
+        raise SendingVerificationSmsError(
+            reason=f"Could not send SMS to {mask_phone_number(phone_number)}",
+            user_id=user_id,
+            twilio_error=exc,
+        ) from exc
 
 
 #
@@ -177,16 +172,13 @@ async def send_email_code(
                 "product": product,
             },
         )
-    except TwilioException as exc:
-        error_code = create_error_code(exc)
-        log_extra: LogExtra = get_log_record_extra(user_id=user_id) or {}
-        log.exception(
-            "Failed while setting up 2FA code and sending Email to %s [%s]",
-            user_email,
-            f"{error_code}",
-            extra={"error_code": error_code, **log_extra},
-        )
-        raise SendingVerificationEmailError(reason=exc) from exc
+    except Exception as exc:
+        raise SendingVerificationEmailError(
+            reason=f"Could not send email to {user_email}",
+            user_id=user_id,
+            user_email=user_email,
+            email_error=exc,
+        ) from exc
 
 
 #

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

@@ -1,12 +1,16 @@
 import functools
+import logging
 
 from aiohttp import web
 from servicelib.aiohttp.typing_extension import Handler
+from servicelib.logging_errors import create_troubleshotting_log_kwargs
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 
 from ..errors import WebServerBaseError
 from ._constants import MSG_2FA_UNAVAILABLE_OEC
 
+_logger = logging.getLogger(__name__)
+
 
 class LoginError(WebServerBaseError, ValueError):
     ...
@@ -27,8 +31,14 @@ async def wrapper(request: web.Request) -> web.StreamResponse:
             return await handler(request)
 
         except (SendingVerificationSmsError, SendingVerificationEmailError) as exc:
+
+            front_end_msg = MSG_2FA_UNAVAILABLE_OEC.format(error_code=exc.error_code())
+            # in these cases I want to log the cause
+            _logger.exception(
+                **create_troubleshotting_log_kwargs(front_end_msg, exception=exc)
+            )
             raise web.HTTPServiceUnavailable(
-                reason=MSG_2FA_UNAVAILABLE_OEC.format(error_code=exc.code),
+                reason=front_end_msg,
                 content_type=MIMETYPE_APPLICATION_JSON,
             ) from exc