Use Client APIs to resolve URLs (#5148)

This commit is contained in:
Akihiko Odaki
2017-01-31 23:29:21 +09:00
committed by Harrison Healey
parent 67739cb516
commit 7e9cf13aa3
4 changed files with 11 additions and 3 deletions

View File

@@ -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;

View File

@@ -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');
}

View File

@@ -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];

View File

@@ -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(