Merge pull request #77 from gearbox-solutions/log-query-even-on-errors

Log API requests, even on errors

Author: Smef

composer.json

@@ -33,7 +33,7 @@
     "require-dev": {
         "orchestra/testbench": "^9.0",
         "mockery/mockery": "^1.5.1",
-        "laravel/pint": "^1.1"
+        "laravel/pint": "^1.17"
     },
     "extra": {
         "laravel": {

src/Database/Eloquent/FMModel.php

@@ -150,7 +150,7 @@ public static function createModelsFromRecordSet(BaseCollection $records): Colle
         // return an empty Eloquent/Collection (or the custom collection specified in the model) if an empty collection was
         // passed in.
         if ($records->count() === 0) {
-            return (new static())->newCollection();
+            return (new static)->newCollection();
         }
 
         // Records passed in weren't empty, so process the records
@@ -159,7 +159,7 @@ public static function createModelsFromRecordSet(BaseCollection $records): Colle
         });
 
         // return the filled Eloquent/Collection (or the custom collection specified in the model)
-        return (new static())->newCollection($mappedRecords->all());
+        return (new static)->newCollection($mappedRecords->all());
     }
 
     /** Fill in data for this existing model with record data from FileMaker

src/Services/FileMakerConnection.php

@@ -116,17 +116,24 @@ protected function fetchNewSessionToken()
         ];
 
         // perform the login
-        $response = Http::retry($this->attempts, 100)->withBasicAuth($this->config['username'], $this->config['password'])
-            ->post($url, $postBody);
+        try {
+            $response = Http::retry($this->attempts, 100)->withBasicAuth($this->config['username'], $this->config['password'])
+                ->post($url, $postBody);
+        } catch (\Exception $e) {
+            // log the query even on an error
+            $this->logFMQuery('post', $url, $postBody, $start);
+            throw $e;
+        }
+
+        // log the query
+        $this->logFMQuery('post', $url, $postBody, $start);
 
         // Check for errors
         $this->checkResponseForErrors($response);
 
         Arr::set($postBody, 'fmDataSource.0.username', str_repeat('*', strlen(Arr::get($postBody, 'fmDataSource.0.username'))));
         Arr::set($postBody, 'fmDataSource.0.password', str_repeat('*', strlen(Arr::get($postBody, 'fmDataSource.0.password'))));
 
-        $this->logFMQuery('post', $url, $postBody, $start);
-
         // Get the session token from the response
         $token = Arr::get($response, 'response.token');
 
@@ -718,7 +725,17 @@ protected function makeRequest($method, $url, $params = [], ?PendingRequest $req
         $request = $this->prepareRequestForSending($request);
 
         // make the request
-        $response = $request->{$method}($url, $params);
+
+        try {
+            $response = $request->{$method}($url, $params);
+        } catch (\Exception $e) {
+            // log the query before throwing the exception
+            $this->logFMQuery($method, $url, $params, $start);
+            throw $e;
+        }
+        // log the query after a successful request
+        $this->logFMQuery($method, $url, $params, $start);
+
         // Check for errors
         try {
             $this->checkResponseForErrors($response);
@@ -730,19 +747,27 @@ protected function makeRequest($method, $url, $params = [], ?PendingRequest $req
 
                 // try the request again with refreshed credentials
                 $request = $this->prepareRequestForSending($request);
-                $response = $request->{$method}($url, $params);
+                try {
+                    // execute the request
+                    $response = $request->{$method}($url, $params);
+                } catch (\Exception $e) {
+                    // log the query before throwing the exception
+                    $this->logFMQuery($method, $url, $params, $start);
+                    throw $e;
+                }
+
+                // log the query after a successful request
+                $this->logFMQuery($method, $url, $params, $start);
 
-                // check for errors a second time, but this time we won't catch the error if there's still an auth
-                // problem
+                // check for errors a second time, but this time we won't catch the error if there's
+                // still an auth problem
                 $this->checkResponseForErrors($response);
 
             } else {
                 throw $e;
             }
         }
 
-        $this->logFMQuery($method, $url, $params, $start);
-
         // Return the JSON response
         $json = $response->json();
 
@@ -809,7 +834,7 @@ public function setRetries($retries)
 
     protected function getDefaultQueryGrammar()
     {
-        return new FMGrammar();
+        return new FMGrammar;
     }
 
     //    public function getLayoutMetadata($layout = null)