see #607: return better error messages, make build_request_url private

insideout10 · Sep 7, 2017 · 9f0b6b7 · 9f0b6b7
1 parent dc853e7
commit 9f0b6b7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/includes/class-wordlift-autocomplete-adapter.php b/src/includes/class-wordlift-autocomplete-adapter.php
@@ -68,8 +68,6 @@ public function wl_autocomplete() {
 
 		// Make request.
 		$response = $this->autocomplete_service->make_request( $query );
-		// Decode response body.
-		$suggestions = json_decode( wp_remote_retrieve_body( $response ), true );
 
 		// Clear any buffer.
 		ob_clean();
@@ -78,12 +76,20 @@ public function wl_autocomplete() {
 		if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
 			// Echo the response.
 			wp_send_json_success( array(
-				'suggestions' => $suggestions,
+				json_decode( wp_remote_retrieve_body( $response ), true )
 			) );
 		} else {
+			// Default error message.
+			$error_message = __( 'Something went wrong.' );
+
+			// Get the real error message if there is WP_Error.
+			if ( is_wp_error( $response ) ) {
+				$error_message = $response->get_error_message();
+			}
+
 			// There is an error, so send error message.
 			wp_send_json_error( array(
-				'message' => __( 'Something went wrong.' ),
+				'message' => $error_message,
 			) );
 		}
 	}

diff --git a/src/includes/class-wordlift-autocomplete-service.php b/src/includes/class-wordlift-autocomplete-service.php
@@ -78,7 +78,7 @@ public function make_request( $query ) {
 	 *
 	 * @return string Built url.
 	 */
-	public function build_request_url( $query ) {
+	private function build_request_url( $query ) {
 		$args = array(
 			'key'      => $this->configuration_service->get_key(),
 			'language' => $this->configuration_service->get_language_code(),