From a34b5abc8250ad6b6bd636b57c2535cc079897b7 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <github@rvanderhoff.org.uk>
Date: Tue, 18 Apr 2017 16:47:50 +0100
Subject: [PATCH] Use multipart-form encoding for rageshake uploads (#3646)

This is a more sensible encoding for uploading logfiles, and will allow us to
compress the logfiles in future.

browser-request doesn't give us enough flexibility to do this properly, so we
use XMLHttpRequest directly.
---
 src/vector/submit-rageshake.js | 75 ++++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 30 deletions(-)

diff --git a/src/vector/submit-rageshake.js b/src/vector/submit-rageshake.js
index 8c0700769..7430e3bee 100644
--- a/src/vector/submit-rageshake.js
+++ b/src/vector/submit-rageshake.js
@@ -15,12 +15,19 @@ limitations under the License.
 */
 
 import q from "q";
-import request from "browser-request";
 
 import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
 
 import rageshake from './rageshake'
 
+
+// polyfill textencoder if necessary
+import * as TextEncodingUtf8 from 'text-encoding-utf-8';
+let TextEncoder = window.TextEncoder;
+if (!TextEncoder) {
+    TextEncoder = TextEncodingUtf8.TextEncoder;
+}
+
 /**
  * Send a bug report.
  * @param {string} bugReportEndpoint HTTP url to send the report to
@@ -49,36 +56,44 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
 
     console.log("Sending bug report.");
 
-    let logs = [];
+    const body = new FormData();
+    body.append('text', opts.userText || "User did not supply any additional text.");
+    body.append('app', 'riot-web');
+    body.append('version', version);
+    body.append('user_agent', userAgent);
+
     if (opts.sendLogs) {
-        logs = await rageshake.getLogsForReport();
+        const logs = await rageshake.getLogsForReport();
+        for (let entry of logs) {
+            // encode as UTF-8
+            const buf = new TextEncoder().encode(entry.lines);
+
+            body.append('log', new Blob([buf]), entry.id);
+        }
     }
 
-    await q.Promise((resolve, reject) => {
-        request({
-            method: "POST",
-            url: bugReportEndpoint,
-            body: {
-                logs: logs,
-                text: (
-                    opts.userText || "User did not supply any additional text."
-                ),
-                app: 'riot-web',
-                version: version,
-                user_agent: userAgent,
-            },
-            json: true,
-            timeout: 5 * 60 * 1000,
-        }, (err, res) => {
-            if (err) {
-                reject(err);
-                return;
-            }
-            if (res.status < 200 || res.status >= 400) {
-                reject(new Error(`HTTP ${res.status}`));
-                return;
-            }
-            resolve();
-        })
-    });
+    await _submitReport(bugReportEndpoint, body);
+}
+
+function _submitReport(endpoint, body) {
+    const deferred = q.defer();
+
+    const req = new XMLHttpRequest();
+    req.open("POST", endpoint);
+    req.timeout = 5 * 60 * 1000;
+    req.onreadystatechange = function() {
+        if (req.readyState === XMLHttpRequest.DONE) {
+            on_done();
+        }
+    };
+    req.send(body);
+    return deferred.promise;
+
+    function on_done() {
+        if (req.status < 200 || req.status >= 400) {
+            deferred.reject(new Error(`HTTP ${req.status}`));
+            return;
+        }
+        deferred.resolve();
+    }
 }