archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 12:54:05 +00:00
Code Activity

Fix origin id w/ empty header & using full-hostname subdomain records

Browse source 
This makes it possible to have Domain records in both `foo` and
`foo.{centralDomain}` format when using the combined domain/subdomain
identification middleware, or the origin header id mw which extends it.

This commit also refactors some related logic.
This commit is contained in:
Samuel Štancl 2024-11-09 20:48:45 +01:00
parent c199a6e0c8
commit 56dd4117ab
7 changed files with 131 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

62
tests/CombinedDomainAndSubdomainIdentificationTest.php
View file

@ -6,62 +6,56 @@ use Illuminate\Support\Facades\Route;
use Stancl\Tenancy\Database\Concerns\HasDomains;
use Stancl\Tenancy\Middleware\InitializeTenancyByDomainOrSubdomain;
use Stancl\Tenancy\Database\Models;
use Stancl\Tenancy\Tests\Etc\Tenant;
beforeEach(function () {
Route::group([
'middleware' => InitializeTenancyByDomainOrSubdomain::class,
], function () {
Route::get('/foo/{a}/{b}', function ($a, $b) {
return "$a + $b";
Route::get('/test', function () {
return tenant('id');
});
});
config(['tenancy.models.tenant' => CombinedTenant::class]);
});
test('tenant can be identified by subdomain', function () {
config(['tenancy.identification.central_domains' => ['localhost']]);
$tenant = CombinedTenant::create([
'id' => 'acme',
]);
$tenant->domains()->create([
'domain' => 'foo',
]);
$tenant = Tenant::create(['id' => 'acme']);
$tenant->domains()->create(['domain' => 'foo']);
expect(tenancy()->initialized)->toBeFalse();
pest()
->get('http://foo.localhost/foo/abc/xyz')
->assertSee('abc + xyz');
expect(tenancy()->initialized)->toBeTrue();
expect(tenant('id'))->toBe('acme');
pest()->get('http://foo.localhost/test')->assertSee('acme');
});
test('tenant can be identified by domain', function () {
config(['tenancy.identification.central_domains' => []]);
$tenant = CombinedTenant::create([
'id' => 'acme',
]);
$tenant->domains()->create([
'domain' => 'foobar.localhost',
]);
$tenant = Tenant::create(['id' => 'acme']);
$tenant->domains()->create(['domain' => 'foobar.localhost']);
expect(tenancy()->initialized)->toBeFalse();
pest()
->get('http://foobar.localhost/foo/abc/xyz')
->assertSee('abc + xyz');
expect(tenancy()->initialized)->toBeTrue();
expect(tenant('id'))->toBe('acme');
pest()->get('http://foobar.localhost/test')->assertSee('acme');
});
class CombinedTenant extends Models\Tenant
{
use HasDomains;
}
test('domain records can be either in domain syntax or subdomain syntax', function () {
config(['tenancy.identification.central_domains' => ['localhost']]);
$foo = Tenant::create(['id' => 'foo']);
$foo->domains()->create(['domain' => 'foo']);
$bar = Tenant::create(['id' => 'bar']);
$bar->domains()->create(['domain' => 'bar.localhost']);
expect(tenancy()->initialized)->toBeFalse();
// Subdomain format
pest()->get('http://foo.localhost/test')->assertSee('foo');
tenancy()->end();
// Domain format
pest()->get('http://bar.localhost/test')->assertSee('bar');
});