PLT-2057 User as a first class object (#2648)

* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding client side unit test

* Cleaning up the clint side tests

* Fixing msg

* Adding more client side unit tests

* Adding more using tests

* Adding last bit of client side unit tests and adding make cmd

* Fixing bad merge

* Fixing libraries

* Updating to new client side API

* Fixing borken unit test

* Fixing unit tests

* ugg...trying to beat gofmt

* ugg...trying to beat gofmt

* Cleaning up remainder of the server side routes

* Adding inital load api

* Increased coverage of webhook unit tests (#2660)

* Adding loading ... to root html

* Fixing bad merge

* Removing explicit content type so superagent will guess corectly (#2685)

* Fixing merge and unit tests

* Adding create team UI

* Fixing signup flows

* Adding LDAP unit tests and enterprise unit test helper (#2702)

* Add the ability to reset MFA from the commandline (#2706)

* Fixing compliance unit tests

* Fixing client side tests

* Adding open server to system console

* Moving websocket connection

* Fixing unit test

* Fixing unit tests

* Fixing unit tests

* Adding nickname and more LDAP unit tests (#2717)

* Adding join open teams

* Cleaning up all TODOs in the code

* Fixing web sockets

* Removing unused webockets file

* PLT-2533 Add the ability to reset a user's MFA from the system console (#2715)

* Add the ability to reset a user's MFA from the system console

* Add client side unit test for adminResetMfa

* Reorganizing authentication to fix LDAP error message (#2723)

* Fixing failing unit test

* Initial upgrade db code

* Adding upgrade script

* Fixing upgrade script after running on core

* Update OAuth and Claim routes to work with user model changes (#2739)

* Fixing perminant deletion. Adding ability to delete all user and the entire database (#2740)

* Fixing team invite ldap login call (#2741)

* Fixing bluebar and some img stuff

* Fix all the different file upload web utils (#2743)

* Fixing invalid session redirect (#2744)

* Redirect on bad channel name (#2746)

* Fixing a bunch of issue and removing dead code

* Patch to fix error message on leave channel (#2747)

* Setting EnableOpenServer to false by default

* Fixing config

* Fixing upgrade

* Fixing reported bugs

* Bug fixes for PLT-2057

* PLT-2563 Redo password recovery to use a database table (#2745)

* Redo password recovery to use a database table

* Update reset password audits

* Split out admin and user reset password APIs to be separate

* Delete password recovery when user is permanently deleted

* Consolidate password resetting into a single function

* Removed private channels as an option for outgoing webhooks (#2752)

* PLT-2577/PLT-2552 Fixes for backstage (#2753)

* Added URL to incoming webhook list

* Fixed client functions for adding/removing integrations

* Disallowed slash commands without trigger words

* Fixed clientside handling of errors on AddCommand page

* Minor auth cleanup (#2758)

* Changed EditPostModal to just close if you save without making any changes (#2759)

* Renamed client -> Client in async_client.jsx and fixed eslint warnings (#2756)

* Fixed url in channel info modal (#2755)

* Fixing reported issues

* Moving to version 3 of the apis

* Fixing command unit tests (#2760)

* Adding team admins

* Fixing DM issue

* Fixing eslint error

* Properly set EditPostModal's originalText state in all cases (#2762)

* Update client config check to assume features is defined if server is licensed (#2772)

* Fixing url link

* Fixing issue with websocket crashing when sending messages to different teams

1 files changed, 21 insertions, 25 deletions

diff --git a/webapp/components/file_upload.jsx b/webapp/components/file_upload.jsx
index 8d2ec5ac8..03a8a8128 100644
--- a/webapp/components/file_upload.jsx
+++ b/webapp/components/file_upload.jsx
@@ -4,7 +4,7 @@
 import $ from 'jquery';
 import 'jquery-dragster/jquery.dragster.js';
 import ReactDOM from 'react-dom';
-import * as Client from 'utils/client.jsx';
+import Client from 'utils/web_client.jsx';
 import Constants from 'utils/constants.jsx';
 import ChannelStore from 'stores/channel_store.jsx';
 import * as Utils from 'utils/utils.jsx';
@@ -49,9 +49,9 @@ class FileUpload extends React.Component {
     fileUploadSuccess(channelId, data) {
         this.props.onFileUpload(data.filenames, data.client_ids, channelId);
 
-        var requests = this.state.requests;
+        const requests = JSON.parse(JSON.stringify(this.state.requests));
         for (var j = 0; j < data.client_ids.length; j++) {
-            delete requests[data.client_ids[j]];
+            Reflect.deleteProperty(requests, data.client_ids[j]);
         }
         this.setState({requests});
     }
@@ -64,13 +64,13 @@ class FileUpload extends React.Component {
         // clear any existing errors
         this.props.onUploadError(null);
 
-        var channelId = this.props.channelId || ChannelStore.getCurrentId();
+        const channelId = this.props.channelId || ChannelStore.getCurrentId();
 
-        var uploadsRemaining = Constants.MAX_UPLOAD_FILES - this.props.getFileCount(channelId);
-        var numUploads = 0;
+        const uploadsRemaining = Constants.MAX_UPLOAD_FILES - this.props.getFileCount(channelId);
+        let numUploads = 0;
 
         // keep track of how many files have been too large
-        var tooLargeFiles = [];
+        const tooLargeFiles = [];
 
         for (let i = 0; i < files.length && numUploads < uploadsRemaining; i++) {
             if (files[i].size > Constants.MAX_FILE_SIZE) {
@@ -81,18 +81,15 @@ class FileUpload extends React.Component {
             // generate a unique id that can be used by other components to refer back to this upload
             const clientId = Utils.generateId();
 
-            // prepare data to be uploaded
-            var formData = new FormData();
-            formData.append('channel_id', channelId);
-            formData.append('files', files[i], files[i].name);
-            formData.append('client_ids', clientId);
-
-            var request = Client.uploadFile(formData,
+            const request = Client.uploadFile(files[i],
+                files[i].name,
+                channelId,
+                clientId,
                 this.fileUploadSuccess.bind(this, channelId),
                 this.fileUploadFail.bind(this, clientId)
             );
 
-            var requests = this.state.requests;
+            const requests = this.state.requests;
             requests[clientId] = request;
             this.setState({requests});
 
@@ -231,8 +228,6 @@ class FileUpload extends React.Component {
                         // generate a unique id that can be used by other components to refer back to this file upload
                         var clientId = Utils.generateId();
 
-                        var formData = new FormData();
-                        formData.append('channel_id', channelId);
                         var d = new Date();
                         var hour;
                         if (d.getHours() < 10) {
@@ -247,16 +242,17 @@ class FileUpload extends React.Component {
                             min = String(d.getMinutes());
                         }
 
-                        var name = formatMessage(holders.pasted) + d.getFullYear() + '-' + d.getMonth() + '-' + d.getDate() + ' ' + hour + '-' + min + '.' + ext;
-                        formData.append('files', file, name);
-                        formData.append('client_ids', clientId);
+                        const name = formatMessage(holders.pasted) + d.getFullYear() + '-' + d.getMonth() + '-' + d.getDate() + ' ' + hour + '-' + min + '.' + ext;
 
-                        var request = Client.uploadFile(formData,
+                        const request = Client.uploadFile(file,
+                            name,
+                            channelId,
+                            clientId,
                             self.fileUploadSuccess.bind(self, channelId),
                             self.fileUploadFail.bind(self, clientId)
                         );
 
-                        var requests = self.state.requests;
+                        const requests = self.state.requests;
                         requests[clientId] = request;
                         self.setState({requests});
 
@@ -280,13 +276,13 @@ class FileUpload extends React.Component {
     }
 
     cancelUpload(clientId) {
-        var requests = this.state.requests;
-        var request = requests[clientId];
+        const requests = JSON.parse(JSON.stringify(this.state.requests));
+        const request = requests[clientId];
 
         if (request) {
             request.abort();
 
-            delete requests[clientId];
+            Reflect.deleteProperty(requests, clientId);
             this.setState({requests});
         }
     }