fixes

Author: arrilot

README.md

@@ -1,4 +1,4 @@
-# Laravel Inititator Propagation
+# Laravel Initial Evenet Propagation
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/ensi/laravel-initial-event-propagation.svg?style=flat-square)](https://packagist.org/packages/ensi/laravel-initial-event-propagation)
 [![Tests](https://github.com/ensi-platform/laravel-initial-event-propagation/actions/workflows/run-tests.yml/badge.svg?branch=master)](https://github.com/ensi-platform/laravel-initial-event-propagation/actions/workflows/run-tests.yml)
@@ -47,10 +47,10 @@ In practice it likely means that you have to place the middleare at the very bot
 #### Parsing incoming initial event
 
 Add `Ensi\LaravelInitialEventPropagation\ParseInitialEventHeaderMiddleware` to `app/Http/Kernel` middleware property.
-This middleware parses `X-InitialEvent` HTTP header, deserializes it into `InitialEventDTO` object and places it to the `InitialEventHolder` singleton.
+This middleware parses `X-Initial-Event` HTTP header, deserializes it into `InitialEventDTO` object and places it to the `InitialEventHolder` singleton.
 
 #### Propagating initial event to outcomming HTTP request
-The package provides a `Ensi\LaravelInitialEventPropagation\PropagateInitialEventLaravelGuzzleMiddleware` Guzzle Middleware that converts ` resolve(InitialEventHolder::class)->getInitialEvent()` back to `X-Inititator` header and sets this header for all outcomming guzzle request.
+The package provides a `Ensi\LaravelInitialEventPropagation\PropagateInitialEventLaravelGuzzleMiddleware` Guzzle Middleware that converts ` resolve(InitialEventHolder::class)->getInitialEvent()` back to `X-Initial-Event` header and sets this header for all outcomming guzzle request.
 
 You can add it to your guzzle stack like this:
 

config/initiatial-event-propagation.php renamed to config/initial-event-propagation.php

@@ -12,10 +12,10 @@ class PropagateInitialEventLaravelGuzzleMiddleware
     public function __invoke(callable $handler): callable
     {
         return function (RequestInterface $request, $options) use ($handler) {
-            $inititiator = Container::getInstance()->make(InitialEventHolder::class)->getInitialEvent();
+            $initialEvent = Container::getInstance()->make(InitialEventHolder::class)->getInitialEvent();
 
             return $handler(
-                $inititiator ? $request->withHeader(Config::REQUEST_HEADER, $inititiator->serialize()) : $request,
+                $initialEvent ? $request->withHeader(Config::REQUEST_HEADER, $initialEvent->serialize()) : $request,
                 $options
             );
         };

src/PropagateInitialEventLaravelGuzzleMiddleware.php

@@ -14,18 +14,18 @@ public function handle(Request $request, Closure $next): mixed
     {
         $user = $request->user();
         $config = config('initial-event-propagation', []);
-        $mc = config('initial-event-propagation.set_initiator_http_middleware', []);
+        $mc = config('initial-event-propagation.set_initial_event_http_middleware', []);
 
-        $initiator = InitialEventDTO::fromScratch(
+        $initialEvent = InitialEventDTO::fromScratch(
             userId: $user ? $user->getId() : "",
-            userType: $user ? config('initial-event-propagation.set_initiator_http_middleware.default_user_type', '') : "",
+            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),
             correlationId: !empty($mc['correlation_id_header']) ? $request->header($mc['correlation_id_header']) : '',
             timestamp: !empty($mc['timestamp_header']) ? $request->header($mc['timestamp_header']) : ''
         );
 
-        Container::getInstance()->make(InitialEventHolder::class)->setInitialEvent($initiator);
+        Container::getInstance()->make(InitialEventHolder::class)->setInitialEvent($initialEvent);
 
         return $next($request);
     }