Send feedback to new api endpoint

Resolves #217

Author: pixtron

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Bugfixes
 * Logger should be able to serialize BigInt #229
 * Do not use format.json() in logger #228
+* Send feedback to new api endpoint #217
 
 ### Changes
 * Upgrade to electron v7 #132

app/lib/config.js

@@ -136,13 +136,22 @@ module.exports = function() {
     }
   }
 
+  function has(key) {
+    if(activeInstance) {
+      return settings.has(key);
+    } else {
+      return !!memorySettings[key];
+    }
+  }
+
   return {
     isActiveInstance: function() {
       return instance.getActiveInstance();
     },
     hadConfig: function() {
       return configExists;
     },
+    has,
     getAll: function(include_secret) {
       if(activeInstance) {
         var conf = settings.getAll();

app/ui/feedback/controller.js

@@ -2,6 +2,7 @@ const os = require('os');
 const fs = require('graceful-fs');
 const path = require('path');
 const extend = require('util')._extend;
+const PassThrough = require('stream').PassThrough;
 const si = require('systeminformation');
 
 const {app, ipcMain, BrowserWindow} = require('electron');
@@ -39,49 +40,77 @@ module.exports = function(env, clientConfig) {
     }
   }
 
-  function sendAutoReport() {
-    logger.debug('sending auto report', {category: 'feedback'});
+  function sendRequest(feedbackUrl, text, archive) {
+    return new Promise((resolve, reject) => {
+      if(!feedbackUrl) {
+        var blnUrl = clientConfig.has('blnUrl') ? clientConfig.get('blnUrl') : env.blnUrl;
 
-    var reportName = [clientConfig.get('username'), Math.floor(new Date().getTime() / 1000)].join('_');
+        if(!blnUrl) {
+          logger.error('blnUrl is neither set in clientConfig nor in env, can\'t send feedback', {
+            category: 'feedback',
+          });
 
-    var url = env.autoReportPutUrl || 'https://support.gyselroth.net/balloon-auto-report';
+          return reject();
+        }
 
-    var reqOptions = {
-      headers: {
-        'X-Client': ['Balloon-Desktop-App', globalConfig.get('version'), os.hostname()].join('|'),
-        'User-Agent': ['Balloon-Desktop-App', globalConfig.get('version'), os.hostname(), os.platform(), os.release()].join('|'),
+        feedbackUrl = `${blnUrl}/api/v2/feedbacks`;
       }
-    };
 
-    var req = request.put(url+'/' + reportName, reqOptions);
+      var formData = {feedback: text};
 
-    req.on('error', function(err) {
-      logger.error('sending auto report failed', {
-        category: 'feedback',
-        error: err
-      });
-    });
+      if(archive) {
+        var report = new PassThrough();
 
-    req.on('response', function(response) {
-      if(response.statusCode === 200) {
-        logger.info('auto report got response ', {
-          category: 'feedback',
-          response
-        });
-      } else {
-        logger.error('auto report got response ', {
-          category: 'feedback',
-          response
-        });
+        formData.report = {
+          value:  report,
+          options: {
+            filename: [clientConfig.get('username'), Math.floor(new Date().getTime() / 1000)].join('_'),
+            contentType: 'application/zip',
+            // set length to NaN to avoid request setting content-length header: https://github.com/form-data/form-data/pull/397#issuecomment-471976669
+            knownLength: NaN
+          }
+        }
+
+        archive.pipe(report);
       }
-    });
 
-    req.on('aborted', function(err) {
-      logger.error('auto report request has been aborted by the server', {
-        category: 'feedback',
-        error: err
+      var reqOptions = {
+        url: feedbackUrl,
+        formData: formData,
+        headers: {
+          'X-Client': ['Balloon-Desktop-App', globalConfig.get('version'), os.hostname()].join('|'),
+          'User-Agent': ['Balloon-Desktop-App', globalConfig.get('version'), os.hostname(), os.platform(), os.release()].join('|'),
+        }
+      }
+
+      var req = request.post(reqOptions);
+
+      req.on('error', function(err) {
+        logger.error('sending feedback failed', {category: 'feedback', error: err});
+        reject(err);
       });
-    });
+
+      req.on('response', function(response) {
+        if(response.statusCode === 200) {
+          logger.info('got response ', {category: 'feedback', response});
+          resolve();
+        } else {
+          logger.error('got response ', {category: 'feedback', response});
+          reject();
+        }
+      });
+
+      req.on('aborted', function(err) {
+        logger.error('request has been aborted by the server', {category: 'feedback', error: err});
+        reject(err);
+      });
+    })
+  }
+
+  function sendAutoReport() {
+    logger.debug('sending auto report', {category: 'feedback'});
+
+    var text = `Autoreport ${clientConfig.get('username')}`;
 
     var archive = archiver('zip', {zlib: { level: 9 }});
 
@@ -92,11 +121,12 @@ module.exports = function(env, clientConfig) {
       });
     });
 
-    archive.pipe(req);
-
     appendLogFilesToArchive(archive, false);
 
     archive.finalize();
+
+    // TODO pixtron - iss-217 - document configuration change env.autoReportPutUrl -> env.autoReportUrl
+    sendRequest(env.autoReportUrl, text, archive)
   }
 
 
@@ -106,53 +136,6 @@ module.exports = function(env, clientConfig) {
     });
 
     return new Promise(function(resolve, reject) {
-      var reportName = [clientConfig.get('username'), Math.floor(new Date().getTime() / 1000)].join('_');
-
-      var url = env.feedbackPutUrl || 'https://support.gyselroth.net/balloon';
-      var reqOptions = {
-        headers: {
-          'X-Client': ['Balloon-Desktop-App', globalConfig.get('version'), os.hostname()].join('|'),
-          'User-Agent': ['Balloon-Desktop-App', globalConfig.get('version'), os.hostname(), os.platform(), os.release()].join('|'),
-        }
-      };
-
-      var req = request.put(url+'/' + reportName+'?feedback='+encodeURIComponent(text), reqOptions);
-
-      req.on('error', function(err) {
-        logger.error('sending feedback failed', {
-          category: 'feedback',
-          error: err
-        });
-
-        reject(err);
-      });
-
-      req.on('response', function(response) {
-        if(response.statusCode === 200) {
-          logger.info('got response ', {
-            category: 'feedback',
-            response
-          });
-          resolve(reportName);
-        } else {
-          logger.error('got response ', {
-            category: 'feedback',
-            response
-          });
-
-          reject();
-        }
-      });
-
-      req.on('aborted', function(err) {
-        logger.error('request has been aborted by the server', {
-          category: 'feedback',
-          error: err
-        });
-
-        reject(err);
-      });
-
       if(file === true) {
         var archive = archiver('zip', {zlib: { level: 9 }});
 
@@ -165,8 +148,6 @@ module.exports = function(env, clientConfig) {
           reject(err);
         });
 
-        archive.pipe(req);
-
         async.parallel([
           async.reflect(async (cb) => {
             archive.glob('**/*', {
@@ -197,6 +178,9 @@ module.exports = function(env, clientConfig) {
           archive.finalize();
         });
       }
+
+      // TODO pixtron - iss-217 - document configuration change env.feedbackPutUrl -> env.feedbackUrl
+      sendRequest(env.feedbackUrl, text, archive).then(resolve).catch(reject)
     });
   }