Fix local disk and Glide base url request scheme resolution

876c93a introduced an issue by using request() in config. When using php artisan config:cache that request is not coming externally with the appropriate headers.
area17 · Apr 1, 2020 · 15a2dbe · 15a2dbe
1 parent fc5b16a
commit 15a2dbe
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/config/disks.php b/config/disks.php
@@ -1,20 +1,17 @@
 <?php
 
 $localRootPrefix = storage_path('app/public/');
-$localUrlPrefix = request()->getScheme() . '://' . str_replace(['http://', 'https://'], '', env('APP_URL')) . '/storage/';
 
 $mediaLocalConfig = [
     'driver' => 'local',
     'visibility' => 'public',
     'root' => $localRootPrefix . trim(config('twill.media_library.local_path'), '/ '),
-    'url' => $localUrlPrefix . trim(config('twill.media_library.local_path'), '/ '),
 ];
 
 $fileLocalConfig = [
     'driver' => 'local',
     'visibility' => 'public',
     'root' => $localRootPrefix . trim(config('twill.file_library.local_path'), '/ '),
-    'url' => $localUrlPrefix . trim(config('twill.file_library.local_path'), '/ '),
 ];
 
 $s3Config = [

diff --git a/config/glide.php b/config/glide.php
@@ -14,7 +14,7 @@
     'source' => env('GLIDE_SOURCE', storage_path('app/public/' . config('twill.media_library.local_path'))),
     'cache' => env('GLIDE_CACHE', storage_path('app')),
     'cache_path_prefix' => env('GLIDE_CACHE_PATH_PREFIX', 'glide_cache'),
-    'base_url' => env('GLIDE_BASE_URL', request()->getScheme() . '://' . str_replace(['http://', 'https://'], '', config('app.url'))),
+    'base_url' => env('GLIDE_BASE_URL', null),
     'base_path' => env('GLIDE_BASE_PATH', 'img'),
     'use_signed_urls' => env('GLIDE_USE_SIGNED_URLS', false),
     'sign_key' => env('GLIDE_SIGN_KEY'),

diff --git a/src/Services/MediaLibrary/Glide.php b/src/Services/MediaLibrary/Glide.php
@@ -52,8 +52,17 @@ public function __construct(Config $config, Application $app, Request $request)
         $this->app = $app;
         $this->request = $request;
 
+        $baseUrlHost = $this->config->get(
+            'twill.glide.base_url',
+            $this->request->getScheme() . '://' . str_replace(
+                ['http://', 'https://'],
+                '',
+                $this->config->get('app.url')
+            )
+        );
+
         $baseUrl = join('/', [
-            rtrim($this->config->get('twill.glide.base_url'), '/'),
+            rtrim($baseUrlHost, '/'),
             ltrim($this->config->get('twill.glide.base_path'), '/'),
         ]);
 

diff --git a/src/TwillServiceProvider.php b/src/TwillServiceProvider.php
@@ -211,9 +211,31 @@ private function mergeConfigs()
         $this->mergeConfigFrom(__DIR__ . '/../config/dashboard.php', 'twill.dashboard');
         $this->mergeConfigFrom(__DIR__ . '/../config/oauth.php', 'twill.oauth');
         $this->mergeConfigFrom(__DIR__ . '/../config/disks.php', 'filesystems.disks');
+
+        if (config('twill.media_library.endpoint_type') === 'local'
+            && config('twill.media_library.disk') === 'twill_media_library') {
+            $this->setLocalDiskUrl('media');
+        }
+
+        if (config('twill.file_library.endpoint_type') === 'local'
+            && config('twill.file_library.disk') === 'twill_file_library') {
+            $this->setLocalDiskUrl('file');
+        }
+
         $this->mergeConfigFrom(__DIR__ . '/../config/services.php', 'services');
     }
 
+    private function setLocalDiskUrl($type)
+    {
+        config([
+            'filesystems.disks.twill_' . $type . '_library.url' => request()->getScheme()
+            . '://'
+            . str_replace(['http://', 'https://'], '', config('app.url'))
+            . '/storage/'
+            . trim(config('twill.' . $type . '_library.local_path'), '/ '),
+        ]);
+    }
+
     private function publishMigrations()
     {
         if (config('twill.load_default_migrations', true)) {