Fix remaining @require_admin decorators in admin.py

- Changed all remaining @require_admin to @admin_required
- All decorators now use the centralized utils.py versions
parent 11117f3e
...@@ -164,7 +164,7 @@ def admin_create_user(): ...@@ -164,7 +164,7 @@ def admin_create_user():
return redirect(url_for('admin.users')) return redirect(url_for('admin.users'))
@admin_bp.route('/users/<int:user_id>/activate') @admin_bp.route('/users/<int:user_id>/activate')
@require_admin @admin_required
def admin_activate_user(user_id): def admin_activate_user(user_id):
"""Activate a user account.""" """Activate a user account."""
if update_user_status(user_id, True): if update_user_status(user_id, True):
...@@ -174,7 +174,7 @@ def admin_activate_user(user_id): ...@@ -174,7 +174,7 @@ def admin_activate_user(user_id):
return redirect(url_for('admin.users')) return redirect(url_for('admin.users'))
@admin_bp.route('/users/<int:user_id>/deactivate') @admin_bp.route('/users/<int:user_id>/deactivate')
@require_admin @admin_required
def admin_deactivate_user(user_id): def admin_deactivate_user(user_id):
"""Deactivate a user account.""" """Deactivate a user account."""
if update_user_status(user_id, False): if update_user_status(user_id, False):
...@@ -184,7 +184,7 @@ def admin_deactivate_user(user_id): ...@@ -184,7 +184,7 @@ def admin_deactivate_user(user_id):
return redirect(url_for('admin.users')) return redirect(url_for('admin.users'))
@admin_bp.route('/users/<int:user_id>/update', methods=['POST']) @admin_bp.route('/users/<int:user_id>/update', methods=['POST'])
@require_admin @admin_required
def admin_update_user(user_id): def admin_update_user(user_id):
"""Update user information.""" """Update user information."""
username = request.form.get('username') username = request.form.get('username')
...@@ -201,7 +201,7 @@ def admin_update_user(user_id): ...@@ -201,7 +201,7 @@ def admin_update_user(user_id):
return redirect(url_for('admin.users')) return redirect(url_for('admin.users'))
@admin_bp.route('/users/<int:user_id>/delete', methods=['POST']) @admin_bp.route('/users/<int:user_id>/delete', methods=['POST'])
@require_admin @admin_required
def admin_delete_user(user_id): def admin_delete_user(user_id):
"""Delete a user account.""" """Delete a user account."""
confirm = request.form.get('confirm_delete') confirm = request.form.get('confirm_delete')
...@@ -215,7 +215,7 @@ def admin_delete_user(user_id): ...@@ -215,7 +215,7 @@ def admin_delete_user(user_id):
return redirect(url_for('admin.users')) return redirect(url_for('admin.users'))
@admin_bp.route('/cluster_tokens') @admin_bp.route('/cluster_tokens')
@require_admin @admin_required
def cluster_tokens(): def cluster_tokens():
"""Cluster tokens management page.""" """Cluster tokens management page."""
worker_tokens = get_worker_tokens() worker_tokens = get_worker_tokens()
...@@ -223,7 +223,7 @@ def cluster_tokens(): ...@@ -223,7 +223,7 @@ def cluster_tokens():
return render_template('admin/cluster_tokens.html', user=user, worker_tokens=worker_tokens, active_page='cluster_tokens') return render_template('admin/cluster_tokens.html', user=user, worker_tokens=worker_tokens, active_page='cluster_tokens')
@admin_bp.route('/cluster_tokens/generate', methods=['POST']) @admin_bp.route('/cluster_tokens/generate', methods=['POST'])
@require_admin @admin_required
def generate_cluster_token(): def generate_cluster_token():
"""Generate a new cluster token.""" """Generate a new cluster token."""
token_name = request.form.get('token_name', '').strip() token_name = request.form.get('token_name', '').strip()
...@@ -245,7 +245,7 @@ def generate_cluster_token(): ...@@ -245,7 +245,7 @@ def generate_cluster_token():
return render_template('admin/cluster_tokens.html', user=user, worker_tokens=worker_tokens, generated_token=token, token_name=token_name, show_modal=True, active_page='cluster_tokens') return render_template('admin/cluster_tokens.html', user=user, worker_tokens=worker_tokens, generated_token=token, token_name=token_name, show_modal=True, active_page='cluster_tokens')
@admin_bp.route('/cluster_tokens/<int:token_id>/deactivate', methods=['POST']) @admin_bp.route('/cluster_tokens/<int:token_id>/deactivate', methods=['POST'])
@require_admin @admin_required
def deactivate_cluster_token(token_id): def deactivate_cluster_token(token_id):
"""Deactivate a cluster token.""" """Deactivate a cluster token."""
if deactivate_worker_token(token_id): if deactivate_worker_token(token_id):
...@@ -255,7 +255,7 @@ def deactivate_cluster_token(token_id): ...@@ -255,7 +255,7 @@ def deactivate_cluster_token(token_id):
return redirect(url_for('admin.cluster_tokens')) return redirect(url_for('admin.cluster_tokens'))
@admin_bp.route('/cluster_tokens/<int:token_id>/activate', methods=['POST']) @admin_bp.route('/cluster_tokens/<int:token_id>/activate', methods=['POST'])
@require_admin @admin_required
def activate_cluster_token(token_id): def activate_cluster_token(token_id):
"""Activate a cluster token.""" """Activate a cluster token."""
if activate_worker_token(token_id): if activate_worker_token(token_id):
...@@ -265,7 +265,7 @@ def activate_cluster_token(token_id): ...@@ -265,7 +265,7 @@ def activate_cluster_token(token_id):
return redirect(url_for('admin.cluster_tokens')) return redirect(url_for('admin.cluster_tokens'))
@admin_bp.route('/cluster_tokens/<int:token_id>/delete', methods=['POST']) @admin_bp.route('/cluster_tokens/<int:token_id>/delete', methods=['POST'])
@require_admin @admin_required
def delete_cluster_token(token_id): def delete_cluster_token(token_id):
"""Delete a cluster token.""" """Delete a cluster token."""
if delete_worker_token(token_id): if delete_worker_token(token_id):
...@@ -275,7 +275,7 @@ def delete_cluster_token(token_id): ...@@ -275,7 +275,7 @@ def delete_cluster_token(token_id):
return redirect(url_for('admin.cluster_tokens')) return redirect(url_for('admin.cluster_tokens'))
@admin_bp.route('/settings') @admin_bp.route('/settings')
@require_admin @admin_required
def settings(): def settings():
"""Admin settings page.""" """Admin settings page."""
user = get_current_user_session() user = get_current_user_session()
...@@ -286,7 +286,7 @@ def settings(): ...@@ -286,7 +286,7 @@ def settings():
active_page='settings') active_page='settings')
@admin_bp.route('/update_settings', methods=['POST']) @admin_bp.route('/update_settings', methods=['POST'])
@require_admin @admin_required
def update_settings(): def update_settings():
"""Update admin settings.""" """Update admin settings."""
# For now, just flash a success message # For now, just flash a success message
...@@ -296,7 +296,7 @@ def update_settings(): ...@@ -296,7 +296,7 @@ def update_settings():
return redirect(url_for('admin.settings')) return redirect(url_for('admin.settings'))
@admin_bp.route('/update_database_settings', methods=['POST']) @admin_bp.route('/update_database_settings', methods=['POST'])
@require_admin @admin_required
def update_database_settings(): def update_database_settings():
"""Update database configuration settings.""" """Update database configuration settings."""
# For now, just flash a success message # For now, just flash a success message
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment