Hotfix, admin crash if api key is wrong or invalid

guilty-as · Dec 12, 2019 · c2a7d8f · c2a7d8f
1 parent 111f89e
commit c2a7d8f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/HubspotConnector.php b/src/HubspotConnector.php
@@ -111,17 +111,21 @@ protected function getFrequencyList()
 
     protected function getContactInformationPropertiesList()
     {
-
-
         if ($this->hubspot->hasApiKey() === false) {
             return [];
         }
 
-        return array_map(function ($item) {
-            return [
-                "label" => $item->label,
-                "value" => $item->name,
-            ];
-        }, $this->hubspot->getHubspotDefinedContactInformationProperties());
+        try {
+
+            return array_map(function ($item) {
+                return [
+                    "label" => $item->label,
+                    "value" => $item->name,
+                ];
+            }, $this->hubspot->getHubspotDefinedContactInformationProperties());
+        } catch (\Exception $e) {
+            // Prevent admin area from crashing if the api key is wrong
+            return [];
+        }
     }
 }
diff --git a/src/services/Hubspot.php b/src/services/Hubspot.php
@@ -86,7 +86,7 @@ protected function setupClients()
 
     public function hasApiKey()
     {
-        return empty($this->apiKey) === false;
+        return trim($this->apiKey) != "";
     }