SQLite and JSON toggle support added

Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
Jason
2026-05-05 16:06:52 -05:00
parent 29154bd651
commit 0632aa22e1
12 changed files with 1862 additions and 136 deletions
+15 -45
View File
@@ -5,39 +5,21 @@ Handles login, logout, and session management
from flask import Blueprint, render_template, request, jsonify, session, redirect, url_for
from werkzeug.security import check_password_hash
from functools import wraps
import json
import os
import data_access as da
import config
auth_bp = Blueprint('auth', __name__)
# Path to users file
USERS_FILE = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'data', 'users.json')
def load_users():
"""Load users from JSON file"""
if os.path.exists(USERS_FILE):
try:
with open(USERS_FILE, 'r') as f:
return json.load(f)
except:
return []
return []
def login_required(f):
"""Decorator to require login for routes"""
@wraps(f)
def decorated_function(*args, **kwargs):
if 'user_id' not in session:
if 'username' not in session:
return redirect(url_for('auth.login_page'))
# Check if user is active
users = load_users()
if session['user_id'] >= len(users):
session.clear()
return redirect(url_for('auth.login_page', message='User not found'))
user = users[session['user_id']]
if not user.get('active', True):
user = da.get_user_by_username(session['username'])
if not user or not user.get('active', True):
session.clear()
return redirect(url_for('auth.login_page', message='Account is inactive'))
@@ -46,14 +28,10 @@ def login_required(f):
def get_current_user():
"""Get the currently logged in user"""
if 'user_id' not in session:
if 'username' not in session:
return None
users = load_users()
if session['user_id'] >= len(users):
return None
return users[session['user_id']]
return da.get_user_by_username(session['username'])
def can_user(permission, location=None):
"""
@@ -98,14 +76,14 @@ def can_user(permission, location=None):
@auth_bp.route('/login')
def login_page():
"""Serve the login page"""
if 'user_id' in session:
if 'username' in session:
return redirect(url_for('home'))
return render_template('login.html')
@auth_bp.route('/select-location')
def select_location_page():
"""Serve the location selection page"""
if 'user_id' not in session:
if 'username' not in session:
return redirect(url_for('auth.login_page'))
return render_template('select_location.html')
@@ -123,16 +101,8 @@ def login():
'message': 'Username and password are required'
}), 400
users = load_users()
# Find user by username
user_index = None
user = None
for i, u in enumerate(users):
if u['username'] == username:
user_index = i
user = u
break
user = da.get_user_by_username(username)
if not user:
return jsonify({
@@ -155,14 +125,14 @@ def login():
}), 401
# Create session
session['user_id'] = user_index
session['username'] = user['username']
session['defaultLocation'] = user.get('defaultLocation')
# Get accessible locations
accessible_locations = []
if 'locationSettings' in user:
for loc_code, settings in user['locationSettings'].items():
location_settings = user.get('locationSettings', {})
if location_settings:
for loc_code, settings in location_settings.items():
if settings.get('accessible', False):
accessible_locations.append(loc_code)
@@ -190,7 +160,7 @@ def login():
@auth_bp.route('/api/select-location', methods=['POST'])
def select_location():
"""Select a location for the current session"""
if 'user_id' not in session:
if 'username' not in session:
return jsonify({
'status': 'error',
'message': 'Not logged in'
@@ -231,7 +201,7 @@ def logout():
@auth_bp.route('/api/session', methods=['GET'])
def get_session():
"""Get current session information"""
if 'user_id' not in session:
if 'username' not in session:
return jsonify({
'status': 'error',
'message': 'Not logged in'