Skip to content

Fixed middleware initialization #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrey-helldar merged 1 commit into from
Apr 8, 2026
Merged

Fixed middleware initialization #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions src/LaravelRequestTrackerServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,35 @@
use DragonCode\LaravelRequestTracker\Helpers\TrackerConfig;
use DragonCode\LaravelRequestTracker\Http\Middleware\RequestTrackerMiddleware;
use DragonCode\RequestTracker\TrackerUuid;
use Illuminate\Contracts\Http\Kernel;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\ServiceProvider;
use Psr\Http\Message\RequestInterface;

use function array_keys;

class LaravelRequestTrackerServiceProvider extends ServiceProvider
{
public function boot(): void
public function boot(Kernel $http): void
{
$this->publishes([
__DIR__ . '/../config/request-tracker.php' => $this->app->configPath('request-tracker.php'),
], ['config', 'tracker']);
$this->bootConfig();
$this->registerMiddleware($http);
}

public function register(): void
{
$this->registerConfig();
$this->registerTrackingData();
$this->registerMiddleware();
$this->registerHttpMiddleware();
$this->registerHttpClient();
}

protected function bootConfig(): void
{
if (! $this->app->runningInConsole()) {
return;
}

$this->publishes([
__DIR__ . '/../config/request-tracker.php' => $this->app->configPath('request-tracker.php'),
], ['config', 'tracker']);
}

protected function registerConfig(): void
Expand All @@ -49,16 +57,14 @@ protected function registerTrackingData(): void
$this->app->make(ContextHelper::class)->store($data);
}

protected function registerMiddleware(): void
protected function registerMiddleware(Kernel $http): void
{
$router = $this->app['router'];

foreach (array_keys($router->getMiddlewareGroups()) as $name) {
$router->prependMiddlewareToGroup($name, RequestTrackerMiddleware::class);
if (! $http->hasMiddleware(RequestTrackerMiddleware::class)) {
$http->prependMiddleware(RequestTrackerMiddleware::class);
}
}

protected function registerHttpMiddleware(): void
protected function registerHttpClient(): void
{
Http::globalRequestMiddleware(function (RequestInterface $request) {
$context = $this->app->make(ContextHelper::class);
Expand Down