Merge pull request dschmidt#23 from Turbo87/fixes

Fix authentication issues
urbany · Nov 12, 2016 · 31d8e5c · 31d8e5c
2 parents 079ea4d + b45300c
commit 31d8e5c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 31 deletions.
diff --git a/index.js b/index.js
@@ -9,9 +9,7 @@ var urljoin = require("url-join");
 var request = require('request-promise');
 var path = require('path');
 var fs = require('fs');
-var FormData = require('form-data');
 var throat = require('throat');
-var url = require('url');
 
 
 module.exports = {
@@ -135,7 +133,7 @@ module.exports = {
         return request({
           uri: this.baseUrl,
           method: 'POST',
-          auth: this.sentrySettings.auth,
+          auth: this.generateAuth(),
           json: true,
           body: {
             version: this.sentrySettings.release
@@ -179,36 +177,19 @@ module.exports = {
           .then(this._getReleaseFiles.bind(this));
       },
       _uploadFile: function uploadFile(filePath) {
-        var sentrySettings = this.sentrySettings;
         var distDir = this.readConfig('distDir');
-        var sentry_url = this.sentrySettings.url;
-        var urlPath = urljoin(this.releaseUrl, 'files/');
-        var host = url.parse(sentry_url).host;
-        var formData = new FormData();
-        formData.append('name', urljoin(this.sentrySettings.publicUrl, filePath));
-
         var fileName = path.join(distDir, filePath);
-        var fileSize = fs.statSync(fileName)["size"];
-        formData.append('file', fs.createReadStream(fileName), {
-          knownLength: fileSize
-        });
 
-        return new Promise(function(resolve, reject) {
-          formData.submit({
-            protocol: 'https:',
-            host: host,
-            path: urlPath,
-            auth: sentrySettings.apiKey + ':'
-          }, function(error, result) {
-            if(error) {
-              reject(error);
-            }
-            result.resume();
+        var formData = {
+          name: urljoin(this.sentrySettings.publicUrl, filePath),
+          file: fs.createReadStream(fileName),
+        };
 
-            result.on('end', function() {
-              resolve();
-            });
-          });
+        return request({
+          uri: urljoin(this.releaseUrl, 'files/'),
+          method: 'POST',
+          auth: this.generateAuth(),
+          formData: formData
         });
       },
       _getReleaseFiles: function getReleaseFiles() {

diff --git a/package.json b/package.json
@@ -51,7 +51,6 @@
   "dependencies": {
     "ember-cli-babel": "^5.0.0",
     "ember-cli-deploy-plugin": "^0.2.0",
-    "form-data": "^1.0.0-rc3",
     "glob": "^5.0.14",
     "request-promise": "^0.4.3",
     "silent-error": "^1.0.0",
@@ -62,4 +61,4 @@
     "configPath": "tests/dummy/config",
     "after": "ember-cli-deploy-revision-data"
   }
-}
+}