accept api3 exception and return standardise api error data

mecachisenros · Aug 24, 2019 · 7715594 · 7715594
1 parent d2dcfd2
commit 7715594
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Controller/Base.php b/src/Controller/Base.php
@@ -88,13 +88,19 @@ protected function authorization_status_code() {
 	 * Wrapper for WP_Error.
 	 *
 	 * @since 0.1
-	 * @param string $message
+	 * @param string|\CiviCRM_API3_Exception $error
 	 * @param mixed $data Error data
 	 * @return WP_Error $error
 	 */
-	protected function civi_rest_error( $message, $data = [] ) {
+	protected function civi_rest_error( $error, $data = [] ) {
 
-		return new \WP_Error( 'civicrm_rest_api_error', $message, empty( $data ) ? [ 'status' => $this->authorization_status_code() ] : $data );
+		if ( $error instanceof \CiviCRM_API3_Exception ) {
+
+			return $error->getExtraParams();
+
+		}
+
+		return new \WP_Error( 'civicrm_rest_api_error', $error, empty( $data ) ? [ 'status' => $this->authorization_status_code() ] : $data );
 
 	}