Merge pull request #173 from bradleyg/digital-ocean-support

Cleanup.
bradleyg · Jan 31, 2019 · 9050c5c · 9050c5c
2 parents bcfb1ac + 81041e9
commit 9050c5c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ npm-debug.log
 .tox/
 .env
 .cache
+settings.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "django-s3direct",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Add direct uploads to S3 functionality with a progress bar to file input fields.",
   "directories": {
     "example": "example"

diff --git a/s3direct/static/s3direct/dist/index.js b/s3direct/static/s3direct/dist/index.js
diff --git a/src/index.js b/src/index.js
@@ -179,10 +179,6 @@ const initiateUpload = (element, signingUrl, uploadParameters, file, dest) => {
       uploadParameters.server_side_encryption,
       uploadParameters.session_token
     ),
-    notSignedHeadersAtInitiate: {
-      'Cache-Control': uploadParameters.cache_control,
-      'Content-Disposition': uploadParameters.content_disposition
-    },
     progress: (progressRatio, stats) => {
       updateProgressBar(element, progressRatio);
     },
@@ -193,6 +189,18 @@ const initiateUpload = (element, signingUrl, uploadParameters, file, dest) => {
     }
   };
 
+  const optHeaders = {}
+
+  if(uploadParameters.cache_control) {
+    optHeaders['Cache-Control'] = uploadParameters.cache_control
+  }
+
+  if(uploadParameters.content_disposition) {
+    optHeaders['Content-Disposition'] = uploadParameters.content_disposition
+  }
+
+  addConfig['notSignedHeadersAtInitiate'] = optHeaders
+
   Evaporate
     .create(createConfig)
     .then(