Fix a lot of bugs, fix #23

src/Controllers/TenantAssetsController.php

@@ -4,7 +4,7 @@ namespace Stancl\Tenancy\Controllers;
 
 use Illuminate\Routing\Controller;
 
-class TenantAssetController extends Controller
+class TenantAssetsController extends Controller
 {
     public function __construct()
     {

src/Traits/BootstrapsTenancy.php

@@ -4,6 +4,7 @@ namespace Stancl\Tenancy\Traits;
 
 use Stancl\Tenancy\CacheManager;
 use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Facades\Storage;
 
 trait BootstrapsTenancy
 {
@@ -47,20 +48,22 @@ trait BootstrapsTenancy
 
         $suffix = $this->app['config']['tenancy.filesystem.suffix_base'] . tenant('uuid');
 
+        // storage_path()
+        $this->app->useStoragePath($old['storage_path'] . "/{$suffix}");
+
         // Storage facade
         foreach ($this->app['config']['tenancy.filesystem.disks'] as $disk) {
-            $root = $this->app['config']["filesystems.disks.{$disk}.root"];
-
-            \Storage::disk($disk)->getAdapter()->setPathPrefix(
-                $root . "/{$suffix}"
-            );
+            if ($root = str_replace('%storage_path%', storage_path(), $this->app['config']["tenancy.filesystem.root_override.{$disk}"])) {
+                Storage::disk($disk)->getAdapter()->setPathPrefix($root);
+            } else {
+                $root = $this->app['config']["filesystems.disks.{$disk}.root"];
+    
+                Storage::disk($disk)->getAdapter()->setPathPrefix($root . "/{$suffix}");
+            }
 
             $old['storage_disks'][$disk] = $root;
         }
 
-        // storage_path()
-        $this->app->useStoragePath($old['storage_path'] . "/{$suffix}");
-
         $this->oldStoragePaths = $old;
     }
 }

src/config/tenancy.php

@@ -26,8 +26,14 @@ return [
         // Disks which should be suffixed with the suffix_base + tenant UUID.
         'disks' => [
             'local',
+            'public',
             // 's3',
         ],
+        'root_override' => [
+            // Disks whose roots should be overriden after storage_path() is suffixed.
+            'local' => '%storage_path%/app/',
+            'public' => '%storage_path%/app/public/',
+        ],
     ],
     'database_managers' => [
         'sqlite' => 'Stancl\Tenancy\TenantDatabaseManagers\SQLiteDatabaseManager',

src/routes.php

@@ -1,5 +1,5 @@
 <?php
 
-Route::get('/tenancy/assets/{path}', 'Stancl\Tenancy\Controllers\TenantAssetController@asset')
+Route::get('/tenancy/assets/{path}', 'Stancl\Tenancy\Controllers\TenantAssetsController@asset')
     ->where('path', '(.*)')
     ->name('stancl.tenancy.asset');