improved request handling to prevent double-sending requests with expired tokens

Author: Smef

src/Services/FileMakerConnection.php

@@ -118,7 +118,7 @@ protected function getLayoutUrl($layout = null)
     /**
      * @throws FileMakerDataApiException
      */
-    protected function checkResponseForErrors($response)
+    protected function checkResponseForErrors($response): void
     {
         $messages = Arr::get($response, 'messages', []);
 
@@ -128,10 +128,6 @@ protected function checkResponseForErrors($response)
 
                 if ($code !== 0) {
                     switch ($code) {
-                        case 952:
-                            // API token is expired. We should expire it in the cache so it isn't used again.
-                            $this->forgetSessionToken();
-                            break;
                         case 105:
                             // Layout is missing error
                             // Add the layout name to the message for clarity
@@ -234,9 +230,6 @@ public function performFind(FMBaseBuilder $query)
 
         $response = $this->makeRequest('post', $url, $postData);
 
-        // Check for errors
-        $this->checkResponseForErrors($response);
-
         return $response;
     }
 
@@ -632,24 +625,46 @@ public function setGlobalFields(array $globalFields)
         return $response;
     }
 
-    /**
-     * @throws FileMakerDataApiException
-     */
-    protected function makeRequest($method, $url, $params = [], ?PendingRequest $request = null)
+    protected function prepareRequestForSending($request)
     {
-        $this->login();
-
         if ($request instanceof PendingRequest) {
             $request->withToken($this->sessionToken);
         } else {
             $request = Http::withToken($this->sessionToken);
         }
 
-        $response = $request->withMiddleware($this->retryMiddleware())
-            ->{$method}($url, $params);
+        $request->withMiddleware($this->retryMiddleware());
 
+        return $request;
+    }
+
+    /**
+     * @throws FileMakerDataApiException
+     */
+    protected function makeRequest($method, $url, $params = [], ?PendingRequest $request = null)
+    {
+        $this->login();
+
+        $request = $this->prepareRequestForSending($request);
+
+        // make the request
+        $response = $request->{$method}($url, $params);
         // Check for errors
+        try {
         $this->checkResponseForErrors($response);
+        } catch (FileMakerDataApiException $e) {
+            if ($e->getCode() === 952) {
+                // the session expired, so we should forget the token and re-login
+                $this->forgetSessionToken();
+                $this->login();
+
+                // try the request again with refreshed credentials
+                $request = $this->prepareRequestForSending($request);
+                $response = $request->{$method}($url, $params);
+            } else {
+                throw $e;
+            }
+        }
 
         // Return the JSON response
         $json = $response->json();
@@ -678,7 +693,6 @@ protected function retryMiddleware()
             }
 
             $should_retry = false;
-            $refresh = false;
             $log_message = null;
 
             // Retry connection exceptions
@@ -687,27 +701,10 @@ protected function retryMiddleware()
                 $log_message = 'Connection Error: ' . $exception->getMessage();
             }
 
-            if ($response) {
-                $contents = $response->getBody()->getContents();
-                $contents = json_decode($contents, true);
-                if ($response->getStatusCode() !== 200 && $contents !== null) {
-                    $code = (int) Arr::first(Arr::pluck(Arr::get($contents, 'messages'), 'code'));
-                    if ($code === 952 && $retries <= 1) {
-                        $refresh = true;
-                        $should_retry = true;
-                    }
-                }
-            }
-
             if ($log_message) {
                 error_log($log_message, 0);
             }
 
-            if ($refresh) {
-                error_log('Refreshing Access Token…');
-                $this->login();
-            }
-
             if ($should_retry) {
                 if ($retries > 0) {
                     error_log('Retry ' . $retries . '…', 0);