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

Improve TenancyUrlGenerator and RootUrlBootstrapperTest clarity

Browse source
This commit is contained in:
lukinovec 2024-12-23 15:08:41 +01:00
parent 5c8933bd14
commit 81917b86fb
2 changed files with 48 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/Overrides/TenancyUrlGenerator.php
View file

@ -62,18 +62,31 @@ class TenancyUrlGenerator extends UrlGenerator
$url = parent::route($name, $parameters, $absolute);
if (isset($parameters[PathTenantResolver::tenantParameterName()])) {
// Ensure the tenant key is present in the URL just once
// This is necessary when using UrlGeneratorBootstrapper with RootUrlBootstrapper
$tenantId = $parameters[PathTenantResolver::tenantParameterName()];
$afterTenant = str($url)->afterLast($tenantId)->toString();
$beforeTenant = str($url)->before($tenantId)->toString();
/**
* 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()];
if (! $absolute && str(url('/'))->contains($tenantId)) {
// If the URL should be relative and the tenant key is already present in the full URL, don't add it again
return $afterTenant;
// 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;
}
return $beforeTenant . $tenantId . $afterTenant;
// Reconstruct the URL with the tenant key appearing exactly once
return $urlBeforeTenantKey . $tenantKey . $urlAfterTenantKey;
}
return $url;