Merge pull request #69 from turbo124/main

Improve error handling message
invoiceninja · Sep 20, 2021 · 05e56a5 · 05e56a5
2 parents 61c9cf3 + d875fcf
commit 05e56a5
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 24 deletions.
diff --git a/src/Exceptions/ApiException.php b/src/Exceptions/ApiException.php
@@ -16,16 +16,12 @@ class ApiException extends \Exception
 
     public static function createFromResponse($response)
     {
-        $object = static::parseResponseBody($response);
+        $error = static::parseResponseBody($response);
 
         $field = null;
-        if (! empty($object->field)) {
-            $field = $object->field;
-        }
-// die(var_dump($object));
 
         return new self(
-            "Error executing API call ({$object->message})}",
+            "Error executing API call ({$error})}",
             $response->getStatusCode(),
             $field
         );
@@ -34,13 +30,28 @@ public static function createFromResponse($response)
     protected static function parseResponseBody($response)
     {
         $body = (string) $response->getBody();
-
+        $error = "";
         $object = @json_decode($body);
 
+        if(property_exists($object, "message"))
+            $error = $object->message;
+
+        if(property_exists($object, "errors"))
+        {
+            $properties = array_keys(get_object_vars($object->errors));
+
+            if(is_array($properties))
+                $error_array = $object->errors->{$properties[0]};
+
+            if(is_array($error_array))
+                $error = $error_array[0];
+
+        }
+
         if (json_last_error() !== JSON_ERROR_NONE) {
             throw new self("Unable to decode response: '{$body}'.");
         }
 
-        return $object;
+        return $error;
     }
 }
diff --git a/tests/BulkActionsTest.php b/tests/BulkActionsTest.php
@@ -17,7 +17,7 @@
 class BulkActionsTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testArchive()
     {

diff --git a/tests/ClientsTest.php b/tests/ClientsTest.php
@@ -17,7 +17,7 @@
 class ClientsTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testClients()
     {

diff --git a/tests/CompaniesTest.php b/tests/CompaniesTest.php
@@ -17,7 +17,7 @@
 class CompaniesTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testCompanies()
     {

diff --git a/tests/CreditsTest.php b/tests/CreditsTest.php
@@ -17,7 +17,7 @@
 class CreditsTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testCredits()
     {
@@ -75,7 +75,7 @@ public function testCreditPost()
         $ninja = new InvoiceNinja($this->token);
         $ninja->setUrl($this->url);
 
-        $credits = $ninja->credits->create(['client_id' => '7LDdwRb1YK']);
+        $credits = $ninja->credits->create(['clint_id' => '7LDdwRb1YK']);
 
         $this->assertTrue(is_array($credits));
 

diff --git a/tests/ExpensesTest.php b/tests/ExpensesTest.php
@@ -17,7 +17,7 @@
 class ExpensesTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testExpenses()
     {

diff --git a/tests/InvoicesTest.php b/tests/InvoicesTest.php
@@ -17,7 +17,7 @@
 class InvoicesTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testInvoices()
     {

diff --git a/tests/PaymentsTest.php b/tests/PaymentsTest.php
@@ -17,7 +17,7 @@
 class PaymentsTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testPayments()
     {

diff --git a/tests/ProductsTest.php b/tests/ProductsTest.php
@@ -17,7 +17,7 @@
 class ProductsTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testProducts()
     {

diff --git a/tests/ProjectsTest.php b/tests/ProjectsTest.php
@@ -17,7 +17,7 @@
 class ProjectsTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testProjects()
     {

diff --git a/tests/QuotesTest.php b/tests/QuotesTest.php
@@ -17,7 +17,7 @@
 class QuotesTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testQuotes()
     {

diff --git a/tests/RecurringInvoicesTest.php b/tests/RecurringInvoicesTest.php
@@ -17,7 +17,7 @@
 class RecurringInvoicesTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testInvoices()
     {

diff --git a/tests/StaticsTest.php b/tests/StaticsTest.php
@@ -18,7 +18,7 @@ class StaticsTest extends TestCase
 {
 
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testGetCurrencies()
     {

diff --git a/tests/TasksTest.php b/tests/TasksTest.php
@@ -17,7 +17,7 @@
 class TasksTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testTasks()
     {

diff --git a/tests/TaxRatesTest.php b/tests/TaxRatesTest.php
@@ -17,7 +17,7 @@
 class TaxRatesTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public $faker;
 

diff --git a/tests/VendorsTest.php b/tests/VendorsTest.php
@@ -17,7 +17,7 @@
 class VendorsTest extends TestCase
 {
     protected string $token = "company-token-test";
-    protected string $url = "https://ninja.test";
+    protected string $url = "http://ninja.test:8000";
 
     public function testVendors()
     {