feat: separate tenant domain and base path, update related models, requests, and tests
This commit is contained in:
@@ -42,13 +42,7 @@ class TenantDomainNormalizer
|
||||
return null;
|
||||
}
|
||||
|
||||
if ($path === null && is_string($domain)) {
|
||||
$decodedDomain = trim(urldecode($domain));
|
||||
$candidate = str_contains($decodedDomain, '://')
|
||||
? $decodedDomain
|
||||
: "//{$decodedDomain}";
|
||||
$path = parse_url($candidate, PHP_URL_PATH) ?: '/';
|
||||
}
|
||||
$path ??= self::pathFromDomain($domain);
|
||||
|
||||
$normalizedPath = self::normalizePath($path);
|
||||
|
||||
@@ -59,6 +53,25 @@ class TenantDomainNormalizer
|
||||
return $host.($normalizedPath === '/' ? '' : $normalizedPath);
|
||||
}
|
||||
|
||||
public static function pathFromDomain(mixed $domain): ?string
|
||||
{
|
||||
if (! is_string($domain)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$decodedDomain = trim(urldecode($domain));
|
||||
|
||||
if ($decodedDomain === '') {
|
||||
return null;
|
||||
}
|
||||
|
||||
$candidate = str_contains($decodedDomain, '://')
|
||||
? $decodedDomain
|
||||
: "//{$decodedDomain}";
|
||||
|
||||
return self::normalizePath(parse_url($candidate, PHP_URL_PATH) ?: '/');
|
||||
}
|
||||
|
||||
public static function normalizePath(mixed $path): ?string
|
||||
{
|
||||
if (! is_string($path)) {
|
||||
@@ -98,9 +111,23 @@ class TenantDomainNormalizer
|
||||
public static function tenantKeyCandidates(mixed $domain, mixed $path): array
|
||||
{
|
||||
$host = self::normalize($domain);
|
||||
|
||||
if ($host === null) {
|
||||
return [];
|
||||
}
|
||||
|
||||
return array_map(
|
||||
static fn (string $basePath): string => $host.($basePath === '/' ? '' : $basePath),
|
||||
self::basePathCandidates($path),
|
||||
);
|
||||
}
|
||||
|
||||
/** @return list<string> */
|
||||
public static function basePathCandidates(mixed $path): array
|
||||
{
|
||||
$normalizedPath = self::normalizePath($path);
|
||||
|
||||
if ($host === null || $normalizedPath === null) {
|
||||
if ($normalizedPath === null) {
|
||||
return [];
|
||||
}
|
||||
|
||||
@@ -111,11 +138,11 @@ class TenantDomainNormalizer
|
||||
$candidates = [];
|
||||
|
||||
while ($segments !== []) {
|
||||
$candidates[] = $host.'/'.implode('/', $segments);
|
||||
$candidates[] = '/'.implode('/', $segments);
|
||||
array_pop($segments);
|
||||
}
|
||||
|
||||
$candidates[] = $host;
|
||||
$candidates[] = '/';
|
||||
|
||||
return $candidates;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user