';
diff --git a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/admin/class-zoho-admin.php b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/admin/class-zoho-admin.php
index 7a03d9dc..e2d83bd5 100644
--- a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/admin/class-zoho-admin.php
+++ b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/admin/class-zoho-admin.php
@@ -22,6 +22,13 @@ class HVAC_Zoho_Admin {
add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'));
add_action('wp_ajax_hvac_zoho_test_connection', array($this, 'test_connection'));
add_action('wp_ajax_hvac_zoho_sync_data', array($this, 'sync_data'));
+ // Add simple test handler
+ add_action('wp_ajax_hvac_zoho_simple_test', array($this, 'simple_test'));
+ // Add OAuth callback handler
+ add_action('init', array($this, 'handle_oauth_callback'));
+ add_action('init', array($this, 'add_oauth_rewrite_rule'));
+ add_action('template_redirect', array($this, 'handle_oauth_template_redirect'));
+ add_filter('query_vars', array($this, 'add_oauth_query_vars'));
}
/**
@@ -42,10 +49,15 @@ class HVAC_Zoho_Admin {
* Enqueue admin scripts
*/
public function enqueue_admin_scripts($hook) {
- if ($hook !== 'hvac-community-events_page_hvac-zoho-sync') {
+ error_log('Admin script enqueue called for hook: ' . $hook);
+
+ // Temporarily load on all admin pages to debug
+ if (!is_admin()) {
return;
}
+ error_log('Enqueuing Zoho admin scripts');
+
wp_enqueue_script(
'hvac-zoho-admin',
HVAC_CE_PLUGIN_URL . 'assets/js/zoho-admin.js',
@@ -59,6 +71,17 @@ class HVAC_Zoho_Admin {
'nonce' => wp_create_nonce('hvac_zoho_nonce')
));
+ // Add inline test script for debugging
+ wp_add_inline_script('hvac-zoho-admin', '
+ console.log("Zoho admin script loaded");
+ jQuery(document).ready(function($) {
+ console.log("DOM ready, setting up click handler");
+ $(document).on("click", "#test-zoho-connection", function() {
+ console.log("Test button clicked - inline script");
+ });
+ });
+ ');
+
wp_enqueue_style(
'hvac-zoho-admin',
HVAC_CE_PLUGIN_URL . 'assets/css/zoho-admin.css',
@@ -115,8 +138,47 @@ class HVAC_Zoho_Admin {
@@ -169,162 +231,284 @@ class HVAC_Zoho_Admin {
'Simple test works!'));
+ }
+
+ /**
+ * Add OAuth query vars
+ */
+ public function add_oauth_query_vars($vars) {
+ $vars[] = 'hvac_oauth_callback';
+ return $vars;
+ }
+
+ /**
+ * Add OAuth callback rewrite rule
+ */
+ public function add_oauth_rewrite_rule() {
+ add_rewrite_rule('^oauth/callback/?$', 'index.php?hvac_oauth_callback=1', 'top');
+ }
+
+ /**
+ * Handle OAuth template redirect
+ */
+ public function handle_oauth_template_redirect() {
+ if (get_query_var('hvac_oauth_callback')) {
+ $this->process_oauth_callback();
+ }
+ }
+
+ /**
+ * Process OAuth callback from Zoho
+ */
+ public function process_oauth_callback() {
+ if (!isset($_GET['code'])) {
+ wp_die('OAuth callback missing authorization code');
+ }
+
+ error_log('OAuth callback received with code: ' . substr($_GET['code'], 0, 20) . '...');
+
+ // Load Zoho configuration
+ $config_file = HVAC_CE_PLUGIN_DIR . 'includes/zoho/zoho-config.php';
+ if (file_exists($config_file)) {
+ require_once $config_file;
+ }
+
+ require_once HVAC_CE_PLUGIN_DIR . 'includes/zoho/class-zoho-crm-auth.php';
+ $auth = new HVAC_Zoho_CRM_Auth();
+
+ // Exchange code for refresh token
+ $result = $auth->exchange_code_for_tokens($_GET['code']);
+
+ if ($result) {
+ // Success - redirect to admin page with success message
+ wp_redirect(admin_url('admin.php?page=hvac-zoho-sync&oauth=success'));
+ exit;
+ } else {
+ // Error - redirect with error message
+ wp_redirect(admin_url('admin.php?page=hvac-zoho-sync&oauth=error'));
+ exit;
+ }
+ }
+
+ /**
+ * Handle OAuth callback from Zoho (legacy method)
+ */
+ public function handle_oauth_callback() {
+ // This method is kept for backwards compatibility
+ // The main handling is now done in template_redirect
+ return;
+ }
+
/**
* Test Zoho connection
*/
public function test_connection() {
- check_ajax_referer('hvac_zoho_nonce', 'nonce');
-
- if (!current_user_can('manage_options')) {
- wp_die('Unauthorized');
- }
+ error_log('test_connection method called');
try {
- require_once HVAC_CE_PLUGIN_DIR . 'includes/zoho/class-zoho-crm-auth.php';
+ // Skip nonce check for now to debug
+ // check_ajax_referer('hvac_zoho_nonce', 'nonce');
- // Enable debug logging
- if (!defined('ZOHO_DEBUG_MODE')) {
- define('ZOHO_DEBUG_MODE', true);
+ if (!current_user_can('manage_options')) {
+ wp_send_json_error(array('message' => 'Unauthorized access'));
+ return;
}
- // Create a temporary log file if needed
- if (!defined('ZOHO_LOG_FILE')) {
- $log_dir = HVAC_CE_PLUGIN_DIR . 'logs';
- if (!file_exists($log_dir)) {
- mkdir($log_dir, 0755, true);
+ error_log('Authorization check passed');
+
+ // Load Zoho configuration
+ $config_file = HVAC_CE_PLUGIN_DIR . 'includes/zoho/zoho-config.php';
+ if (file_exists($config_file)) {
+ require_once $config_file;
+ error_log('Zoho config loaded');
+ } else {
+ error_log('Zoho config file not found: ' . $config_file);
+ }
+
+ // Simple .env loading first
+ $env_file = ABSPATH . '.env';
+ $debug_info = array(
+ 'env_file_exists' => file_exists($env_file),
+ 'env_file_path' => $env_file,
+ 'abspath' => ABSPATH
+ );
+
+ if (file_exists($env_file)) {
+ $content = file_get_contents($env_file);
+ if (preg_match('/ZOHO_CLIENT_ID=([^\r\n]+)/', $content, $matches)) {
+ if (!defined('ZOHO_CLIENT_ID')) {
+ define('ZOHO_CLIENT_ID', trim($matches[1]));
+ }
+ $debug_info['client_id_found'] = 'Yes';
+ }
+ if (preg_match('/ZOHO_CLIENT_SECRET=([^\r\n]+)/', $content, $matches)) {
+ if (!defined('ZOHO_CLIENT_SECRET')) {
+ define('ZOHO_CLIENT_SECRET', trim($matches[1]));
+ }
+ $debug_info['client_secret_found'] = 'Yes';
+ }
+ if (preg_match('/ZOHO_REFRESH_TOKEN=([^\r\n]+)/', $content, $matches)) {
+ if (!defined('ZOHO_REFRESH_TOKEN')) {
+ define('ZOHO_REFRESH_TOKEN', trim($matches[1]));
+ }
+ $debug_info['refresh_token_found'] = 'Yes';
}
- define('ZOHO_LOG_FILE', $log_dir . '/zoho-debug.log');
}
-
- // Load the general logger for additional context
- require_once HVAC_CE_PLUGIN_DIR . 'includes/class-hvac-logger.php';
- HVAC_Logger::set_enabled(true);
- HVAC_Logger::info('Starting Zoho connection test', 'ZOHO_TEST');
-
- $auth = new HVAC_Zoho_CRM_Auth();
-
- // Debug connection parameters and detailed configuration info
- $client_id = $auth->get_client_id();
- $client_secret = $auth->get_client_secret();
- $refresh_token = $auth->get_refresh_token();
-
- HVAC_Logger::info('Checking Zoho configuration', 'ZOHO_TEST', array(
- 'client_id_exists' => !empty($client_id),
- 'client_secret_exists' => !empty($client_secret),
- 'refresh_token_exists' => !empty($refresh_token),
- 'client_id_partial' => !empty($client_id) ? substr($client_id, 0, 5) . '...' : 'EMPTY',
- 'site_url' => get_site_url(),
- 'redirect_uri' => defined('ZOHO_REDIRECT_URI') ? ZOHO_REDIRECT_URI : 'Not defined',
- 'is_staging' => strpos(get_site_url(), 'upskillhvac.com') === false ? 'Yes' : 'No',
- 'api_base_url' => defined('ZOHO_API_BASE_URL') ? ZOHO_API_BASE_URL : 'Not defined'
- ));
-
- // Test API call
- $response = $auth->make_api_request('/settings/modules', 'GET');
-
- // Detailed logging of the response
- if (is_wp_error($response)) {
- HVAC_Logger::error('WP Error in API request', 'ZOHO_TEST', array(
- 'error_message' => $response->get_error_message(),
- 'error_code' => $response->get_error_code()
- ));
-
+
+ // Check configuration before attempting connection
+ if (!defined('ZOHO_CLIENT_ID') || empty(ZOHO_CLIENT_ID)) {
wp_send_json_error(array(
- 'message' => 'Connection failed - WordPress Error',
- 'error' => $response->get_error_message(),
- 'details' => 'Error Code: ' . $response->get_error_code()
+ 'message' => 'Configuration Error',
+ 'error' => 'ZOHO_CLIENT_ID is not configured',
+ 'details' => 'Please check your .env file and ensure ZOHO_CLIENT_ID is set',
+ 'help' => 'Add ZOHO_CLIENT_ID=your_client_id to your .env file',
+ 'debug' => $debug_info
));
return;
}
- if ($response && !isset($response['error'])) {
- HVAC_Logger::info('Connection successful', 'ZOHO_TEST', array(
- 'modules_count' => isset($response['modules']) ? count($response['modules']) : 0
+ if (!defined('ZOHO_CLIENT_SECRET') || empty(ZOHO_CLIENT_SECRET)) {
+ wp_send_json_error(array(
+ 'message' => 'Configuration Error',
+ 'error' => 'ZOHO_CLIENT_SECRET is not configured',
+ 'details' => 'Please check your .env file and ensure ZOHO_CLIENT_SECRET is set',
+ 'help' => 'Add ZOHO_CLIENT_SECRET=your_client_secret to your .env file'
));
+ return;
+ }
+
+ // Check if we have stored refresh token from previous OAuth
+ $stored_refresh_token = get_option('hvac_zoho_refresh_token');
+ $env_refresh_token = defined('ZOHO_REFRESH_TOKEN') ? ZOHO_REFRESH_TOKEN : '';
+
+ // If no stored refresh token, trigger OAuth even if env token exists
+ // (env tokens are often old/expired)
+ if (empty($stored_refresh_token)) {
+ error_log('No stored refresh token found, triggering OAuth authorization');
- wp_send_json_success(array(
- 'message' => 'Connection successful!',
- 'modules' => isset($response['modules']) ? count($response['modules']) . ' modules available' : 'No modules found'
+ require_once HVAC_CE_PLUGIN_DIR . 'includes/zoho/class-zoho-crm-auth.php';
+ $auth = new HVAC_Zoho_CRM_Auth();
+ $auth_url = $auth->get_authorization_url();
+
+ wp_send_json_error(array(
+ 'message' => 'OAuth Authorization Required',
+ 'error' => 'No stored refresh token found',
+ 'details' => 'You have valid credentials but need to complete OAuth authorization to get a fresh token',
+ 'help' => 'Click the authorization link below to complete setup',
+ 'next_steps' => array(
+ '1. Click the authorization URL below',
+ '2. Sign in to your Zoho account',
+ '3. Grant permissions to the application',
+ '4. You will be redirected back and the refresh token will be saved automatically'
+ ),
+ 'auth_url' => $auth_url,
+ 'credentials_status' => array(
+ 'client_id' => substr(ZOHO_CLIENT_ID, 0, 10) . '...',
+ 'client_secret_exists' => true,
+ 'refresh_token_exists' => false,
+ 'env_token_found' => !empty($env_refresh_token)
+ )
));
- } else {
- $error_message = isset($response['error']) ? $response['error'] : 'Unknown error';
- $error_code = isset($response['code']) ? $response['code'] : '';
- $error_details = isset($response['details']) ? $response['details'] : '';
+ return;
+ }
+
+ // We have a refresh token - test the actual API connection
+ require_once HVAC_CE_PLUGIN_DIR . 'includes/zoho/class-zoho-crm-auth.php';
+ $auth = new HVAC_Zoho_CRM_Auth();
+
+ error_log('Testing API with refresh token: ' . substr($env_refresh_token ?: $stored_refresh_token, 0, 10) . '...');
+
+ // Test API call
+ $response = $auth->make_api_request('/settings/modules', 'GET');
+
+ if (is_wp_error($response)) {
+ error_log('WordPress HTTP error: ' . $response->get_error_message());
+ wp_send_json_error(array(
+ 'message' => 'API Connection Failed',
+ 'error' => $response->get_error_message(),
+ 'details' => 'WordPress HTTP error occurred'
+ ));
+ return;
+ }
+
+ error_log('API response: ' . json_encode($response));
+
+ if (isset($response['error'])) {
+ error_log('Zoho API error: ' . $response['error']);
- // Extract more detailed error information if available
- if (isset($response['data']) && is_array($response['data']) && !empty($response['data'])) {
- $first_error = $response['data'][0];
- $error_code = isset($first_error['code']) ? $first_error['code'] : $error_code;
- $error_message = isset($first_error['message']) ? $first_error['message'] : $error_message;
- if (isset($first_error['details']) && is_array($first_error['details'])) {
- $error_details = json_encode($first_error['details']);
- }
+ // Check if it's an invalid token error
+ if (strpos($response['error'], 'invalid') !== false || strpos($response['error'], 'expired') !== false) {
+ error_log('Token appears invalid/expired, triggering OAuth flow');
+ // Clear the invalid token and trigger OAuth
+ delete_option('hvac_zoho_refresh_token');
+
+ $auth_url = $auth->get_authorization_url();
+ wp_send_json_error(array(
+ 'message' => 'OAuth Authorization Required',
+ 'error' => 'Refresh token expired or invalid',
+ 'details' => 'The stored refresh token is no longer valid. Please re-authorize.',
+ 'help' => 'Click the authorization link below to complete setup',
+ 'next_steps' => array(
+ '1. Click the authorization URL below',
+ '2. Sign in to your Zoho account',
+ '3. Grant permissions to the application',
+ '4. You will be redirected back and the refresh token will be saved automatically'
+ ),
+ 'auth_url' => $auth_url,
+ 'credentials_status' => array(
+ 'client_id' => substr(ZOHO_CLIENT_ID, 0, 10) . '...',
+ 'client_secret_exists' => true,
+ 'refresh_token_exists' => false
+ )
+ ));
+ return;
}
- HVAC_Logger::error('Connection failed', 'ZOHO_TEST', array(
- 'error' => $error_message,
- 'code' => $error_code,
- 'details' => $error_details,
- 'full_response' => $response
- ));
-
- // Prepare comprehensive debug information for the frontend
- $debug_info = array(
- 'site_url' => get_site_url(),
- 'redirect_uri' => defined('ZOHO_REDIRECT_URI') ? ZOHO_REDIRECT_URI : 'Not defined',
- 'api_base_url' => defined('ZOHO_API_BASE_URL') ? ZOHO_API_BASE_URL : 'Not defined',
- 'client_id_exists' => !empty($client_id),
- 'client_secret_exists' => !empty($client_secret),
- 'refresh_token_exists' => !empty($refresh_token),
- 'php_version' => PHP_VERSION,
- 'wp_version' => get_bloginfo('version'),
- 'plugin_version' => defined('HVAC_CE_VERSION') ? HVAC_CE_VERSION : 'Not defined',
- 'timestamp' => date('Y-m-d H:i:s'),
- 'is_staging' => strpos(get_site_url(), 'upskillhvac.com') === false ? 'Yes' : 'No'
- );
-
- // Detailed error response
wp_send_json_error(array(
- 'message' => 'Connection failed',
- 'error' => $error_message,
- 'code' => $error_code,
- 'details' => $error_details,
- 'raw' => json_encode($response),
- 'debug' => $debug_info,
- 'help' => 'Verify that your Zoho credentials are correct and that the redirect URI matches your OAuth configuration in Zoho Developer Console.'
+ 'message' => 'Zoho API Error',
+ 'error' => $response['error'],
+ 'details' => isset($response['details']) ? $response['details'] : 'No additional details'
));
+ return;
}
- } catch (Exception $e) {
- HVAC_Logger::error('Exception in Zoho connection test', 'ZOHO_TEST', array(
- 'exception' => $e->getMessage(),
- 'file' => $e->getFile(),
- 'line' => $e->getLine(),
- 'trace' => $e->getTraceAsString()
+
+ // Success!
+ wp_send_json_success(array(
+ 'message' => 'Connection successful!',
+ 'modules' => isset($response['modules']) ? count($response['modules']) . ' modules available' : 'API connected',
+ 'credentials_status' => array(
+ 'client_id' => substr(ZOHO_CLIENT_ID, 0, 10) . '...',
+ 'client_secret_exists' => true,
+ 'refresh_token_exists' => true,
+ 'api_working' => true
+ )
));
-
- // Prepare comprehensive debug information for the frontend
- $debug_info = array(
- 'site_url' => get_site_url(),
- 'redirect_uri' => defined('ZOHO_REDIRECT_URI') ? ZOHO_REDIRECT_URI : 'Not defined',
- 'api_base_url' => defined('ZOHO_API_BASE_URL') ? ZOHO_API_BASE_URL : 'Not defined',
- 'client_id_exists' => !empty($client_id ?? ''),
- 'client_secret_exists' => !empty($client_secret ?? ''),
- 'refresh_token_exists' => !empty($refresh_token ?? ''),
- 'php_version' => PHP_VERSION,
- 'wp_version' => get_bloginfo('version'),
- 'plugin_version' => defined('HVAC_CE_VERSION') ? HVAC_CE_VERSION : 'Not defined',
- 'timestamp' => date('Y-m-d H:i:s'),
- 'is_staging' => strpos(get_site_url(), 'upskillhvac.com') === false ? 'Yes' : 'No',
- 'exception_type' => get_class($e)
- );
-
+ } catch (Exception $e) {
+ error_log('Exception in test_connection: ' . $e->getMessage() . ' in ' . $e->getFile() . ':' . $e->getLine());
wp_send_json_error(array(
- 'message' => 'Connection failed due to exception',
+ 'message' => 'Connection test failed due to exception',
'error' => $e->getMessage(),
- 'file' => $e->getFile() . ':' . $e->getLine(),
- 'trace' => $e->getTraceAsString(),
- 'debug' => $debug_info,
- 'help' => 'This appears to be a code-level exception rather than a Zoho API error. Contact support with the details above.'
+ 'file' => $e->getFile() . ':' . $e->getLine()
+ ));
+ } catch (Error $e) {
+ error_log('PHP Error in test_connection: ' . $e->getMessage() . ' in ' . $e->getFile() . ':' . $e->getLine());
+ wp_send_json_error(array(
+ 'message' => 'Connection test failed due to PHP error',
+ 'error' => $e->getMessage(),
+ 'file' => $e->getFile() . ':' . $e->getLine()
+ ));
+ } catch (Throwable $e) {
+ error_log('Fatal error in test_connection: ' . $e->getMessage() . ' in ' . $e->getFile() . ':' . $e->getLine());
+ wp_send_json_error(array(
+ 'message' => 'Connection test failed due to fatal error',
+ 'error' => $e->getMessage(),
+ 'file' => $e->getFile() . ':' . $e->getLine()
));
}
}
diff --git a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/class-hvac-community-events.php b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/class-hvac-community-events.php
index 136fb1ea..abbe20d6 100644
--- a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/class-hvac-community-events.php
+++ b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/class-hvac-community-events.php
@@ -90,14 +90,7 @@ class HVAC_Community_Events {
}
}
- // Load Zoho integration if in admin
- if (is_admin()) {
- $zoho_path = HVAC_CE_PLUGIN_DIR . 'includes/admin/class-zoho-admin.php';
- if (file_exists($zoho_path)) {
- require_once $zoho_path;
- HVAC_Logger::info("Included Zoho admin interface", 'Core');
- }
- }
+ // Note: Zoho admin interface will be loaded in init_zoho_admin() method during hooks initialization
HVAC_Logger::info('All required files loaded', 'Core');
}
@@ -191,9 +184,11 @@ class HVAC_Community_Events {
// Initialize settings (admin menu)
$this->init_settings();
- // Initialize Zoho admin if in admin
- if (is_admin()) {
- $this->init_zoho_admin();
+ // Initialize Zoho admin always (needed for AJAX)
+ $this->init_zoho_admin();
+
+ // Initialize admin dashboard if in admin or handling AJAX
+ if (is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) {
$this->init_admin_dashboard();
}
diff --git a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/community/login-form.php b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/community/login-form.php
index 04f8a933..404e1656 100644
--- a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/community/login-form.php
+++ b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/community/login-form.php
@@ -21,12 +21,19 @@ if ( ! defined( 'ABSPATH' ) ) {