Fixes

Author: GitTimeraider

app/directadmin_api.py

@@ -25,6 +25,8 @@ def _make_request(self, endpoint, data=None, method='POST'):
             if data:
                 print(f"Request data: {data}")
 
+            print(f"Starting HTTP request with 10 second timeout...")
+            
             # Common headers
             headers = {
                 'User-Agent': 'DirectAdmin Email Forwarder'
@@ -50,6 +52,7 @@ def _make_request(self, endpoint, data=None, method='POST'):
                     headers=headers
                 )
 
+            print(f"HTTP request completed successfully!")
             print(f"Response status: {response.status_code}")
             print(f"Response headers: {dict(response.headers)}")
 
@@ -157,8 +160,28 @@ def test_connection(self):
             print(f"Username: {self.username}")
             print(f"Domain: {self.domain}")
 
-            # Try CMD_API_SHOW_DOMAINS first
+            # First try a simple HTTP request test
+            print(f"Testing basic HTTP connectivity...")
+            import requests
+            test_url = f"{self.server}/CMD_API_SHOW_DOMAINS"
+            
+            try:
+                basic_response = requests.get(
+                    test_url,
+                    auth=(self.username, self.password),
+                    verify=False,
+                    timeout=5  # Shorter timeout for basic test
+                )
+                print(f"Basic HTTP test: status={basic_response.status_code}")
+                if basic_response.status_code != 200:
+                    return False, f"HTTP request failed with status {basic_response.status_code}"
+            except Exception as e:
+                print(f"Basic HTTP test failed: {e}")
+                return False, f"Basic connectivity test failed: {str(e)}"
+            
+            # Try CMD_API_SHOW_DOMAINS with our parser
             endpoint = '/CMD_API_SHOW_DOMAINS'
+            print(f"Making test request to: {self.server}{endpoint}")
             response = self._make_request(endpoint, method='GET')
 
             if response is not None:

app/settings.py

@@ -100,28 +100,40 @@ def update_da_config():
 def test_connection():
     """Test DirectAdmin connection"""
     try:
+        print(f"\n=== Test Connection Request Received ===")
         data = request.get_json()
+        print(f"Request data: {data}")
 
         # Use provided or saved credentials
         server = data.get('da_server') or current_user.da_server
         username = data.get('da_username') or current_user.da_username
         password = data.get('da_password') or current_user.get_da_password()
+        domain = data.get('da_domain') or current_user.da_domain
+
+        print(f"Test connection with server: {server}, username: {username}, domain: {domain}")
 
         if not all([server, username, password]):
-            return jsonify({'error': 'Missing credentials'}), 400
+            print(f"Missing credentials - server: {bool(server)}, username: {bool(username)}, password: {bool(password)}")
+            return jsonify({'error': 'Missing credentials', 'success': False}), 200
 
         # Ensure proper URL format
         if not server.startswith(('http://', 'https://')):
             server = 'https://' + server
 
-        # Test connection
-        api = DirectAdminAPI(server, username, password)
+        # Test connection with domain if available
+        print(f"Creating DirectAdminAPI instance...")
+        api = DirectAdminAPI(server, username, password, domain)
+        
+        print(f"Calling test_connection()...")
         success, message = api.test_connection()
+        print(f"Test connection result: success={success}, message={message}")
 
-        return jsonify({
+        result = {
             'success': success,
             'message': message
-        })
+        }
+        print(f"Sending response: {result}")
+        return jsonify(result)
 
     except Exception as e:
         error_msg = str(e)

static/settings.js

@@ -286,7 +286,10 @@ async function testConnection() {
     try {
         // Add timeout to prevent hanging
         const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), 30000); // 30 second timeout
+        const timeoutId = setTimeout(() => {
+            console.log('Connection test timeout reached, aborting...');
+            controller.abort();
+        }, 15000); // 15 second timeout for faster debugging
 
         const response = await fetch('/settings/api/test-connection', {
             method: 'POST',