archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-05-06 18:04:03 +00:00
Code Activity

Make central domain order not matter in isSubdomain()

Browse source
This commit is contained in:
lukinovec 2026-04-13 17:59:57 +02:00
parent 3976880dcb
commit f4ee0a7943
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Resolvers/DomainTenantResolver.php
View file

@ -61,11 +61,11 @@ class DomainTenantResolver extends Contracts\CachedTenantResolver
{ {
$centralDomains = Arr::wrap(config('tenancy.identification.central_domains')); $centralDomains = Arr::wrap(config('tenancy.identification.central_domains'));
foreach ($centralDomains as $centralDomain) { if (in_array($domain, $centralDomains, true)) {
if ($domain === $centralDomain) {
return false; return false;
} }
foreach ($centralDomains as $centralDomain) {
if (Str::endsWith($domain, '.' . $centralDomain)) { if (Str::endsWith($domain, '.' . $centralDomain)) {
return true; return true;
} }

7
tests/SubdomainTest.php
View file

@ -110,10 +110,11 @@ test('we cant use a subdomain that doesnt belong to our central domains', functi
}); });
test('domain resolver correctly determines if string is a subdomain', function() { test('domain resolver correctly determines if string is a subdomain', function() {
config(['tenancy.identification.central_domains' => ['app.test']]); config(['tenancy.identification.central_domains' => ['site.com', 'blog.site.com']]);
expect(DomainTenantResolver::isSubdomain('foo.app.test'))->toBeTrue(); expect(DomainTenantResolver::isSubdomain('blog.site.com'))->toBeFalse();
expect(DomainTenantResolver::isSubdomain('fooapp.test'))->toBeFalse(); expect(DomainTenantResolver::isSubdomain('tenant.site.com'))->toBeTrue();
expect(DomainTenantResolver::isSubdomain('tenantsite.com'))->toBeFalse();
}); });
class SubdomainTenant extends Models\Tenant class SubdomainTenant extends Models\Tenant