archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 13:54:04 +00:00
Code Activity

Fix globalUrl binding

Browse source
This commit is contained in:
Samuel Štancl 2019-10-14 20:10:59 +02:00
parent eb7680ce67
commit 407eb183b7
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/TenancyServiceProvider.php
View file

@ -82,14 +82,24 @@ class TenancyServiceProvider extends ServiceProvider
$this->app->make(Kernel::class)->prependMiddleware(Middleware\InitializeTenancy::class); $this->app->make(Kernel::class)->prependMiddleware(Middleware\InitializeTenancy::class);
/**
* Since tenancy is initialized in the global middleware stack, this
* middleware group acts mostly as a 'flag' for the PreventAccess
* middleware to decide whether the request should be aborted.
*/
Route::middlewareGroup('tenancy', [ Route::middlewareGroup('tenancy', [
/* Prevent access from tenant domains to central routes and vice versa. */ /* Prevent access from tenant domains to central routes and vice versa. */
Middleware\PreventAccessFromTenantDomains::class, Middleware\PreventAccessFromTenantDomains::class,
]); ]);
$this->app->singleton('globalUrl', function ($app) { $this->app->singleton('globalUrl', function ($app) {
$instance = clone $app['url']; if ($app->bound(FilesystemTenancyBootstrapper::class)) {
$instance->setAssetRoot($app[FilesystemTenancyBootstrapper::class]->originalPaths['asset_url']); $instance = clone $app['url'];
$instance->setAssetRoot($app[FilesystemTenancyBootstrapper::class]->originalPaths['asset_url']);
} else {
$instance = $app['url'];
}
return $instance; return $instance;
}); });