Merge branch 'master' of github.com:bertho-zero/react-redux-universal-hot-example into axios

Author: bertho-zero

docs/ApiConfig.md

@@ -8,15 +8,14 @@ First things first, you need to add `APIHOST` settings in `package.json`. If you
 
 If the port you use differs between your dev & prod API hosts, you may want to get rid of the `APIPORT` setting, including it right in `APIHOST`. Same with the protocol – if you use HTTP in dev but HTTPS in prod, you may want to include the protocol right in `APIHOST`, and then get rid of the explicit `"http://"` found in the next section.
 
-## Update `ApiClient`
+## Update `apiClient`
 
-Open up `src/helpers/ApiClient.js`. You'll see this line:
+Open up `src/helpers/apiClient.js`. You'll see this line:
 
 ``` javascript
-   if (__SERVER__) {
-     // Prepend host and port of the API server to the path.
-    return 'http://' + config.apiHost + adjustedPath;
-   }
+  const instance = axios.create({
+    baseURL: __SERVER__ ? `http://${config.apiHost}:${config.apiPort}` : '/api'
+  });
 ```
 
 If you added `http://` or `https://` to your APIHOST setting, then you need to remove it here.

package.json

@@ -119,6 +119,7 @@
   },
   "dependencies": {
     "async": "^2.1.4",
+    "axios": "^0.16.2",
     "babel-core": "^6.26.0",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",

src/client.js

@@ -15,7 +15,7 @@ import localForage from 'localforage';
 import { socket, createApp } from 'app';
 import { Provider } from 'components';
 import createStore from './redux/create';
-import ApiClient from './helpers/ApiClient';
+import apiClient from './helpers/apiClient';
 import getRoutes from './routes';
 import isOnline from './utils/isOnline';
 
@@ -24,7 +24,7 @@ const offlinePersistConfig = {
   whitelist: ['auth', 'info', 'chat']
 };
 
-const client = new ApiClient();
+const client = apiClient();
 const app = createApp();
 const restApp = createApp('rest');
 const dest = document.getElementById('content');

src/components/__tests__/InfoBar-test.js

@@ -9,9 +9,9 @@ import { InfoBar } from 'components';
 import { Provider } from 'react-redux';
 import { browserHistory } from 'react-router';
 import createStore from 'redux/create';
-import ApiClient from 'helpers/ApiClient';
+import apiClient from 'helpers/apiClient';
 
-const client = new ApiClient();
+const client = apiClient();
 
 describe('InfoBar', () => {
   const mockStore = {

src/helpers/ApiClient.js

@@ -0,0 +1,29 @@
+import axios from 'axios';
+import config from '../config';
+
+export default function apiClient(req) {
+  const instance = axios.create({
+    baseURL: __SERVER__ ? `http://${config.apiHost}:${config.apiPort}` : '/api'
+  });
+
+  instance.setJwtToken = token => {
+    instance.defaults.headers.common.Authorization = token;
+  };
+
+  instance.interceptors.request.use(
+    conf => {
+      if (__SERVER__ && req.get('cookie')) {
+        conf.headers.Cookie = req.get('cookie');
+      }
+      return conf;
+    },
+    error => Promise.reject(error)
+  );
+
+  instance.interceptors.response.use(
+    response => response.data,
+    error => Promise.reject(error.response ? error.response.data : error)
+  );
+
+  return instance;
+}

src/helpers/apiClient.js

@@ -16,7 +16,7 @@ import createHistory from 'react-router/lib/createMemoryHistory';
 import { Provider } from 'components';
 import config from 'config';
 import createStore from 'redux/create';
-import ApiClient from 'helpers/ApiClient';
+import apiClient from 'helpers/apiClient';
 import Html from 'helpers/Html';
 import getRoutes from 'routes';
 import { createApp } from 'app';
@@ -82,7 +82,7 @@ app.use((req, res) => {
     webpackIsomorphicTools.refresh();
   }
   const providers = {
-    client: new ApiClient(req),
+    client: apiClient(req),
     app: createApp(req),
     restApp: createApp(req)
   };