intrgrating suggestions after betta 1
This commit is contained in:
@@ -9,6 +9,7 @@ import os
|
||||
from datetime import timezone
|
||||
|
||||
from models.user import Users
|
||||
from utils.welcome_email import WelcomeMessage
|
||||
|
||||
auth_bp = Blueprint("auth", __name__)
|
||||
|
||||
@@ -30,8 +31,10 @@ def register():
|
||||
password_hash = generate_password_hash(password)
|
||||
users.insert_user(name, email, password_hash)
|
||||
|
||||
return jsonify({"message": "User registered successfully!"}), 201
|
||||
welcome_message = WelcomeMessage(name, email)
|
||||
welcome_message.send_email()
|
||||
|
||||
return jsonify({"message": "User registered successfully!"}), 201
|
||||
|
||||
@auth_bp.route("/login", methods=["POST"])
|
||||
def login():
|
||||
@@ -46,6 +49,9 @@ def login():
|
||||
user = users.get_user_by_email(email)
|
||||
if not user or not check_password_hash(user["password_hash"], password):
|
||||
return jsonify({"error": "Invalid credentials"}), 401
|
||||
|
||||
if user["active"] != 1:
|
||||
return jsonify({"error": "Inactive user"}), 401
|
||||
|
||||
otp_code = str(random.randint(100000, 999999))
|
||||
expiration = datetime.datetime.now(timezone.utc) + datetime.timedelta(minutes=10)
|
||||
@@ -188,7 +194,8 @@ def me():
|
||||
"terms": user["terms"],
|
||||
"first_order_number": user["first_order_number"],
|
||||
"created_at": user["created_at"],
|
||||
"user_role": user["user_role"]
|
||||
"user_role": user["user_role"],
|
||||
"temporary_password": user["temporary_password"]
|
||||
}), 200
|
||||
|
||||
|
||||
@@ -201,4 +208,17 @@ def validate_token():
|
||||
user = users.get_user_by_id(user_id)
|
||||
if not user:
|
||||
return jsonify({"error": "User not found"}), 404
|
||||
return jsonify({"message": "Token is valid"}), 200
|
||||
return jsonify({"message": "Token is valid"}), 200
|
||||
|
||||
@auth_bp.route("/temporary_password", methods=["POST"])
|
||||
@jwt_required()
|
||||
def change_passwd():
|
||||
data = request.get_json()
|
||||
if not data:
|
||||
return jsonify({"error": "Password not found"}), 404
|
||||
users = Users()
|
||||
user_id = get_jwt_identity()
|
||||
new_password_hash = generate_password_hash(data['password'])
|
||||
users.update_user_password(user_id, new_password_hash)
|
||||
users.update_temp_pass(user_id)
|
||||
return jsonify({"message": "Password has been updated successfully."}), 200
|
||||
Reference in New Issue
Block a user