diff options
Diffstat (limited to 'webapp/utils')
-rw-r--r-- | webapp/utils/async_client.jsx | 2 | ||||
-rw-r--r-- | webapp/utils/channel_intro_messages.jsx | 2 | ||||
-rw-r--r-- | webapp/utils/post_utils.jsx | 2 | ||||
-rw-r--r-- | webapp/utils/utils.jsx | 2 | ||||
-rw-r--r-- | webapp/utils/web_client.jsx | 101 | ||||
-rw-r--r-- | webapp/utils/websocket_client.jsx | 7 |
6 files changed, 4 insertions, 112 deletions
diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx index 0241db90d..196ced5d9 100644 --- a/webapp/utils/async_client.jsx +++ b/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'; diff --git a/webapp/utils/channel_intro_messages.jsx b/webapp/utils/channel_intro_messages.jsx index 6418615a4..27ce42701 100644 --- a/webapp/utils/channel_intro_messages.jsx +++ b/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'; diff --git a/webapp/utils/post_utils.jsx b/webapp/utils/post_utils.jsx index ee723a246..4bba784cb 100644 --- a/webapp/utils/post_utils.jsx +++ b/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) { diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index 907c01229..a8a93b452 100644 --- a/webapp/utils/utils.jsx +++ b/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'; diff --git a/webapp/utils/web_client.jsx b/webapp/utils/web_client.jsx deleted file mode 100644 index b974ad31f..000000000 --- a/webapp/utils/web_client.jsx +++ /dev/null @@ -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; diff --git a/webapp/utils/websocket_client.jsx b/webapp/utils/websocket_client.jsx deleted file mode 100644 index 135d96466..000000000 --- a/webapp/utils/websocket_client.jsx +++ /dev/null @@ -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; |