Update settings.py

Author: GitTimeraider

app/settings.py

@@ -2,6 +2,7 @@
 from flask_login import login_required, current_user
 from app.models import db
 from app.directadmin_api import DirectAdminAPI
+import traceback
 
 settings_bp = Blueprint('settings', __name__, url_prefix='/settings')
 
@@ -23,34 +24,45 @@ def get_da_config():
 @settings_bp.route('/api/da-config', methods=['POST'])
 @login_required
 def update_da_config():
-    data = request.json
+    try:
+        data = request.json
+        print(f"Received settings update: {data}")  # Debug log
+
+        # Validate required fields
+        required_fields = ['da_server', 'da_username', 'da_domain']
+        for field in required_fields:
+            if not data.get(field):
+                return jsonify({'error': f'{field} is required'}), 400
 
-    # Validate required fields
-    required_fields = ['da_server', 'da_username', 'da_domain']
-    for field in required_fields:
-        if not data.get(field):
-            return jsonify({'error': f'{field} is required'}), 400
+        # Update DirectAdmin settings
+        current_user.da_server = data['da_server'].rstrip('/')
+        current_user.da_username = data['da_username']
+        current_user.da_domain = data['da_domain']
 
-    # Update DirectAdmin settings
-    current_user.da_server = data['da_server'].rstrip('/')
-    current_user.da_username = data['da_username']
-    current_user.da_domain = data['da_domain']
+        # Only update password if provided
+        if data.get('da_password'):
+            print("Setting new DA password")  # Debug log
+            current_user.set_da_password(data['da_password'])
 
-    # Only update password if provided
-    if data.get('da_password'):
-        current_user.set_da_password(data['da_password'])
+        db.session.commit()
+        print("Settings saved successfully")  # Debug log
 
-    db.session.commit()
+        return jsonify({'success': True, 'message': 'DirectAdmin settings updated successfully'})
 
-    return jsonify({'success': True, 'message': 'DirectAdmin settings updated successfully'})
+    except Exception as e:
+        print(f"Error updating settings: {str(e)}")  # Debug log
+        print(traceback.format_exc())  # Full traceback
+        db.session.rollback()
+        return jsonify({'error': f'Failed to save settings: {str(e)}'}), 500
 
 @settings_bp.route('/api/test-connection', methods=['POST'])
 @login_required
 def test_connection():
     """Test DirectAdmin connection with provided credentials"""
-    data = request.json
-
     try:
+        data = request.json
+        print(f"Testing connection with: {data.get('da_server')}")  # Debug log
+
         # Use provided credentials or current user's
         server = data.get('da_server') or current_user.da_server
         username = data.get('da_username') or current_user.da_username
@@ -61,13 +73,14 @@ def test_connection():
 
         # Test connection
         api = DirectAdminAPI(server, username, password)
-        # Try to get domains as a test
-        response = api._make_request('API_SHOW_DOMAINS')
+        success, message = api.test_connection()
 
-        if response.status_code == 200:
-            return jsonify({'success': True, 'message': 'Connection successful!'})
+        if success:
+            return jsonify({'success': True, 'message': message})
         else:
-            return jsonify({'error': 'Connection failed'}), 400
+            return jsonify({'error': message}), 400
 
     except Exception as e:
+        print(f"Test connection error: {str(e)}")  # Debug log
+        print(traceback.format_exc())  # Full traceback
         return jsonify({'error': str(e)}), 500