Fix #2672: Pass db_session to user delete method

Also fixed pylint errors including explicit imports, bare except handlings, and undefined requestJson usage.

Signed-off-by: Pratyksh Gupta <pratykshgupta9999@gmail.com>

Author: guptapratykshh

augur/api/gunicorn_conf.py

@@ -40,7 +40,7 @@
 # set the log location for gunicorn    
 logs_directory = get_value('Logging', 'logs_directory')
 
-is_docker = os.getenv("AUGUR_DOCKER_DEPLOY").lower() in ('true', '1', 't', 'y', 'yes')
+is_docker = os.getenv("AUGUR_DOCKER_DEPLOY", 'False').lower() in ('true', '1', 't', 'y', 'yes')
 accesslog = f"{logs_directory}/gunicorn.log"
 errorlog = f"{logs_directory}/gunicorn.log"
 

augur/api/view/routes.py

@@ -4,12 +4,12 @@
 import logging
 import math
 from flask import render_template, request, redirect, url_for, session, flash
-from .utils import *
+from .utils import getSetting, render_module, renderRepos, render_message
 from flask_login import login_user, logout_user, current_user, login_required
 
 from augur.application.db.models import User, Repo, ClientApplication
 from .server import LoginException
-from augur.application.util import *
+from augur.application.util import get_all_repos, get_all_repos_count
 from augur.application.db.lib import get_value
 from ..server import app, db_session
 
@@ -57,7 +57,7 @@ def repo_table_view():
     query = request.args.get('q')
     try:
         page = int(request.args.get('p') or 0)
-    except:
+    except (ValueError, TypeError):
         page = 1
 
     sorting = request.args.get('s')
@@ -147,19 +147,19 @@ def user_login():
                 result = User.create_user(username, password, email, first_name, last_name, admin)
                 if not result[0]:
                     raise LoginException("An error occurred registering your account")
-                else:
-                    user = User.get_user(db_session, username)
-                    flash(result[1]["status"])
+                
+                user = User.get_user(db_session, username)
+                flash(result[1]["status"])
 
             # Log the user in if the password is valid
             if user.validate(password) and login_user(user, remember = remember):
                 flash(f"Welcome, {username}!")
                 if "login_next" in session:
                     return redirect(session.pop("login_next"))
                 return redirect(url_for('root'))
-            else:
-                print("Invalid login")
-                raise LoginException("Invalid login credentials")
+            
+            print("Invalid login")
+            raise LoginException("Invalid login credentials")
         except LoginException as e:
             flash(str(e))
     return render_module('login', title="Login")
@@ -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"))
@@ -256,7 +264,7 @@ def user_groups_view():
 
     try:
         activepage = int(request.args.get('p')) if 'p' in request.args else 0
-    except:
+    except (ValueError, TypeError):
         activepage = 0
 
     (groups, status) = current_user.get_groups_info(**params)
@@ -291,7 +299,7 @@ def user_group_view(group = None):
 
     try:
         params["page"] = int(request.args.get('p') or 0)
-    except:
+    except (ValueError, TypeError):
         params["page"] = 1
 
     if query := request.args.get('q'):
@@ -337,6 +345,8 @@ def dashboard_view():
         ]}
     ]
 
-    backend_config = requestJson("config/get", False)
+    # backend_config = requestJson("config/get", False)
+    # TODO: requestJson is undefined and causing pylint errors. Setting empty config for now.
+    backend_config = {}
 
     return render_template('admin-dashboard.j2', sections = empty, config = backend_config)