archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-09-20 13:34:04 +00:00
Code Activity

Read the tenant asset root from the resolved disk instead of the disk config

Browse source 
Also, instead of throwing the "no root path configured" exception, just throw an exception if the disk is not local (i.e. is not instanceof LocalFilesystemAdapter). A local disk HAS to have a string root, otherwise, Laravel throws an exception while instantiating that disk.
This commit is contained in:
lukinovec 2026-08-21 14:16:40 +02:00 • committed by Samuel Stancl
parent efa8c03680
commit e70057e3ba
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/Controllers/TenantAssetController.php
View file

@ -9,6 +9,8 @@ use Exception;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Routing\Controllers\HasMiddleware; use Illuminate\Routing\Controllers\HasMiddleware;
use Illuminate\Routing\Controllers\Middleware; use Illuminate\Routing\Controllers\Middleware;
use Illuminate\Filesystem\LocalFilesystemAdapter;
use Illuminate\Support\Facades\Storage;
use Stancl\Tenancy\Bootstrappers\FilesystemTenancyBootstrapper; use Stancl\Tenancy\Bootstrappers\FilesystemTenancyBootstrapper;
use Symfony\Component\HttpFoundation\BinaryFileResponse; use Symfony\Component\HttpFoundation\BinaryFileResponse;
use Throwable; use Throwable;
@ -43,9 +45,13 @@ class TenantAssetController implements HasMiddleware
* *
* When null, the assets are served from app/public inside the tenant's storage directory. * When null, the assets are served from app/public inside the tenant's storage directory.
* *
* The disk has to be local and have a root configured, since the assets are read from the filesystem. * The disk has to be local, since the assets are read from the filesystem. Disks using the
* It should also be listed in tenancy.filesystem.disks. FilesystemTenancyBootstrapper only scopes * 'scoped' driver are supported as long as their parent disk uses the 'local' driver.
* the roots of disks listed there, so otherwise every tenant is served the same central directory. *
* It should also be listed in tenancy.filesystem.disks -- for scoped disks, it's the parent
* disk that has to be listed there (since a scoped disk inherits the parent's root).
* FilesystemTenancyBootstrapper only scopes the roots of disks listed there, so otherwise
* every tenant is served the same (central) directory.
*/ */
public static string|null $publicDisk = null; public static string|null $publicDisk = null;
@ -89,14 +95,17 @@ class TenantAssetController implements HasMiddleware
protected function assetRoot(): string protected function assetRoot(): string
{ {
if (static::$publicDisk) { if (static::$publicDisk) {
$diskRoot = config('filesystems.disks.' . static::$publicDisk . '.root'); $disk = Storage::disk(static::$publicDisk);
if (! is_string($diskRoot)) { if (! $disk instanceof LocalFilesystemAdapter) {
// A disk with no root path would let the controller serve any file in the app // The root has to be read from the resolved disk rather than from the disk's config,
throw new Exception('Disk [' . static::$publicDisk . '] has no root path configured.'); // since the config root isn't the full root path of every local disk. Disks using the
// 'scoped' driver have no root in their config -- they inherit their parent disk's root --
// and a 'prefix' is part of the root path as well.
throw new Exception('Disk [' . static::$publicDisk . '] is not a local disk. Only local disks can be used for serving assets.');
} }
return rtrim($diskRoot, '/'); return rtrim($disk->path(''), DIRECTORY_SEPARATOR);
} }
if ($tenant = tenant()) { if ($tenant = tenant()) {