Merge pull request #67 from grantholle/type-issue

Move logic to before determining user agent
andreaselia · Jul 30, 2024 · 70633b3 · 70633b3
2 parents 4983cc5 + 4f50ef4
commit 70633b3
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/Http/Middleware/Analytics.php b/src/Http/Middleware/Analytics.php
@@ -28,6 +28,16 @@ public function handle(Request $request, Closure $next)
             return $response;
         }
 
+        foreach (config('analytics.exclude', []) as $except) {
+            if ($except !== '/') {
+                $except = trim($except, '/');
+            }
+
+            if ($request->fullUrlIs($except) || $request->is($except)) {
+                return $response;
+            }
+        }
+
         $agent = new Agent();
         if ($userAgent = $request->headers->get('user-agent')) {
             $agent->setUserAgent($userAgent);
@@ -49,16 +59,6 @@ public function handle(Request $request, Closure $next)
             }
         }
 
-        foreach (config('analytics.exclude', []) as $except) {
-            if ($except !== '/') {
-                $except = trim($except, '/');
-            }
-
-            if ($request->fullUrlIs($except) || $request->is($except)) {
-                return $response;
-            }
-        }
-
         $attributes = [
             'session' => $this->getSessionProvider()->get($request),
             'uri' => $uri,