Merge pull request #10 from luyadev/content-disposition

Allow object mutations

Author: nadar

CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 In order to read more about upgrading and BC breaks have a look at the [UPGRADE Document](UPGRADE.md).
 
+## 1.2.1 (19. November 2020)
+
++ [#10](https://github.com/luyadev/luya-aws/pull/10) Fix issue where content type was not provided correctly, also ensure the disposition is set correctly when uploading or updating and object.
+
 ## 1.2.0 (27. August 2020)
 
 + [#6](https://github.com/luyadev/luya-aws/pull/6) Add new option to update bucket policy, add command to update policy, add helper method with policies as JSON.

src/S3FileSystem.php

@@ -8,6 +8,9 @@
 use yii\base\InvalidConfigException;
 use Aws\S3\S3Client;
 use Aws\S3\Exception\S3Exception;
+use luya\admin\events\FileEvent;
+use luya\admin\Module;
+use luya\helpers\FileHelper;
 use luya\helpers\StringHelper;
 
 /**
@@ -53,7 +56,7 @@ class S3FileSystem extends BaseFileSystemStorage
     public $region;
 
     /**
-     * @var string The ACL default permission when writing new files.
+     * @var string The ACL default permission when writing new files. All available options are `private|public-read|public-read-write|authenticated-read|aws-exec-read|bucket-owner-read|bucket-owner-full-control`
      */
     public $acl = 'public-read';
 
@@ -79,6 +82,26 @@ public function init()
         if ($this->region === null || $this->bucket === null || $this->key === null) {
             throw new InvalidConfigException("region, bucket and key must be provided for s3 component configuration.");
         }
+
+        $this->on(self::FILE_UPDATE_EVENT, function(FileEvent $event) {
+            // Copy the object in order to not upload the content again
+            $config = [
+                'Bucket' => $this->bucket,
+                'CopySource' => "{$this->bucket}/{$event->file->name_new_compound}",
+                'Key' => $event->file->name_new_compound,
+                'MetadataDirective' => 'REPLACE',
+                'ContentType' => $event->file->mime_type,
+            ];
+
+            if ($event->file->inline_disposition) {
+                // keep ContentDisposition because this is the default value for s3 objects
+                // therefore ensure its not provided in the config.
+            } else {
+                $config['ContentDisposition'] = 'attachement'; // inline is default setting
+            }
+
+            return $this->client->copyObject($config);
+        });
     }
 
     private $_client;
@@ -234,8 +257,14 @@ public function fileSystemSaveFile($source, $fileName)
             'Bucket' => $this->bucket,
             'Key' => $fileName,
             'SourceFile' => $source,
+            'ContentType' => FileHelper::getMimeType($source),
         ];
+
+        if (!Module::getInstance()->fileDefaultInlineDisposition) {
+            $config['ContentDisposition'] = 'attachement'; // inline is default setting
+        }
 
+        // see https://docs.aws.amazon.com/aws-sdk-php/v3/api/api-s3-2006-03-01.html#putobject
         return $this->client->putObject($config);
     }