diff --git a/api/helper_functions.py b/api/helper_functions.py index 7f25059..4ebf10e 100644 --- a/api/helper_functions.py +++ b/api/helper_functions.py @@ -41,12 +41,17 @@ def get_email_from_token_data(): if token is not None: if ':' in token: # Maybe bot token, check if token valid and return username after ":" then - email = token.split(":")[1] + telegram_user_id = token.split(":")[1] token = token.split(":")[0] try: if jwt.decode(token, os.getenv('SECRET_KEY'), algorithms=["HS256"])['email'] == os.getenv("BOT_EMAIL"): - return email + res = db.session.query(User).filter_by(telegram_user_id=telegram_user_id).first() + + if res is not None: + return res.as_dict()['email'] + else: + return None else: return None except jwt.PyJWTError: