changed to no longer use cache, and to disconnect after every request

Author: Smef

src/Middleware/EndSession.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace GearboxSolutions\EloquentFileMaker\Middleware;
+
+use Closure;
+use GearboxSolutions\EloquentFileMaker\Support\Facades\FM;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class EndSession
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+
+        return $next($request);
+    }
+
+    /**
+     * Handle tasks after the response has been sent to the browser.
+     */
+    public function terminate(Request $request, Response $response): void
+    {
+        // disconnect the FileMaker session
+        FM::disconnect();
+    }
+}

src/Providers/FileMakerConnectionServiceProvider.php

@@ -2,7 +2,9 @@
 
 namespace GearboxSolutions\EloquentFileMaker\Providers;
 
+use GearboxSolutions\EloquentFileMaker\Middleware\EndSession;
 use GearboxSolutions\EloquentFileMaker\Services\FileMakerConnection;
+use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\ServiceProvider;
 
 class FileMakerConnectionServiceProvider extends ServiceProvider
@@ -33,15 +35,19 @@ public function register()
         $this->app->bind(FileMakerConnection::class, function ($app) {
             return $app['fm.connection'];
         });
+
+        app('router')->aliasMiddleware('fm.end-session', EndSession::class);
+
     }
 
     /**
      * Bootstrap services.
      *
      * @return void
      */
-    public function boot()
+    public function boot(Kernel $kernel)
     {
-        //
+        // add the middleware to the global middleware so that we always end the FileMaker session
+        $kernel->pushMiddleware(EndSession::class);
     }
 }

src/Services/FileMakerConnection.php

@@ -32,7 +32,7 @@ class FileMakerConnection extends Connection
 
     protected $password;
 
-    protected $sessionToken;
+    protected static $sessionToken;
 
     protected $retries = 1;
 
@@ -63,15 +63,8 @@ public function getLayout()
 
     public function login()
     {
-        // Cache a session token so we can reuse the same thing for 14.75 minutes
-        // FileMaker data API sessions expire after 15 minutes
-        // 14.75 * 60 = 885 seconds
-        $token = Cache::remember($this->getSessionTokenCacheKey(), 885, function () {
-            return $this->fetchNewSessionToken();
-        });
-
         // Store the session token
-        $this->sessionToken = $token;
+        self::$sessionToken = $this->fetchNewSessionToken();
     }
 
     /**
@@ -594,11 +587,6 @@ public function performScript(FMBaseBuilder $query)
         return $this->executeScript($query);
     }
 
-    protected function getSessionTokenCacheKey()
-    {
-        return 'filemaker-session-' . $this->getName();
-    }
-
     /**
      * Log out of the database, invalidating our session token
      *
@@ -608,9 +596,15 @@ protected function getSessionTokenCacheKey()
      */
     public function disconnect()
     {
-        $url = $this->getDatabaseUrl() . '/sessions/' . $this->sessionToken;
+        if (! self::$sessionToken) {
+            return;
+        }
 
-        $response = $this->makeRequest('delete', $url);
+        $url = $this->getDatabaseUrl() . '/sessions/' . self::$sessionToken;
+
+        // make an http delete request to the data api to end the session
+        $response = Http::delete($url);
+        $this->checkResponseForErrors($response);
 
         $this->forgetSessionToken();
 
@@ -622,7 +616,7 @@ public function disconnect()
      */
     public function forgetSessionToken()
     {
-        Cache::forget($this->getSessionTokenCacheKey());
+        self::$sessionToken = null;
     }
 
     public function layout($layoutName)
@@ -647,9 +641,9 @@ public function setGlobalFields(array $globalFields)
     protected function prepareRequestForSending($request)
     {
         if ($request instanceof PendingRequest) {
-            $request->withToken($this->sessionToken);
+            $request->withToken(self::$sessionToken);
         } else {
-            $request = Http::withToken($this->sessionToken);
+            $request = Http::withToken(self::$sessionToken);
         }
 
         $request->withMiddleware($this->retryMiddleware());