refactor: encrypted disk now decorates another disk

Author: JaZo

src/EncryptedDataServiceProvider.php

@@ -4,13 +4,9 @@
 
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Filesystem\FilesystemAdapter;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\ServiceProvider;
-use League\Flysystem\Filesystem;
-use League\Flysystem\Local\LocalFilesystemAdapter;
-use League\Flysystem\UnixVisibility\PortableVisibilityConverter;
-use League\Flysystem\Visibility;
+use InvalidArgumentException;
 use Swis\Flysystem\Encrypted\EncryptedFilesystemAdapter;
 use Swis\Laravel\Encrypted\Commands\ReEncryptFiles;
 use Swis\Laravel\Encrypted\Commands\ReEncryptModels;
@@ -42,40 +38,28 @@ public function boot(): void
     protected function setupStorageDriver(): void
     {
         Storage::extend(
-            'local-encrypted',
-            function (Application $app, array $config) {
-                $visibility = PortableVisibilityConverter::fromArray(
-                    $config['permissions'] ?? [],
-                    $config['directory_visibility'] ?? $config['visibility'] ?? Visibility::PRIVATE
-                );
+            'encrypted',
+            (function (Application $app, array $config) {
+                /** @var \Illuminate\Filesystem\FilesystemManager $this */
+                if (empty($config['disk'])) {
+                    throw new InvalidArgumentException('Encrypted disk is missing "disk" configuration option.');
+                }
 
-                $links = ($config['links'] ?? null) === 'skip'
-                    ? LocalFilesystemAdapter::SKIP_LINKS
-                    : LocalFilesystemAdapter::DISALLOW_LINKS;
+                $parent = $this->build(
+                    is_string($config['disk']) ? $this->getConfig($config['disk']) : $config['disk']
+                );
 
                 $adapter = new EncryptedFilesystemAdapter(
-                    new LocalFilesystemAdapter(
-                        $config['root'],
-                        $visibility,
-                        $config['lock'] ?? LOCK_EX,
-                        $links
-                    ),
+                    $parent->getAdapter(),
                     $app->make('encrypted-data.encrypter')
                 );
 
-                $driver = new Filesystem(
+                return new FilesystemAdapter(
+                    $this->createFlysystem($adapter, $parent->getConfig()),
                     $adapter,
-                    Arr::only($config, [
-                        'directory_visibility',
-                        'disable_asserts',
-                        'temporary_url',
-                        'url',
-                        'visibility',
-                    ])
+                    $parent->getConfig()
                 );
-
-                return new FilesystemAdapter($driver, $adapter, $config);
-            }
+            })->bindTo(Storage::getFacadeRoot(), Storage::getFacadeRoot())
         );
     }
 }

tests/Feature/ReEncryptFilesTest.php

@@ -52,15 +52,15 @@ protected function hasLocalDisk($app): void
     protected function hasEncryptedDisk($app): void
     {
         $app['config']->set('filesystems.default', 'local');
-        $app['config']->set('filesystems.disks.local', ['driver' => 'local-encrypted', 'root' => $this->diskRoot]);
+        $app['config']->set('filesystems.disks.local', ['driver' => 'encrypted', 'disk' => ['driver' => 'local', 'root' => $this->diskRoot]]);
 
         $this->filesystem->ensureDirectoryExists($this->diskRoot);
     }
 
     protected function hasExtraEncryptedDisk($app): void
     {
         $diskRoot = dirname($this->diskRoot).'/extra';
-        $app['config']->set('filesystems.disks.extra', ['driver' => 'local-encrypted', 'root' => $diskRoot]);
+        $app['config']->set('filesystems.disks.extra', ['driver' => 'encrypted', 'disk' => ['driver' => 'local', 'root' => $diskRoot]]);
 
         $this->filesystem->ensureDirectoryExists($diskRoot);
     }

tests/Unit/FilesystemTest.php

@@ -12,7 +12,7 @@ final class FilesystemTest extends TestCase
     protected function usesEncryptedDisk($app): void
     {
         $app['config']->set('filesystems.default', 'local');
-        $app['config']->set('filesystems.disks.local', ['driver' => 'local-encrypted', 'root' => dirname(__DIR__).'/_files/']);
+        $app['config']->set('filesystems.disks.local', ['driver' => 'encrypted', 'disk' => ['driver' => 'local', 'root' => dirname(__DIR__).'/_files/']]);
     }
 
     #[Test]