From f91b2acea629d3da2cc2a2b88801950de18d4e0e Mon Sep 17 00:00:00 2001
From: ThomasG77 <thomas_gratier@yahoo.fr>
Date: Thu, 13 Apr 2017 11:48:56 +0200
Subject: [PATCH] Merge tus client options with uppy. Hence, enable custom
 headers support

---
 src/plugins/Tus10.js | 67 +++++++++++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/src/plugins/Tus10.js b/src/plugins/Tus10.js
index bd6182712..1583d5d31 100644
--- a/src/plugins/Tus10.js
+++ b/src/plugins/Tus10.js
@@ -4,6 +4,24 @@ const UppySocket = require('../core/UppySocket')
 const throttle = require('lodash.throttle')
 require('whatwg-fetch')
 
+// Extracted from https://github.com/tus/tus-js-client/blob/master/lib/upload.js#L13
+// excepted we removed 'fingerprint' key to avoid adding more dependencies
+const tusDefaultOptions = {
+  endpoint: '',
+  resume: true,
+  onProgress: null,
+  onChunkComplete: null,
+  onSuccess: null,
+  onError: null,
+  headers: {},
+  chunkSize: Infinity,
+  withCredentials: false,
+  uploadUrl: null,
+  uploadSize: null,
+  overridePatchMethod: false,
+  retryDelays: null
+}
+
 /**
  * Tus resumable file uploader
  *
@@ -85,36 +103,35 @@ module.exports = class Tus10 extends Plugin {
 
     // Create a new tus upload
     return new Promise((resolve, reject) => {
-      const upload = new tus.Upload(file.data, {
+      var optsTus = Object.assign({}, tusDefaultOptions, this.opts)
 
-        // TODO merge this.opts or this.opts.tus here
-        metadata: file.meta,
-        resume: this.opts.resume,
-        endpoint: this.opts.endpoint,
+      optsTus.onError = (err) => {
+        this.core.log(err)
+        this.core.emitter.emit('core:upload-error', file.id, err)
+        reject('Failed because: ' + err)
+      }
 
-        onError: (err) => {
-          this.core.log(err)
-          this.core.emitter.emit('core:upload-error', file.id, err)
-          reject('Failed because: ' + err)
-        },
-        onProgress: (bytesUploaded, bytesTotal) => {
-          this.core.emitter.emit('core:upload-progress', {
-            uploader: this,
-            id: file.id,
-            bytesUploaded: bytesUploaded,
-            bytesTotal: bytesTotal
-          })
-        },
-        onSuccess: () => {
-          this.core.emitter.emit('core:upload-success', file.id, upload, upload.url)
+      optsTus.onProgress = (bytesUploaded, bytesTotal) => {
+        this.core.emitter.emit('core:upload-progress', {
+          uploader: this,
+          id: file.id,
+          bytesUploaded: bytesUploaded,
+          bytesTotal: bytesTotal
+        })
+      }
 
-          if (upload.url) {
-            this.core.log(`Download ${upload.file.name} from ${upload.url}`)
-          }
+      optsTus.onSuccess = () => {
+        this.core.emitter.emit('core:upload-success', file.id, upload, upload.url)
 
-          resolve(upload)
+        if (upload.url) {
+          this.core.log('Download ' + upload.file.name + ' from ' + upload.url)
         }
-      })
+
+        resolve(upload)
+      }
+      optsTus.metadata = file.meta
+
+      const upload = new tus.Upload(file.data, optsTus)
 
       this.onFileRemove(file.id, () => {
         this.core.log('removing file:', file.id)