| @@ -61,36 +61,25 @@ | ||
| 61 | 61 | * |
| 62 | 62 | * @param string $redirect_to Optional redirect path after authentication |
| 63 | 63 | * @return string The Google auth URL with query parameters |
| 64 | 64 | */ |
| 65 | -public function google_auth_url($redirect_to = '', $current_url = '') { | |
| 65 | +public function google_auth_url($redirect_to = '') { | |
| 66 | 66 | $base_url = $this->url(); |
| 67 | 67 | // Replace /api/plugin with /api/auth/plugin/google |
| 68 | 68 | $auth_url = str_replace('/api/plugin', '/api/auth/plugin/google', $base_url); |
| 69 | 69 | |
| 70 | - // Get the referer to return to the exact same page we initiated login from securely | |
| 71 | - if ( ! empty( $current_url ) ) { | |
| 72 | - $referer = esc_url_raw( $current_url ); | |
| 73 | - } else { | |
| 74 | - $referer = isset( $_SERVER['HTTP_REFERER'] ) ? esc_url_raw( wp_unslash( $_SERVER['HTTP_REFERER'] ) ) : ''; | |
| 75 | - } | |
| 76 | - | |
| 77 | - $return_url = wp_validate_redirect( $referer, '' ); | |
| 78 | - | |
| 79 | - if ( empty( $return_url ) ) { | |
| 80 | - $return_url = admin_url( 'admin.php?page=templately' ); | |
| 81 | - } | |
| 82 | - | |
| 83 | - $return_params = [ | |
| 84 | - 'templately_google_login' => '1', | |
| 70 | + // Build the site_url with admin-ajax path | |
| 71 | + $admin_url = admin_url('admin-ajax.php'); | |
| 72 | + $admin_params = [ | |
| 73 | + 'action' => 'templately_google_login', | |
| 85 | 74 | ]; |
| 86 | 75 | |
| 87 | 76 | // Add redirect-to parameter if provided |
| 88 | 77 | if (!empty($redirect_to)) { |
| 89 | - $return_params['redirect-to'] = $redirect_to; | |
| 78 | + $admin_params['redirect-to'] = $redirect_to; | |
| 90 | 79 | } |
| 91 | 80 | |
| 92 | - $site_url_with_params = add_query_arg($return_params, $return_url); | |
| 81 | + $site_url_with_params = add_query_arg($admin_params, $admin_url); | |
| 93 | 82 | |
| 94 | 83 | $query_params = [ |
| 95 | 84 | 'site_url' => urlencode($site_url_with_params), |
| 96 | 85 | 'site_ip' => Helper::get_ip(), |
| @@ -113,9 +102,9 @@ | ||
| 113 | 102 | case is_string( $value ) && ( $value === 'true' || $value === 'false' ): |
| 114 | 103 | $prepareArgs .= "$key:" . $value . ","; |
| 115 | 104 | break; |
| 116 | 105 | default: |
| 117 | - $prepareArgs .= "$key:" . '"' . Helper::esc_json_string( $value ) . '"' . ","; | |
| 106 | + $prepareArgs .= "$key:" . '"' . $value . '"' . ","; | |
| 118 | 107 | break; |
| 119 | 108 | } |
| 120 | 109 | } |
| 121 | 110 | |
| @@ -196,9 +185,9 @@ | ||
| 196 | 185 | Helper::log( 'QUERY: ' . $query ); |
| 197 | 186 | } |
| 198 | 187 | |
| 199 | 188 | $_default_args = [ |
| 200 | - 'timeout' => $this->dev_mode ? 120 : 30, | |
| 189 | + 'timeout' => $this->dev_mode ? 40 : 30, | |
| 201 | 190 | 'headers' => $headers, |
| 202 | 191 | 'body' => wp_json_encode( [ |
| 203 | 192 | 'query' => $query |
| 204 | 193 | ] ) |
