Revert "Added new user management functions"

This reverts commit 815c93c.

Author: godver3

routes/auth_routes.py

@@ -1,4 +1,4 @@
-from flask import Blueprint, redirect, url_for, flash, render_template, request, make_response, session, current_app as app
+from flask import Blueprint, redirect, url_for, flash, render_template, request, make_response, session
 from flask_login import LoginManager, UserMixin, login_user, login_required, logout_user, current_user
 from flask_sqlalchemy import SQLAlchemy
 from werkzeug.security import generate_password_hash, check_password_hash
@@ -11,7 +11,6 @@
 from .utils import is_user_system_enabled
 import random
 import string
-from sqlalchemy import inspect
 
 auth_bp = Blueprint('auth', __name__, url_prefix='/auth')
 
@@ -57,86 +56,11 @@ class User(UserMixin, db.Model):
     role = db.Column(db.String(20), nullable=False)
     is_default = db.Column(db.Boolean, default=False)
     onboarding_complete = db.Column(db.Boolean, default=False)
-    registration_key = db.Column(db.String(120), nullable=True)
-    registration_key_limit = db.Column(db.Integer, nullable=True)  # New column for key usage limit
-    registration_key_used = db.Column(db.Integer, default=0)  # New column for current usage count
-
-    @staticmethod
-    def get_registration_key():
-        admin_user = User.query.filter_by(role='admin').first()
-        if admin_user:
-            return {
-                'key': admin_user.registration_key,
-                'limit': admin_user.registration_key_limit,
-                'used': admin_user.registration_key_used
-            }
-        return None
-
-    @staticmethod
-    def set_registration_key(key, limit=None):
-        admin_user = User.query.filter_by(role='admin').first()
-        if admin_user:
-            admin_user.registration_key = key
-            if limit is not None:
-                admin_user.registration_key_limit = limit
-                admin_user.registration_key_used = 0  # Reset usage count when key/limit changes
-            db.session.commit()
-            return True
-        return False
-
-    @staticmethod
-    def increment_key_usage():
-        admin_user = User.query.filter_by(role='admin').first()
-        if admin_user:
-            admin_user.registration_key_used += 1
-            db.session.commit()
-            return True
-        return False
-
-def recreate_database():
-    """Recreate the database with the new schema."""
-    # Drop all tables
-    db.drop_all()
-    # Create all tables with new schema
-    db.create_all()
-    # Create default admin if no users exist
-    create_default_admin()
 
 def init_db(app):
     db.init_app(app)
     with app.app_context():
-        # Create tables if they don't exist
         db.create_all()
-        
-        # Check if the columns exist
-        inspector = inspect(db.engine)
-        if 'user' in inspector.get_table_names():
-            columns = [col['name'] for col in inspector.get_columns('user')]
-            
-            # Add registration_key column if it doesn't exist
-            if 'registration_key' not in columns:
-                with db.engine.connect() as conn:
-                    conn.execute(db.text('ALTER TABLE user ADD COLUMN registration_key VARCHAR(120)'))
-                    db.session.commit()
-                logging.info("Added registration_key column to user table")
-            
-            # Add registration_key_limit column if it doesn't exist
-            if 'registration_key_limit' not in columns:
-                with db.engine.connect() as conn:
-                    conn.execute(db.text('ALTER TABLE user ADD COLUMN registration_key_limit INTEGER'))
-                    db.session.commit()
-                logging.info("Added registration_key_limit column to user table")
-            
-            # Add registration_key_used column if it doesn't exist
-            if 'registration_key_used' not in columns:
-                with db.engine.connect() as conn:
-                    conn.execute(db.text('ALTER TABLE user ADD COLUMN registration_key_used INTEGER DEFAULT 0'))
-                    db.session.commit()
-                logging.info("Added registration_key_used column to user table")
-        
-        # Create default admin if no users exist
-        if User.query.count() == 0:
-            create_default_admin()
 
 @login_manager.user_loader
 def load_user(user_id):
@@ -166,16 +90,15 @@ def login():
         password = request.form.get('password')
         remember = bool(request.form.get('remember_me'))
 
+        
         user = User.query.filter_by(username=username).first()
         if user:
+
             if check_password_hash(user.password, password):
-                # Set session as permanent if remember me is checked
-                if remember:
-                    session.permanent = True  # This will use the PERMANENT_SESSION_LIFETIME value
-                else:
-                    session.permanent = False  # Session will expire when browser closes
 
-                # Login the user with the remember flag
+                # Always set session as permanent
+                session.permanent = True
+                
                 login_user(user, remember=remember)
 
                 # Force session save
@@ -219,86 +142,4 @@ def logout():
 @auth_bp.route('/unauthorized')
 def unauthorized():
     flash('You are not authorized to access this page.', 'error')
