From 59d2c6d98d934ab0be36a8b94952eb9e30d1cd8e Mon Sep 17 00:00:00 2001 From: kostamilorava Date: Thu, 11 Dec 2025 19:20:16 +0400 Subject: [PATCH] fix incorrect subdomain identification --- src/Resolvers/DomainTenantResolver.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Resolvers/DomainTenantResolver.php b/src/Resolvers/DomainTenantResolver.php index 9535cdf2..440062da 100644 --- a/src/Resolvers/DomainTenantResolver.php +++ b/src/Resolvers/DomainTenantResolver.php @@ -56,9 +56,19 @@ class DomainTenantResolver extends Contracts\CachedTenantResolver return $tenant; } - public static function isSubdomain(string $domain): bool + protected function isSubdomain(string $hostname): bool { - return Str::endsWith($domain, config('tenancy.identification.central_domains')); + foreach (config('tenancy.central_domains') as $domain) { + if ($hostname === $domain) { + return false; + } + + if (Str::endsWith($hostname, '.' . $domain)) { + return true; + } + } + + return false; } public function resolved(Tenant $tenant, mixed ...$args): void