Merge branch 'master' into ca-npm-update-202304

cerpus · Aug 24, 2023 · b1a5eac · b1a5eac
2 parents 3283dae + c75c8d0
commit b1a5eac
Show file tree

Hide file tree

Showing 10 changed files with 10,475 additions and 16,965 deletions.
diff --git a/sourcecode/apis/contentauthor/app/Libraries/H5P/Interfaces/H5PDownloadInterface.php b/sourcecode/apis/contentauthor/app/Libraries/H5P/Interfaces/H5PDownloadInterface.php
@@ -2,9 +2,9 @@
 
 namespace App\Libraries\H5P\Interfaces;
 
-use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\Response;
 
 interface H5PDownloadInterface
 {
-    public function downloadContent(string $filename, string $title): StreamedResponse;
+    public function downloadContent(string $filename, string $title): Response;
 }
diff --git a/sourcecode/apis/contentauthor/app/Libraries/H5P/Storage/H5PCerpusStorage.php b/sourcecode/apis/contentauthor/app/Libraries/H5P/Storage/H5PCerpusStorage.php
@@ -15,14 +15,14 @@
 use Exception;
 use H5PFileStorage;
 use Illuminate\Contracts\Filesystem\Filesystem;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Log;
 use League\Flysystem\FilesystemException;
 use League\Flysystem\StorageAttributes;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class H5PCerpusStorage implements H5PFileStorage, H5PDownloadInterface, CerpusStorageInterface
 {
@@ -537,11 +537,11 @@ public function saveFileFromZip($path, $file, $stream): bool
         return $upload;
     }
 
-    public function downloadContent(string $filename, string $title): StreamedResponse
+    public function downloadContent(string $filename, string $title): RedirectResponse
     {
         $path = sprintf(ContentStorageSettings::EXPORT_PATH, $filename);
 
-        return $this->filesystem->response($path);
+        return new RedirectResponse($this->filesystem->url($path));
     }
 
     public function getDisplayPath(bool $fullUrl = true)

diff --git a/sourcecode/apis/contentauthor/config/filesystems.php b/sourcecode/apis/contentauthor/config/filesystems.php
@@ -47,6 +47,7 @@
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'region' => env('AWS_DEFAULT_REGION'),
             'bucket' => env('AWS_BUCKET'),
+            'url' => env('CDN_WITH_PREFIX'),
         ],
         // temporary directory for test files
         // this has to be its own directory, or your files will go missing!