diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2017-01-31 23:29:21 +0900 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-01-31 09:29:21 -0500 |
| commit | 7e9cf13aa356f991f48ba0a943bdab9b4d3c9233 (patch) | |
| tree | 11e64fd6b7755ce85e7d2ebcc8adeb8b3f8f331d /webapp | |
| parent | 67739cb516309e06a7cb08cc5807140ac9af9b13 (diff) | |
| download | chat-7e9cf13aa356f991f48ba0a943bdab9b4d3c9233.tar.gz chat-7e9cf13aa356f991f48ba0a943bdab9b4d3c9233.tar.bz2 chat-7e9cf13aa356f991f48ba0a943bdab9b4d3c9233.zip | |
Use Client APIs to resolve URLs (#5148)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/client/test_web_client.jsx | 7 | ||||
| -rw-r--r-- | webapp/client/web_client.jsx | 2 | ||||
| -rw-r--r-- | webapp/stores/emoji_store.jsx | 4 | ||||
| -rw-r--r-- | webapp/webpack.config.js | 1 |
4 files changed, 11 insertions, 3 deletions
diff --git a/webapp/client/test_web_client.jsx b/webapp/client/test_web_client.jsx new file mode 100644 index 000000000..ac8055f9e --- /dev/null +++ b/webapp/client/test_web_client.jsx @@ -0,0 +1,7 @@ +// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +import Client from './client.jsx'; + +var WebClient = new Client(); +export default WebClient; diff --git a/webapp/client/web_client.jsx b/webapp/client/web_client.jsx index 99f30da37..f5d7f6c80 100644 --- a/webapp/client/web_client.jsx +++ b/webapp/client/web_client.jsx @@ -50,7 +50,7 @@ class WebClientClass extends Client { return; } - if (err.status === HTTP_UNAUTHORIZED && res.req.url !== '/api/v3/users/login') { + if (err.status === HTTP_UNAUTHORIZED && res.req.url !== this.getUsersRoute() + '/login') { GlobalActions.emitUserLoggedOutEvent('/login'); } diff --git a/webapp/stores/emoji_store.jsx b/webapp/stores/emoji_store.jsx index a178ff6ae..212583ea8 100644 --- a/webapp/stores/emoji_store.jsx +++ b/webapp/stores/emoji_store.jsx @@ -1,6 +1,7 @@ // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. +import Client from '../client/web_client.jsx'; import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; import Constants from 'utils/constants.jsx'; import EventEmitter from 'events'; @@ -148,8 +149,7 @@ class EmojiStore extends EventEmitter { getEmojiImageUrl(emoji) { if (emoji.id) { - // must match Client.getCustomEmojiImageUrl - return `/api/v3/emoji/${emoji.id}`; + return Client.getCustomEmojiImageUrl(emoji.id); } const filename = emoji.filename || emoji.aliases[0]; diff --git a/webapp/webpack.config.js b/webapp/webpack.config.js index f1742e3ae..ecd2230c4 100644 --- a/webapp/webpack.config.js +++ b/webapp/webpack.config.js @@ -159,6 +159,7 @@ if (TEST) { config.entry = ['babel-polyfill', './root.jsx']; config.target = 'node'; config.externals = [nodeExternals()]; + config.resolve.alias['./client/web_client.jsx'] = path.resolve(__dirname, 'client/test_web_client.jsx'); } else { // For some reason these break mocha. So they go here. config.plugins.push( |