archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 10:14:04 +00:00
Code Activity

Revert attempt to maintain compatibility between the two bootstrappers

Browse source
This commit is contained in:
lukinovec 2024-12-27 08:54:14 +01:00
parent 2da2ffbc2b
commit c6a524f171
1 changed files with 1 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/Overrides/TenancyUrlGenerator.php
View file

@ -59,37 +59,7 @@ class TenancyUrlGenerator extends UrlGenerator
[$name, $parameters] = $this->prepareRouteInputs($name, Arr::wrap($parameters)); // @phpstan-ignore argument.type
$url = parent::route($name, $parameters, $absolute);
if (isset($parameters[PathTenantResolver::tenantParameterName()])) {
/**
* Ensure the tenant key appears in the final URL only once.
* This adjustment is necessary when RootUrlBootstrapper is enabled (and used as intended).
*
* When RootUrlBootstrapper adds the tenant key to the root URL:
* - The root URL includes the tenant key (http://localhost/tenantfoo).
* - Passing the tenant key as a parameter to `parent::route()` adds it again, causing duplication.
*
* To fix this:
* - For relative URLs: Include only the part AFTER the tenant key.
* - For absolute URLs: Rebuild the URL so that the tenant key is included exactly once.
*/
$tenantKey = $parameters[PathTenantResolver::tenantParameterName()];
// Separate the URL into parts before the first and after the last tenant key
$urlBeforeTenantKey = str($url)->before($tenantKey)->toString(); // e.g. "http://localhost/"
$urlAfterTenantKey = str($url)->afterLast($tenantKey)->toString(); // e.g. "/home"
if (! $absolute && str(url('/'))->contains($tenantKey)) {
// For relative URLs, return only the part after the tenant key
return $urlAfterTenantKey;
}
// Reconstruct the URL with the tenant key appearing exactly once
return $urlBeforeTenantKey . $tenantKey . $urlAfterTenantKey;
}
return $url;
return parent::route($name, $parameters, $absolute);
}
/**