Tenant unaware feature and overall "features" feature improvements

assets/config.php

@@ -283,7 +283,7 @@
         // 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
+        Stancl\Tenancy\Features\CrossDomainRedirect::class, // https://tenancyforlaravel.com/docs/v3/features/cross-domain-redirect
     ],
 
     /**

src/Contracts/Feature.php

@@ -4,10 +4,10 @@
 
 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;
+
+    public static function alwaysBootstrap(): bool;
 }

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 */
@@ -28,4 +27,9 @@ public function bootstrap(Tenancy $tenancy): void
             return $this;
         });
     }
+
+    public static function alwaysBootstrap(): bool
+    {
+        return true;
+    }
 }

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;
@@ -33,4 +32,9 @@ public function bootstrap(Tenancy $tenancy): void
             return $tags;
         });
     }
+
+    public static function alwaysBootstrap(): bool
+    {
+        return false;
+    }
 }

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 */
@@ -70,4 +69,9 @@ public function unsetTenantConfig(): void
             $this->config->set($key, $value);
         }
     }
+
+    public static function alwaysBootstrap(): bool
+    {
+        return false;
+    }
 }

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;
@@ -61,4 +60,9 @@ public static function routeHasMiddleware(Route $route, string $middleware): boo
 
         return false;
     }
+
+    public static function alwaysBootstrap(): bool
+    {
+        return false;
+    }
 }

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,
@@ -50,4 +50,9 @@ public static function makeResponse(string|ImpersonationToken $token, int $ttl =
 
         return redirect($token->redirect_url);
     }
+
+    public static function alwaysBootstrap(): bool
+    {
+        return false;
+    }
 }

src/TenancyServiceProvider.php

@@ -27,15 +27,20 @@ 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);
+                if (! $feature::alwaysBootstrap()) { // avoid bootstrapping already bootstrapped features
+                    $this->app[$feature]->bootstrap();
+                }
             }
-
-            return $tenancy;
         });
 
+        foreach ($this->app['config']['tenancy.features'] ?? [] as $feature) {
+            if ($feature::alwaysBootstrap()) {
+                $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

@@ -3,13 +3,10 @@
 declare(strict_types=1);
 
 use Illuminate\Support\Facades\Route;
-use Stancl\Tenancy\Features\CrossDomainRedirect;
 use Stancl\Tenancy\Tests\Etc\Tenant;
 
 test('tenant redirect macro replaces only the hostname', function () {
-    config([
-        'tenancy.features' => [CrossDomainRedirect::class],
-    ]);
+    // `CrossDomainRedirect` feature already enabled in config
 
     Route::get('/foobar', function () {
         return 'Foo';

tests/Pest.php

@@ -2,9 +2,16 @@
 
 use Stancl\Tenancy\Tests\TestCase;
 
-uses(TestCase::class)->in(__DIR__);
+uses(TestCase::class)->in(...filesAndFoldersExcluding(['WithoutTenancy']));
 
-function pest(): TestCase
+function pest(): \Orchestra\Testbench\TestCase
 {
     return Pest\TestSuite::getInstance()->test;
 }
+
+function filesAndFoldersExcluding(array $exclude = []): array
+{
+    $dirs = scandir(__DIR__);
+
+    return array_filter($dirs, fn($dir) => ! in_array($dir, array_merge(['.', '..'], $exclude) , true));
+}

tests/WithoutTenancy/Features/RedirectTest.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Support\Facades\Route;
+use Stancl\Tenancy\Features\CrossDomainRedirect;
+use Stancl\Tenancy\TenancyServiceProvider;
+use Stancl\Tenancy\Tests\WithoutTenancy\TestCase;
+
+uses(TestCase::class);
+
+// Check that `domain()` can be called on a redirect before tenancy is used (regression test for #949)
+test('redirect from central to tenant works', function (bool $enabled, bool $shouldThrow) {
+    if ($enabled) {
+        config()->set('tenancy.features', [CrossDomainRedirect::class]);
+    }
+
+    $this->app->register(new TenancyServiceProvider($this->app));
+
+    Route::get('/foobar', function () {
+        return 'Foo';
+    })->name('home');
+
+    Route::get('/redirect', function () {
+        return redirect()->route('home')->domain('abcd');
+    });
+
+    try {
+        pest()->get('/redirect')
+            ->assertRedirect('http://abcd/foobar');
+
+        if ($shouldThrow) {
+            pest()->fail('Exception not thrown');
+        }
+    } catch (Throwable $e) {
+        if ($shouldThrow) {
+            pest()->assertTrue(true); // empty assertion to make the test pass
+        } else {
+            pest()->fail('Exception thrown: ' . $e->getMessage());
+        }
+    }
+
+})->with([
+    ['enabled' => false, 'shouldThrow' => true],
+    ['enabled' => true, 'shouldThrow' => false],
+]);

tests/WithoutTenancy/TestCase.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Tests\WithoutTenancy;
+
+abstract class TestCase extends \Stancl\Tenancy\Tests\TestCase
+{
+    protected function getPackageProviders($app)
+    {
+        return []; // We will provide TenancyServiceProvider in tests
+    }
+}