#106342 (#4)

* #106342

---------

Co-authored-by: Ms_Natali <golubkova@greensight.ru>

Author: MsNatali

.github/workflows/run-tests.yml

@@ -13,12 +13,12 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.0, 8.1]
+        php: [8.1]
         laravel: [8.*, 9.*]
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: 8.*
-            testbench: ^6.6
+            testbench: ^6.23
           - laravel: 9.*
             testbench: ^7.0
 

composer.json

@@ -25,8 +25,8 @@
     }
   },
   "require-dev": {
-    "orchestra/testbench": "^6.15 || ^7.0",
-    "pestphp/pest": "^1.18",
+    "orchestra/testbench": "^6.23 || ^7.0",
+    "pestphp/pest": "^1.22",
     "pestphp/pest-plugin-laravel": "^1.1",
     "spatie/laravel-ray": "^1.23",
     "friendsofphp/php-cs-fixer": "^3.2",

config/initial-event-propagation.php

@@ -5,6 +5,12 @@
     'set_initial_event_http_middleware' => [
         'default_user_type' => '',
 
+        /**
+         * If is set to `false` the middleware does not try to get current user
+         * Defaults to `true`.
+         */
+        'try_auth' => true,
+
         /**
          * If is set to `true` the middleware does not override the InitialEvent if it was already set for current context earlier.
          * Defaults to `false`.

src/SetInitialEventHttpMiddleware.php

@@ -12,18 +12,23 @@ class SetInitialEventHttpMiddleware
 {
     public function handle(Request $request, Closure $next): mixed
     {
-        $user = $request->user();
         $config = config('initial-event-propagation', []);
         $mc = config('initial-event-propagation.set_initial_event_http_middleware', []);
         $holder =  Container::getInstance()->make(InitialEventHolder::class);
         $existingEvent = $holder->getInitialEvent();
 
         if (!$existingEvent || empty($mc['preserve_existing_event'])) {
+
+            $user = null;
+            if ($mc['try_auth'] ?? true) {
+                $user = $request->user();
+            }
+
             $initialEvent = InitialEventDTO::fromScratch(
-                userId: $user ? $user->getAuthIdentifier() : "",
-                userType: $user ? $mc['default_user_type'] : "",
                 app: !empty($mc['app_code_header']) ? $request->header($mc['app_code_header'], '') : ($config['app_code'] ?? ''),
                 entrypoint: $this->extractEntrypoint($request),
+                userId: $user ? $user->getAuthIdentifier() : "",
+                userType: $user ? $mc['default_user_type'] : "",
                 correlationId: !empty($mc['correlation_id_header']) ? $request->header($mc['correlation_id_header'], '') : '',
                 timestamp: !empty($mc['timestamp_header']) ? $request->header($mc['timestamp_header'], '') : ''
             );