mirror of
https://github.com/archtechx/tenancy.git
synced 2026-03-22 02:44:04 +00:00
Make URL::temporarySignedRoute() respect the bypass parameter
Also add tests.
This commit is contained in:
parent
37b2a91aa9
commit
68ab6471bc
2 changed files with 47 additions and 1 deletions
|
|
@ -129,7 +129,15 @@ class TenancyUrlGenerator extends UrlGenerator
|
||||||
throw new InvalidArgumentException('Attribute [name] expects a string backed enum.');
|
throw new InvalidArgumentException('Attribute [name] expects a string backed enum.');
|
||||||
}
|
}
|
||||||
|
|
||||||
[$name, $parameters] = $this->prepareRouteInputs($name, Arr::wrap($parameters)); // @phpstan-ignore argument.type
|
$wrappedParameters = Arr::wrap($parameters);
|
||||||
|
|
||||||
|
[$name, $parameters] = $this->prepareRouteInputs($name, $wrappedParameters); // @phpstan-ignore argument.type
|
||||||
|
|
||||||
|
if (isset($wrappedParameters[static::$bypassParameter])) {
|
||||||
|
// If the bypass parameter was passed, we need to add it back to the parameters after prepareRouteInputs() removes it,
|
||||||
|
// so that the underlying route() call in parent::temporarySignedRoute() can bypass the behavior modification as well.
|
||||||
|
$parameters[static::$bypassParameter] = $wrappedParameters[static::$bypassParameter];
|
||||||
|
}
|
||||||
|
|
||||||
return parent::temporarySignedRoute($name, $expiration, $parameters, $absolute);
|
return parent::temporarySignedRoute($name, $expiration, $parameters, $absolute);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
use Illuminate\Routing\UrlGenerator;
|
use Illuminate\Routing\UrlGenerator;
|
||||||
|
use Illuminate\Support\Facades\URL;
|
||||||
use Stancl\Tenancy\Tests\Etc\Tenant;
|
use Stancl\Tenancy\Tests\Etc\Tenant;
|
||||||
use Illuminate\Support\Facades\Event;
|
use Illuminate\Support\Facades\Event;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
@ -359,3 +360,40 @@ test('both the name prefixing and the tenant parameter logic gets skipped when b
|
||||||
expect(route('home', ['bypassParameter' => false, 'tenant' => $tenant->getTenantKey()]))->toBe($tenantRouteUrl)
|
expect(route('home', ['bypassParameter' => false, 'tenant' => $tenant->getTenantKey()]))->toBe($tenantRouteUrl)
|
||||||
->not()->toContain('bypassParameter');
|
->not()->toContain('bypassParameter');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('the temporarySignedRoute method can automatically prefix the passed route name', function() {
|
||||||
|
config(['tenancy.bootstrappers' => [UrlGeneratorBootstrapper::class]]);
|
||||||
|
|
||||||
|
Route::get('/{tenant}/foo', fn () => 'foo')->name('tenant.foo')->middleware([InitializeTenancyByPath::class]);
|
||||||
|
|
||||||
|
TenancyUrlGenerator::$prefixRouteNames = true;
|
||||||
|
|
||||||
|
$tenant = Tenant::create();
|
||||||
|
|
||||||
|
tenancy()->initialize($tenant);
|
||||||
|
|
||||||
|
// Route name ('foo') gets prefixed automatically (will be 'tenant.foo')
|
||||||
|
$tenantSignedUrl = URL::temporarySignedRoute('foo', now()->addMinutes(2), ['tenant' => $tenantKey = $tenant->getTenantKey()]);
|
||||||
|
|
||||||
|
expect($tenantSignedUrl)->toContain("localhost/{$tenantKey}/foo");
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the bypass parameter works correctly with temporarySignedRoute', function() {
|
||||||
|
config(['tenancy.bootstrappers' => [UrlGeneratorBootstrapper::class]]);
|
||||||
|
|
||||||
|
Route::get('/foo', fn () => 'foo')->name('central.foo');
|
||||||
|
|
||||||
|
TenancyUrlGenerator::$prefixRouteNames = true;
|
||||||
|
TenancyUrlGenerator::$bypassParameter = 'central';
|
||||||
|
|
||||||
|
$tenant = Tenant::create();
|
||||||
|
|
||||||
|
tenancy()->initialize($tenant);
|
||||||
|
|
||||||
|
// Bypass parameter allows us to generate URL for the 'central.foo' route in tenant context
|
||||||
|
$centralSignedUrl = URL::temporarySignedRoute('central.foo', now()->addMinutes(2), ['central' => true]);
|
||||||
|
|
||||||
|
expect($centralSignedUrl)
|
||||||
|
->toContain('localhost/foo')
|
||||||
|
->not()->toContain('central='); // Bypass parameter gets removed from the generated URL
|
||||||
|
});
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue