diff --git a/mo/email.py b/mo/email.py index c0ce7cde500da02b99aac90d8f9bb88346ef74e8..7e8167242c1ac1d3f24db39a731ac55f9fb7a1c0 100644 --- a/mo/email.py +++ b/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, diff --git a/mo/web/api_dsn.py b/mo/web/api_dsn.py index 5fe3ce5d8720eca35ff0208b8f882f2537950f74..64de762c82662260dbc34b36ff9b9f8eb34d8d41 100644 --- a/mo/web/api_dsn.py +++ b/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