Use Client APIs to resolve URLs (#5148)

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;

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

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 Client.getCustomEmojiImageUrl(emoji.id);
-            return `/api/v3/emoji/${emoji.id}`;
         }
 
         const filename = emoji.filename || emoji.aliases[0];

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(