diff --git a/assets/config.php b/assets/config.php index 27c8aad6..c08fa0a6 100644 --- a/assets/config.php +++ b/assets/config.php @@ -100,5 +100,7 @@ return [ 'queue_database_deletion' => false, 'delete_database_after_tenant_deletion' => false, // delete the tenant's database after deleting the tenant 'unique_id_generator' => Stancl\Tenancy\UniqueIDGenerators\UUIDGenerator::class, - 'push_initialization_middleware_to_global_stack' => true, + 'global_middleware' => [ + Stancl\Tenancy\Middleware\InitializeTenancy::class, + ], ]; diff --git a/src/TenancyServiceProvider.php b/src/TenancyServiceProvider.php index e7c3e940..604d8a09 100644 --- a/src/TenancyServiceProvider.php +++ b/src/TenancyServiceProvider.php @@ -78,8 +78,8 @@ class TenancyServiceProvider extends ServiceProvider __DIR__ . '/../assets/migrations/' => database_path('migrations'), ], 'migrations'); - if ($this->app['config']['tenancy.push_initialization_middleware_to_global_stack'] ?? true) { - $this->app->make(Kernel::class)->prependMiddleware(Middleware\InitializeTenancy::class); + foreach ($this->app['config']['tenancy.global_middleware'] as $middleware) { + $this->app->make(Kernel::class)->prependMiddleware($middleware); } /*