From 116de33df3b9d9b215b1423b2ce602e7f8aa7c21 Mon Sep 17 00:00:00 2001 From: Peter Stockings Date: Sun, 2 Feb 2025 17:45:54 +1100 Subject: [PATCH] Update load_user function --- app.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app.py b/app.py index e909677..f85c3f3 100644 --- a/app.py +++ b/app.py @@ -1,11 +1,11 @@ from datetime import date import os from flask import Flask, abort, render_template, redirect, request, url_for -from flask_login import LoginManager, current_user +from flask_login import LoginManager import jinja_partials from jinja2_fragments import render_block from decorators import validate_person, validate_topset, validate_workout -from routes.auth import auth, Person +from routes.auth import auth, get_person_by_id from extensions import db from utils import convert_str_to_date, generate_plot from flask_htmx import HTMX @@ -29,10 +29,7 @@ login_manager.login_message_category = 'info' @login_manager.user_loader def load_user(person_id): - row = db.execute("""SELECT person_id, name, email, password_hash from Person WHERE person_id=%s""", [person_id], one=True) - if row: - return Person(row['person_id'], row['name'], row['email'], row['password_hash']) - return None + return get_person_by_id(person_id) app.register_blueprint(auth, url_prefix='/auth')