From 23b58dc62008f9439a341478164d0e25bb48ac4e Mon Sep 17 00:00:00 2001 From: guptapratykshh Date: Sat, 10 Jan 2026 02:06:53 +0530 Subject: [PATCH 1/3] Fix #2672: Pass db_session to user delete method - Pass required db_session parameter to current_user.delete() - Add try-except block for proper exception handling - Store username before deletion for accurate flash message - Add error logging for debugging failed deletions Signed-off-by: Pratyksh Gupta Signed-off-by: guptapratykshh Signed-off-by: Adrian Edwards --- augur/api/view/routes.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/augur/api/view/routes.py b/augur/api/view/routes.py index 91d23531b..61822d344 100644 --- a/augur/api/view/routes.py +++ b/augur/api/view/routes.py @@ -198,10 +198,18 @@ def authorize_user(): @app.route('/account/delete') @login_required def user_delete(): - if current_user.delete()[0]: - flash(f"Account {current_user.login_name} successfully removed") - logout_user() - else: + try: + username = current_user.login_name + result = current_user.delete(db_session) + + if result[0]: + flash(f"Account {username} successfully removed") + logout_user() + else: + logger.error(f"Failed to delete account {username}: {result[1]}") + flash("An error occurred removing the account") + except Exception as e: + logger.error(f"Exception occurred while deleting account: {e}") flash("An error occurred removing the account") return redirect(url_for("root")) From 3c642c48837647689d2e4fe9ccddedf713726016 Mon Sep 17 00:00:00 2001 From: Adrian Edwards Date: Mon, 16 Mar 2026 15:34:24 -0400 Subject: [PATCH 2/3] Revert original fix in 23b58dc62008f9439a341478164d0e25bb48ac4e Signed-off-by: Adrian Edwards --- augur/api/view/routes.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/augur/api/view/routes.py b/augur/api/view/routes.py index 61822d344..91d23531b 100644 --- a/augur/api/view/routes.py +++ b/augur/api/view/routes.py @@ -198,18 +198,10 @@ def authorize_user(): @app.route('/account/delete') @login_required def user_delete(): - try: - username = current_user.login_name - result = current_user.delete(db_session) - - if result[0]: - flash(f"Account {username} successfully removed") - logout_user() - else: - logger.error(f"Failed to delete account {username}: {result[1]}") - flash("An error occurred removing the account") - except Exception as e: - logger.error(f"Exception occurred while deleting account: {e}") + if current_user.delete()[0]: + flash(f"Account {current_user.login_name} successfully removed") + logout_user() + else: flash("An error occurred removing the account") return redirect(url_for("root")) From 37dc2be3786bbd9ae51042a3aaf958229af1b825 Mon Sep 17 00:00:00 2001 From: Adrian Edwards Date: Mon, 16 Mar 2026 15:35:13 -0400 Subject: [PATCH 3/3] start simple Signed-off-by: Adrian Edwards --- augur/api/view/routes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/augur/api/view/routes.py b/augur/api/view/routes.py index 91d23531b..9c06f2fac 100644 --- a/augur/api/view/routes.py +++ b/augur/api/view/routes.py @@ -198,10 +198,11 @@ def authorize_user(): @app.route('/account/delete') @login_required def user_delete(): - if current_user.delete()[0]: + if current_user.delete(db_session)[0]: flash(f"Account {current_user.login_name} successfully removed") logout_user() else: + logger.error(f"Exception occurred while deleting account {current_user.login_name}: {e}") flash("An error occurred removing the account") return redirect(url_for("root"))