DSN: Logujeme i email

mo/email.py

@@ -117,7 +117,7 @@ def gen_dsn_token(user: db.User, rr: Optional[db.RegRequest] = None) -> Optional
     return f'{raw_token}-{sig}'
 
 
-def validate_dsn_token(token: str) -> Tuple[Optional[db.User], Optional[db.RegRequest], datetime]:
+def validate_dsn_token(token: str) -> Tuple[Optional[db.User], Optional[db.RegRequest], str, datetime]:
     secret = getattr(config, 'MAIL_TOKEN_SECRET', None)
     if secret is None:
         raise ValueError("MAIL_TOKEN_SECRET nenastaven")
@@ -157,7 +157,7 @@ def validate_dsn_token(token: str) -> Tuple[Optional[db.User], Optional[db.RegRe
     if given_sig != correct_sig:
         raise ValueError("Nesouhlasí podpis")
 
-    return user, rr, when
+    return user, rr, email, when
 
 
 def send_user_email(user: db.User,

mo/web/api_dsn.py

@@ -106,11 +106,11 @@ def api_email_dsn() -> Response:
     app.logger.info(f'DSN: Token: {token}')
 
     try:
-        user, rr, when = mo.email.validate_dsn_token(token)
+        user, rr, email, when = mo.email.validate_dsn_token(token)
         user_info = f'#{user.user_id}' if user is not None else '-'
         rr_info = f'#{rr.reg_id}' if rr is not None else '-'
         age = mo.util_format.time_duration_numeric(mo.now - when)
-        app.logger.info(f'DSN: user={user_info} registration={rr_info} age={age}')
+        app.logger.info(f'DSN: user={user_info} registration={rr_info} email={email} age={age}')
     except ValueError as e:
         app.logger.info(f'DSN: {e}')
         pass