-    return redirect(url_for('auth.login'))
-
-@auth_bp.route('/register', methods=['GET', 'POST'])
-def register():
-    if not is_user_system_enabled():
-        return redirect(url_for('root.root'))
-    
-    if current_user.is_authenticated:
-        return redirect(url_for('root.root'))
-
-    if request.method == 'POST':
-        username = request.form['username']
-        password = request.form['password']
-        registration_key = request.form['registration_key']
-
-        # Validate registration key
-        key_info = User.get_registration_key()
-        if not key_info or registration_key != key_info['key']:
-            flash('Invalid registration key.', 'error')
-            return redirect(url_for('auth.login'))
-
-        # Check key usage limit
-        if key_info['limit'] is not None and key_info['used'] >= key_info['limit']:
-            flash('Registration key has reached its usage limit.', 'error')
-            return redirect(url_for('auth.login'))
-
-        existing_user = User.query.filter_by(username=username).first()
-        if existing_user:
-            flash('Username already exists.', 'error')
-            return redirect(url_for('auth.login'))
-
-        hashed_password = generate_password_hash(password)
-        new_user = User(
-            username=username, 
-            password=hashed_password, 
-            role='user',  # New users are always regular users
-            onboarding_complete=True
-        )
-        db.session.add(new_user)
-        
-        # Increment key usage count
-        User.increment_key_usage()
-        
-        db.session.commit()
-        login_user(new_user)
-        flash('Registered successfully.', 'success')
-        return redirect(url_for('root.root'))
-    return redirect(url_for('auth.login'))
-
-@auth_bp.route('/account')
-@login_required
-def account():
-    if current_user.role == 'admin':
-        return redirect(url_for('root.root'))
-    return render_template('account.html')
-
-@auth_bp.route('/change_password', methods=['POST'])
-@login_required
-def change_password():
-    if current_user.role == 'admin':
-        return redirect(url_for('root.root'))
-
-    current_password = request.form.get('current_password')
-    new_password = request.form.get('new_password')
-    confirm_password = request.form.get('confirm_password')
-
-    # Verify current password
-    if not check_password_hash(current_user.password, current_password):
-        flash('Current password is incorrect.', 'error')
-        return redirect(url_for('auth.account'))
-
-    # Verify new password match
-    if new_password != confirm_password:
-        flash('New passwords do not match.', 'error')
-        return redirect(url_for('auth.account'))
-
-    # Update password
-    current_user.password = generate_password_hash(new_password)
-    current_user.is_default = False
-    db.session.commit()
-
-    flash('Password changed successfully.', 'success')
-    return redirect(url_for('auth.account'))
+    return redirect(url_for('auth.login'))

routes/user_management_routes.py

@@ -32,28 +32,7 @@ def manage_users():
     if not is_user_system_enabled():
         return redirect(url_for('root.root'))
     users = User.query.all()
-    key_info = User.get_registration_key()
-    return render_template('manage_users.html', users=users, registration_key=key_info)
-
-@user_management_bp.route('/update_registration_key', methods=['POST'])
-@admin_required
-def update_registration_key():
-    key = request.form.get('registration_key')
-    limit = request.form.get('registration_key_limit')
-    
-    if key:
-        try:
-            # Convert limit to integer if provided, otherwise set to None
-            limit = int(limit) if limit and limit.strip() else None
-            if User.set_registration_key(key, limit):
-                flash('Registration key updated successfully.', 'success')
-            else:
-                flash('Failed to update registration key.', 'error')
-        except ValueError:
-            flash('Key usage limit must be a valid number.', 'error')
-    else:
-        flash('Registration key cannot be empty.', 'error')
-    return redirect(url_for('user_management.manage_users'))
+    return render_template('manage_users.html', users=users)
 
 @user_management_bp.route('/add_user', methods=['POST'])
 @admin_required
@@ -97,29 +76,6 @@ def delete_user(user_id):
         db.session.rollback()
         return jsonify({'success': False, 'error': 'Database error'}), 500
 
-@user_management_bp.route('/change_user_password/<int:user_id>', methods=['POST'])
-@admin_required
-def change_user_password(user_id):
-    if current_user.role != 'admin':
-        return jsonify({'success': False, 'error': 'Unauthorized'}), 403
-
-    user = User.query.get(user_id)
-    if not user:
-        return jsonify({'success': False, 'error': 'User not found'}), 404
-
-    new_password = request.form.get('new_password')
-    if not new_password:
-        return jsonify({'success': False, 'error': 'Password is required'}), 400
-
-    try:
-        user.password = generate_password_hash(new_password)
-        user.is_default = False
-        db.session.commit()
-        return jsonify({'success': True})
-    except Exception as e:
-        db.session.rollback()
-        return jsonify({'success': False, 'error': 'Database error'}), 500
-
 # Modify the register route
 @user_management_bp.route('/register', methods=['GET', 'POST'])
 def register():