From 0bf7c10f0e58aa4cfb835f7fb8312dd9a3649a15 Mon Sep 17 00:00:00 2001 From: lukinovec Date: Thu, 7 Aug 2025 13:07:17 +0200 Subject: [PATCH] Make TenancyUrlGenerator inherit the original UrlGenerator's scheme --- src/Bootstrappers/UrlGeneratorBootstrapper.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Bootstrappers/UrlGeneratorBootstrapper.php b/src/Bootstrappers/UrlGeneratorBootstrapper.php index 6c923d21..55d445c2 100644 --- a/src/Bootstrappers/UrlGeneratorBootstrapper.php +++ b/src/Bootstrappers/UrlGeneratorBootstrapper.php @@ -11,6 +11,7 @@ use Stancl\Tenancy\Contracts\TenancyBootstrapper; use Stancl\Tenancy\Contracts\Tenant; use Stancl\Tenancy\Overrides\TenancyUrlGenerator; use Stancl\Tenancy\Resolvers\PathTenantResolver; +use Illuminate\Support\Str; /** * Makes the app use TenancyUrlGenerator (instead of Illuminate\Routing\UrlGenerator) which: @@ -78,6 +79,10 @@ class UrlGeneratorBootstrapper implements TenancyBootstrapper } } + // Inherit scheme (http/https) from the original generator + $originalScheme = Str::before($this->originalUrlGenerator->formatScheme(), '://'); + $newGenerator->forceScheme($originalScheme); + $newGenerator->defaults($defaultParameters); $newGenerator->setSessionResolver(function () {