Tenant unaware feature and overall "features" feature improvements

assets/config.php

@@ -283,7 +283,10 @@
         // Stancl\Tenancy\Features\TelescopeTags::class,
         // Stancl\Tenancy\Features\UniversalRoutes::class,
         // Stancl\Tenancy\Features\TenantConfig::class, // https://tenancyforlaravel.com/docs/v3/features/tenant-config
-        // Stancl\Tenancy\Features\CrossDomainRedirect::class, // https://tenancyforlaravel.com/docs/v3/features/cross-domain-redirect
+    ],
+
+    'tenant_unaware_features' => [
+        Stancl\Tenancy\Features\CrossDomainRedirect::class, // https://tenancyforlaravel.com/docs/v3/features/cross-domain-redirect
     ],
 
     /**

src/Contracts/Feature.php

@@ -4,10 +4,8 @@
 
 namespace Stancl\Tenancy\Contracts;
 
-use Stancl\Tenancy\Tenancy;
-
 /** Additional features, like Telescope tags and tenant redirects. */
 interface Feature
 {
-    public function bootstrap(Tenancy $tenancy): void;
+    public function bootstrap(): void;
 }

src/Features/CrossDomainRedirect.php

@@ -6,11 +6,10 @@
 
 use Illuminate\Http\RedirectResponse;
 use Stancl\Tenancy\Contracts\Feature;
-use Stancl\Tenancy\Tenancy;
 
 class CrossDomainRedirect implements Feature
 {
-    public function bootstrap(Tenancy $tenancy): void
+    public function bootstrap(): void
     {
         RedirectResponse::macro('domain', function (string $domain) {
             /** @var RedirectResponse $this */

src/Features/TelescopeTags.php

@@ -7,11 +7,10 @@
 use Laravel\Telescope\IncomingEntry;
 use Laravel\Telescope\Telescope;
 use Stancl\Tenancy\Contracts\Feature;
-use Stancl\Tenancy\Tenancy;
 
 class TelescopeTags implements Feature
 {
-    public function bootstrap(Tenancy $tenancy): void
+    public function bootstrap(): void
     {
         if (! class_exists(Telescope::class)) {
             return;

src/Features/TenantConfig.php

@@ -12,7 +12,6 @@
 use Stancl\Tenancy\Contracts\Tenant;
 use Stancl\Tenancy\Events\RevertedToCentralContext;
 use Stancl\Tenancy\Events\TenancyBootstrapped;
-use Stancl\Tenancy\Tenancy;
 
 class TenantConfig implements Feature
 {
@@ -28,7 +27,7 @@ public function __construct(
     ) {
     }
 
-    public function bootstrap(Tenancy $tenancy): void
+    public function bootstrap(): void
     {
         Event::listen(TenancyBootstrapped::class, function (TenancyBootstrapped $event) {
             /** @var Tenant $tenant */

src/Features/UniversalRoutes.php

@@ -9,7 +9,6 @@
 use Illuminate\Support\Facades\Route as Router;
 use Stancl\Tenancy\Contracts\Feature;
 use Stancl\Tenancy\Middleware;
-use Stancl\Tenancy\Tenancy;
 
 class UniversalRoutes implements Feature
 {
@@ -22,7 +21,7 @@ class UniversalRoutes implements Feature
         Middleware\InitializeTenancyBySubdomain::class,
     ];
 
-    public function bootstrap(Tenancy $tenancy): void
+    public function bootstrap(): void
     {
         foreach (static::$identificationMiddlewares as $middleware) {
             $originalOnFail = $middleware::$onFail;

src/Features/UserImpersonation.php

@@ -16,9 +16,9 @@ class UserImpersonation implements Feature
     /** The lifespan of impersonation tokens (in seconds). */
     public static int $ttl = 60;
 
-    public function bootstrap(Tenancy $tenancy): void
+    public function bootstrap(): void
     {
-        $tenancy->macro('impersonate', function (Tenant $tenant, string $userId, string $redirectUrl, string $authGuard = null): ImpersonationToken {
+        Tenancy::macro('impersonate', function (Tenant $tenant, string $userId, string $redirectUrl, string $authGuard = null): ImpersonationToken {
             return ImpersonationToken::create([
                 Tenancy::tenantKeyColumn() => $tenant->getTenantKey(),
                 'user_id' => $userId,

src/TenancyServiceProvider.php

@@ -27,15 +27,16 @@ public function register(): void
         // Make sure Tenancy is stateful.
         $this->app->singleton(Tenancy::class);
 
-        // Make sure features are bootstrapped as soon as Tenancy is instantiated.
-        $this->app->extend(Tenancy::class, function (Tenancy $tenancy) {
+        $this->app->resolving(Tenancy::class, function (Tenancy $tenancy, $app) {
             foreach ($this->app['config']['tenancy.features'] ?? [] as $feature) {
-                $this->app[$feature]->bootstrap($tenancy);
+                $this->app[$feature]->bootstrap();
             }
-
-            return $tenancy;
         });
 
+        foreach ($this->app['config']['tenancy.tenant_unaware_features'] ?? [] as $feature) {
+            $this->app[$feature]->bootstrap();
+        }
+
         // Make it possible to inject the current tenant by typehinting the Tenant contract.
         $this->app->bind(Tenant::class, function ($app) {
             return $app[Tenancy::class]->tenant;

tests/Features/RedirectTest.php

@@ -8,7 +8,7 @@
 
 test('tenant redirect macro replaces only the hostname', function () {
     config([
-        'tenancy.features' => [CrossDomainRedirect::class],
+        'tenancy.tenant_unaware_features' => [CrossDomainRedirect::class],
     ]);
 
     Route::get('/foobar', function () {
@@ -34,3 +34,20 @@
     expect(tenant_route('foo.localhost', 'foo', ['a' => 'as', 'b' => 'df']))->toBe('http://foo.localhost/abcdef/as/df');
     expect(tenant_route('foo.localhost', 'foo', []))->toBe('http://foo.localhost/abcdef');
 });
+
+test('redirect from central to tenant works fine', function () {
+    config([
+        'tenancy.tenant_unaware_features' => [CrossDomainRedirect::class],
+    ]);
+
+    Route::get('/foobar', function () {
+        return 'Foo';
+    })->name('home');
+
+    Route::get('/redirect', function () {
+        return redirect()->route('home')->domain('abcd');
+    });
+
+    pest()->get('/redirect')
+        ->assertRedirect('http://abcd/foobar');
+});