feat: allow keys in response

kukhariev · Feb 18, 2019 · 5c640c2 · 5c640c2
1 parent f175c34
commit 5c640c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/server/index.js b/server/index.js
@@ -149,7 +149,7 @@ app.use('/upload/', auth, (req, res, next) => {
 
   const location = `${req.protocol}://${req.hostname}:${PORT}/upload/${query}`;
   res.location(location);
-  res.sendStatus(200);
+  res.json(200, { location });
 });
 
 // ------------------------------  ERROR HANDLER  ------------------------------

diff --git a/src/uploadx/src/uploader.ts b/src/uploadx/src/uploader.ts
@@ -254,11 +254,12 @@ function getRange(xhr: XMLHttpRequest) {
   const match = getKeyFromResponse(xhr, 'Range').match(/(-1|\d+)$/g);
   return 1 + +(match && match[0]);
 }
-        };
-        this.status = 'error';
-        XHRFactory.release(xhr);
-        this.options.nextFile();
-      }
+
+function getKeyFromResponse(xhr: XMLHttpRequest, key: string) {
+  const fromHeader = xhr.getResponseHeader(key);
+  if (fromHeader) {
+    return fromHeader;
+  }
     };
     const onDataSendSuccess = () => {
       if (xhr.status === 200 || xhr.status === 201) {