Use WP_Error.

xwp · Jun 12, 2020 · 07c7c24 · 07c7c24
1 parent bf404fb
commit 07c7c24
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/assets/src/media-selector/views/button.js b/assets/src/media-selector/views/button.js
@@ -39,11 +39,15 @@ const Button = wp.media.view.Button.extend( {
 					this.options.click.apply( this, arguments );
 				}
 			} )
-			.catch( () => {
+			.catch( error => {
 				this.$el.attr( 'disabled', false ); // Enable button.
 				spinner.hide();
-				const errors = getConfig( 'errors' );
-				alert( errors.generic ); // eslint-disable-line
+				if ( error && error.responseJSON && error.responseJSON.message ) {
+					alert( error.responseJSON.message.replace( /(<([^>]+)>)/gi, '' ) ); // eslint-disable-line
+				} else {
+					const errors = getConfig( 'errors' );
+					alert( errors ); // eslint-disable-line
+				}
 			} );
 	},
 } );

diff --git a/php/class-rest-controller.php b/php/class-rest-controller.php
@@ -223,7 +223,7 @@ public function get_import( $request ) {
 
 		$api_response = $this->plugin->api->get( $id );
 		if ( is_wp_error( $api_response ) ) {
-			return $this->rest_ensure_response( $api_response, $request );
+			return $api_response;
 		}
 		$results     = $api_response->get_results();
 		$credentials = $this->plugin->settings->get_credentials();
@@ -237,7 +237,7 @@ public function get_import( $request ) {
 		$importer      = new Import( $id, $image );
 		$attachment_id = $importer->process();
 		if ( is_wp_error( $attachment_id ) ) {
-			return $this->rest_ensure_response( $attachment_id, $request );
+			return $attachment_id;
 		}
 		$this->plugin->api->download( $id );
 		$response = $this->prepare_item_for_response( $results, $request );