Merge pull request #29 from BenjaminMedia/bugfix-exception-on-empty-w…

…idget

Added try catch to WidgetDocument->get() to avoid crash

src/Bonnier/WP/Cxense/Exceptions/WidgetException.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * WidgetMissingId exception file
+ */
+
+namespace Bonnier\WP\Cxense\Exceptions;
+
+/**
+ * WidgetMissingId class
+ */
+class WidgetException extends \Exception {
+
+	/**
+	 * Constructor
+	 *
+	 * @return \Bonnier\WP\Cxense\Exceptions\WidgetException
+	 */
+	public function __construct($strMessage = '') {
+		return parent::__construct($strMessage, 20);
+	}
+}

src/Bonnier/WP/Cxense/Services/WidgetDocument.php

@@ -5,6 +5,8 @@
 
 namespace Bonnier\WP\Cxense\Services;
 
+use Bonnier\WP\Cxense\Exceptions\HttpException;
+use Bonnier\WP\Cxense\Exceptions\WidgetException;
 use Bonnier\WP\Cxense\Exceptions\WidgetMissingId;
 use Bonnier\WP\Cxense\Http\HttpRequest;
 use Bonnier\WP\Cxense\Settings\SettingsPage;
@@ -86,11 +88,11 @@ public function set_settings(SettingsPage $objSettings) {
 	 */
 	public function get_documents() {
 
-		$objDocuments = $this->set_categories()->set_parameters()->get();
+		$objDocuments = $this->set_categories()->set_parameters()->get()->items ?? [];
 
 		return [
-			'totalCount' => count($objDocuments->items),
-			'matches' => $this->parse_documents($objDocuments->items)
+			'totalCount' => count($objDocuments),
+			'matches' => $this->parse_documents($objDocuments)
 		];
 	}
 
@@ -100,7 +102,7 @@ public function get_documents() {
 	 * @return null
 	 */
 	private function validate_widget_id() {
-		if (!isset($this->arrInput['widgetId'])) {
+		if (!isset($this->arrInput['widgetId']) && is_admin()) {
 			throw new WidgetMissingId('Missing request "widgetId" key!');
 		}
 	}
@@ -114,10 +116,17 @@ private function get() {
 
 		$this->set_widget_id();
 
-		$objResponse = HttpRequest::get_instance()->post('public/widget/data', [
-			'body' => json_encode($this->arrPayload)
-		]);
-
+        try {
+            $objResponse = HttpRequest::get_instance()->post('public/widget/data', [
+                'body' => json_encode($this->arrPayload)
+            ]);
+        } catch (HttpException $exception) {
+            if(is_admin()) {
+                throw new WidgetException('Failed to load widget:' . $exception->getMessage());
+            }
+            return null;
+        }
+
 		return json_decode($objResponse->getBody());
 	}
 
@@ -172,4 +181,4 @@ private function parse_documents(array $arrDocuments) {
 
 		return $arrCollection;
 	}
-}
+}

wp-cxense

@@ -0,0 +1 @@
+wp-cxense