Fix exception handling in v2 update_additional_fields_for_object REST…

… API calls
alexminza · Jan 10, 2018 · 009a21a · 009a21a
1 parent a94ef8d
commit 009a21a
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/includes/abstracts/abstract-wc-rest-crud-controller.php b/includes/abstracts/abstract-wc-rest-crud-controller.php
@@ -192,7 +192,15 @@ public function create_item( $request ) {
 			return $object;
 		}
 
-		$this->update_additional_fields_for_object( $object, $request );
+		try {
+			$this->update_additional_fields_for_object( $object, $request );
+		} catch ( WC_Data_Exception $e ) {
+			$object->delete();
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), $e->getErrorData() );
+		} catch ( WC_REST_Exception $e ) {
+			$object->delete();
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
 
 		/**
 		 * Fires after a single object is created or updated via the REST API.
@@ -231,7 +239,13 @@ public function update_item( $request ) {
 			return $object;
 		}
 
-		$this->update_additional_fields_for_object( $object, $request );
+		try {
+			$this->update_additional_fields_for_object( $object, $request );
+		} catch ( WC_Data_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), $e->getErrorData() );
+		} catch ( WC_REST_Exception $e ) {
+			return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+		}
 
 		/**
 		 * Fires after a single object is created or updated via the REST API.