Moving javascript driver back to platform (#3613)

webapp/utils/async_client.jsx

@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 import $ from 'jquery';
-import Client from './web_client.jsx';
+import Client from 'client/web_client.jsx';
 import * as GlobalActions from 'actions/global_actions.jsx';
 import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
 import BrowserStore from 'stores/browser_store.jsx';

webapp/utils/channel_intro_messages.jsx

@@ -11,7 +11,7 @@ import UserStore from 'stores/user_store.jsx';
 import TeamStore from 'stores/team_store.jsx';
 import Constants from 'utils/constants.jsx';
 import * as GlobalActions from 'actions/global_actions.jsx';
-import Client from 'utils/web_client.jsx';
+import Client from 'client/web_client.jsx';
 
 import React from 'react';
 import {FormattedMessage, FormattedHTMLMessage, FormattedDate} from 'react-intl';

webapp/utils/post_utils.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import Client from 'utils/web_client.jsx';
+import Client from 'client/web_client.jsx';
 import Constants from 'utils/constants.jsx';
 
 export function isSystemMessage(post) {

webapp/utils/utils.jsx

@@ -11,7 +11,7 @@ import TeamStore from 'stores/team_store.jsx';
 import Constants from 'utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
 import * as AsyncClient from './async_client.jsx';
-import Client from './web_client.jsx';
+import Client from 'client/web_client.jsx';
 
 import {browserHistory} from 'react-router/es6';
 import {FormattedMessage} from 'react-intl';

webapp/utils/web_client.jsx

@@ -1,101 +0,0 @@
-// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import Client from 'mattermost/client.jsx';
-import TeamStore from '../stores/team_store.jsx';
-import BrowserStore from '../stores/browser_store.jsx';
-import * as GlobalActions from 'actions/global_actions.jsx';
-
-import request from 'superagent';
-
-const HTTP_UNAUTHORIZED = 401;
-
-class WebClientClass extends Client {
-    constructor() {
-        super();
-        this.enableLogErrorsToConsole(true);
-        TeamStore.addChangeListener(this.onTeamStoreChanged);
-    }
-
-    onTeamStoreChanged = () => {
-        this.setTeamId(TeamStore.getCurrentId());
-    }
-
-    track = (category, action, label, property, value) => {
-        if (global.window && global.window.analytics) {
-            global.window.analytics.track(action, {category, label, property, value});
-        }
-    }
-
-    trackPage = () => {
-        if (global.window && global.window.analytics) {
-            global.window.analytics.page();
-        }
-    }
-
-    handleError = (err, res) => { // eslint-disable-line no-unused-vars
-        if (err.status === HTTP_UNAUTHORIZED && res.req.url !== '/api/v3/users/login') {
-            GlobalActions.emitUserLoggedOutEvent('/login');
-        }
-    }
-
-    // not sure why but super.login doesn't work if using an () => arrow functions.
-    // I think this might be a webpack issue.
-    webLogin(loginId, password, token, success, error) {
-        this.login(
-            loginId,
-            password,
-            token,
-            (data) => {
-                this.track('api', 'api_users_login_success', '', 'login_id', loginId);
-                BrowserStore.signalLogin();
-
-                if (success) {
-                    success(data);
-                }
-            },
-            (err) => {
-                this.track('api', 'api_users_login_fail', '', 'login_id', loginId);
-                if (error) {
-                    error(err);
-                }
-            }
-        );
-    }
-
-    webLoginByLdap(loginId, password, token, success, error) {
-        this.loginByLdap(
-            loginId,
-            password,
-            token,
-            (data) => {
-                this.track('api', 'api_users_login_success', '', 'login_id', loginId);
-                BrowserStore.signalLogin();
-
-                if (success) {
-                    success(data);
-                }
-            },
-            (err) => {
-                this.track('api', 'api_users_login_fail', '', 'login_id', loginId);
-                if (error) {
-                    error(err);
-                }
-            }
-        );
-    }
-
-    getYoutubeVideoInfo(googleKey, videoId, success, error) {
-        request.get('https://www.googleapis.com/youtube/v3/videos').
-        query({part: 'snippet', id: videoId, key: googleKey}).
-        end((err, res) => {
-            if (err) {
-                return error(err);
-            }
-            return success(res.body);
-        });
-    }
-}
-
-var WebClient = new WebClientClass();
-export default WebClient;

webapp/utils/websocket_client.jsx

@@ -1,7 +0,0 @@
-// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import WebSocketClient from 'mattermost/websocket_client.jsx';
-
-var WebClient = new WebSocketClient();
-export default WebClient;