UPDATE: Started implementing the email for reset password
This commit is contained in:
@@ -4,10 +4,13 @@ from email.mime.text import MIMEText
|
||||
from os import getenv
|
||||
from random import randrange
|
||||
from dotenv import load_dotenv
|
||||
from utils.user_utils import generate_token
|
||||
from secrets import token_hex
|
||||
|
||||
|
||||
load_dotenv()
|
||||
|
||||
def send_email(email) -> None:
|
||||
def send_email(email, func) -> None:
|
||||
"""
|
||||
Send a verification email to the user.
|
||||
"""
|
||||
@@ -20,15 +23,8 @@ def send_email(email) -> None:
|
||||
|
||||
# Setup up the receiver details
|
||||
login_code = randrange(100000, 1000000)
|
||||
body = f"""
|
||||
<html>
|
||||
<head></head>
|
||||
<body>
|
||||
<h1>Thank you for choosing Gander</h1>
|
||||
<p>Your Gander login code is: {login_code}</p>
|
||||
</body>
|
||||
</html>
|
||||
"""
|
||||
body = func()
|
||||
print(body, flush=True)
|
||||
msg = MIMEText(body, "html")
|
||||
msg["Subject"] = "Reset Gander Login"
|
||||
msg["From"] = SMTP_EMAIL
|
||||
@@ -43,7 +39,38 @@ def send_email(email) -> None:
|
||||
smtp.send_message(msg)
|
||||
|
||||
except TimeoutError:
|
||||
print("Server timed out")
|
||||
print("Server timed out", flush=True)
|
||||
|
||||
except Exception as e:
|
||||
print("Error: ", e)
|
||||
print("Error: ", e, flush=True)
|
||||
|
||||
def forgot_password_body(email):
|
||||
token = generate_token(email, token_hex(32))
|
||||
url = getenv("VITE_API_URL")
|
||||
|
||||
full_url = url + "/reset_password/" + token
|
||||
content = f"""
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Password Reset</title>
|
||||
<style>
|
||||
body {{ font-family: Arial, sans-serif; background-color: #f4f4f4; padding: 20px; text-align: center; }}
|
||||
.container {{ max-width: 400px; background: white; padding: 20px; border-radius: 8px; box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); }}
|
||||
.btn {{ display: inline-block; padding: 10px 20px; color: white; background-color: #007bff; text-decoration: none; border-radius: 5px; }}
|
||||
.btn:hover {{ background-color: #0056b3; }}
|
||||
p {{ color: #333; }}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container">
|
||||
<h1>Gander</h1>
|
||||
<h2>Password Reset Request</h2>
|
||||
<p>Click the button below to reset your password. This link is valid for 1 hour.</p>
|
||||
<a href="{full_url}" class="btn">Reset Password</a>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
"""
|
||||
|
||||
return content
|
||||
@@ -1,6 +1,7 @@
|
||||
from flask import Blueprint, jsonify, session, abort
|
||||
from flask import Blueprint, jsonify, session, abort, abort
|
||||
from utils.user_utils import *
|
||||
from blueprints.utils import login_required
|
||||
from blueprints.email import send_email, forgot_password_body
|
||||
|
||||
user_bp = Blueprint("user", __name__)
|
||||
|
||||
@@ -89,14 +90,15 @@ def get_login_status():
|
||||
username = session.get("username")
|
||||
return jsonify({'status': username is not None, 'username': username})
|
||||
|
||||
@user_bp.route('/user/forgot_password/<string:email>', methods=['POST'])
|
||||
@user_bp.route('/user/forgot_password/<string:email>', methods=['GET','POST'])
|
||||
def user_forgot_password(email):
|
||||
"""
|
||||
Will send link to email to reset password by looking at the user_id within session to see whos password should be reset
|
||||
Creates a super random number to be used a the link to reset password I guess a random number generator seeded with a secret
|
||||
"""
|
||||
send_email(email, lambda: forgot_password_body(email))
|
||||
return email
|
||||
|
||||
return
|
||||
|
||||
@user_bp.route('/user/reset_password/<string:token>/<string:new_password>')
|
||||
def user_reset_password(token, new_password):
|
||||
@@ -107,7 +109,7 @@ def user_reset_password(token, new_password):
|
||||
if email:
|
||||
response = reset_password(new_password, email)
|
||||
if response:
|
||||
return "Success"
|
||||
return 200
|
||||
else:
|
||||
return "Failure"
|
||||
return "Failure"
|
||||
abort(500)
|
||||
return abort(500)
|
||||
@@ -124,11 +124,18 @@ def subscription_expiration(user_id: int, subscribed_id: int) -> int:
|
||||
|
||||
return 0
|
||||
|
||||
def verify_token(token: str) -> Optional[str]:
|
||||
def generate_token(email, salt_value) -> str:
|
||||
"""
|
||||
Creates a token for password reset
|
||||
"""
|
||||
token = serializer.dumps(email, salt=salt_value)
|
||||
return token
|
||||
|
||||
def verify_token(token: str, salt_value) -> Optional[str]:
|
||||
"""
|
||||
Given a token verifies token and decodes the token into an email
|
||||
"""
|
||||
email = serializer.loads(token, salt='1', max_age=3600)
|
||||
email = serializer.loads(token, salt=salt_value, max_age=3600)
|
||||
return email if email else False
|
||||
|
||||
def reset_password(new_password: str, email: str) -> bool:
|
||||
|
||||
Reference in New Issue
Block a user