Handle api and web middleware differently

GitSahib · Nov 3, 2023 · d5a2885 · d5a2885
1 parent c5fd243
commit d5a2885
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 17 deletions.
diff --git a/src/AppInsightsHelpers.php b/src/AppInsightsHelpers.php
@@ -29,11 +29,6 @@ public function __construct(AppInsightsServer $appInsights)
      */
     public function trackPageViewDuration($request)
     {
-        if($request->expectsJson())
-        {
-            return;
-        }
-
         if (!$this->telemetryEnabled()) 
         {
             return;
@@ -158,11 +153,6 @@ private function getRequestPropertiesFromException(Throwable $e)
      */
     public function flashPageInfo($request)
     {
-        if($request->expectsJson())
-        {
-            return;
-        }
-
         if (!$this->telemetryEnabled())
         {
             return;

diff --git a/src/Middleware/AppInsightsApiMiddleware.php b/src/Middleware/AppInsightsApiMiddleware.php
@@ -0,0 +1,46 @@
+<?php
+namespace Larasahib\AppInsightsLaravel\Middleware;
+
+use Closure;
+use Larasahib\AppInsightsLaravel\AppInsightsHelpers;
+
+class AppInsightsApiMiddleware
+{
+
+    /**
+     * @var AppInsightsHelpers
+     */
+    private AppInsightsHelpers $appInsightsHelpers;
+
+
+    /**
+     * @param AppInsightsHelpers $appInsightssHelpers
+     */
+    public function __construct(AppInsightsHelpers $appInsightsHelpers)
+    {
+        $this->appInsightsHelpers = $appInsightsHelpers;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        return $next($request);
+    }
+
+    /**
+     * @param \Illuminate\Http\Request $request
+     * @param \Illuminate\Http\Response $response
+     * @return void
+     */
+    public function terminate($request, $response)
+    {
+        $this->appInsightsHelpers->trackRequest($request, $response);
+    }
+
+}
diff --git a/src/Middleware/AppInsightsMiddleware.php → src/Middleware/AppInsightsWebMiddleware.php b/src/Middleware/AppInsightsMiddleware.php → src/Middleware/AppInsightsWebMiddleware.php
@@ -4,7 +4,7 @@
 use Closure;
 use Larasahib\AppInsightsLaravel\AppInsightsHelpers;
 
-class AppInsightsMiddleware
+class AppInsightsWebMiddleware
 {
 
     /**
@@ -19,7 +19,7 @@ class AppInsightsMiddleware
     public function __construct(AppInsightsHelpers $appInsightsHelpers)
     {
         $this->appInsightsHelpers = $appInsightsHelpers;
-    }
+    } 
 
     /**
      * Handle an incoming request.

diff --git a/src/Providers/AppInsightsServiceProvider.php b/src/Providers/AppInsightsServiceProvider.php
@@ -5,7 +5,8 @@
 use ApplicationInsights\Telemetry_Client;
 use Illuminate\Support\ServiceProvider as LaravelServiceProvider;
 use Larasahib\AppInsightsLaravel\Queue\AppInsightsTelemeteryQueue;
-use Larasahib\AppInsightsLaravel\Middleware\AppInsightsMiddleware;
+use Larasahib\AppInsightsLaravel\Middleware\AppInsightsWebMiddleware;
+use Larasahib\AppInsightsLaravel\Middleware\AppInsightsApiMiddleware;
 use Larasahib\AppInsightsLaravel\AppInsightsClient;
 use Larasahib\AppInsightsLaravel\AppInsightsHelpers;
 use Larasahib\AppInsightsLaravel\AppInsightsServer;
@@ -40,9 +41,14 @@ public function register()
             return new AppInsightsServer($telemetryClient);
         });
 
-        $this->app->singleton('AppInsightsMiddleware', function ($app) {
+        $this->app->singleton('AppInsightsWebMiddleware', function ($app) {
             $appInsightsHelpers = new AppInsightsHelpers($app['AppInsightsServer']);
-            return new AppInsightsMiddleware($appInsightsHelpers);
+            return new AppInsightsWebMiddleware($appInsightsHelpers);
+        });
+
+        $this->app->singleton('AppInsightsApiMiddleware', function ($app) {
+            $appInsightsHelpers = new AppInsightsHelpers($app['AppInsightsServer']);
+            return new AppInsightsApiMiddleware($appInsightsHelpers);
         });
 
         $this->app->singleton('AppInsightsClient', function ($app) {
@@ -59,8 +65,9 @@ public function provides() {
 
         return [
             'AppInsightsServer',
-            'AppInsightsMiddleware',
-            'AppInsightsClient'
+            'AppInsightsWebMiddleware',
+            'AppInsightsClient',
+            "AppInsightsApiMiddleware"
         ];
     }