Merge pull request #26 from svrcekmichal/feature/interceptors-arguments

add getState and dispatch to first interceptor argument

Author: svrcekmichal

.eslintrc

@@ -22,7 +22,8 @@
     "indent": [2, 2, {"SwitchCase": 1}],
     "no-console": 0,
     "no-alert": 0,
-    "max-len":[2,140]
+    "max-len":[2,140],
+    "func-names":0
   },
   "plugins": [
     "import"

src/middleware.js

@@ -6,7 +6,7 @@ function addInterceptor(target, candidate, getState) {
   const successInterceptor = typeof candidate === 'function' ? candidate : candidate.success;
   const errorInterceptor = candidate && candidate.error;
   target.use(successInterceptor && successInterceptor.bind(null, getState),
-             errorInterceptor && errorInterceptor.bind(null, getState));
+    errorInterceptor && errorInterceptor.bind(null, getState));
 }
 
 function bindInterceptors(client, getState, middlewareInterceptors = {}, clientInterceptors = {}) {
@@ -21,40 +21,54 @@ function bindInterceptors(client, getState, middlewareInterceptors = {}, clientI
 export const multiClientMiddleware = (clients, customMiddlewareOptions) => {
   const middlewareOptions = { ...defaultOptions, ...customMiddlewareOptions };
   const setupedClients = {};
-  return ({ getState, dispatch }) => next => action => {
-    if (!middlewareOptions.isAxiosRequest(action)) {
-      return next(action);
-    }
-    const clientName = middlewareOptions.getClientName(action) || middlewareOptions.defaultClientName;
-    if (!clients[clientName]) {
-      throw new Error(`Client with name "${clientName}" has not been defined in middleware`);
-    }
-    if (!setupedClients[clientName]) {
-      const clientOptions = { ...middlewareOptions, ...clients[clientName].options };
-      if (clientOptions.interceptors) {
-        bindInterceptors(clients[clientName].client, getState, middlewareOptions.interceptors, clients[clientName].options.interceptors);
+  return function ({ getState, dispatch }) {
+    const enhancedGetState = function () {
+      console.log(`
+       Warning, getState as function in interceptor will be removed in version 2 of middleware.
+       Stop: interceptor(getState,config) { ... }
+       Do: interceptor({getState}, config) { ... }
+      `);
+      return getState();
+    };
+    enhancedGetState.getState = getState;
+    enhancedGetState.dispatch = dispatch;
+    return next => action => {
+      if (!middlewareOptions.isAxiosRequest(action)) {
+        return next(action);
       }
-      setupedClients[clientName] = {
-        client: clients[clientName].client,
-        options: clientOptions
-      };
-    }
-    const setupedClient = setupedClients[clientName];
-    const actionOptions = { ...setupedClient.options, ...setupedClient.options.getRequestOptions(action) };
-    const [REQUEST] = getActionTypes(action, actionOptions);
-    next({ ...action, type: REQUEST });
-    return setupedClient.client.request(actionOptions.getRequestConfig(action))
-      .then(
-        (response) => {
-          const newAction = actionOptions.onSuccess({ action, next, response, getState, dispatch }, actionOptions);
-          actionOptions.onComplete({ action: newAction, next, getState, dispatch }, actionOptions);
-          return newAction;
-        },
-        (error) => {
-          const newAction = actionOptions.onError({ action, next, error, getState, dispatch }, actionOptions);
-          actionOptions.onComplete({ action: newAction, next, getState, dispatch }, actionOptions);
-          return actionOptions.returnRejectedPromiseOnError ? Promise.reject(newAction) : newAction;
-        });
+      const clientName = middlewareOptions.getClientName(action) || middlewareOptions.defaultClientName;
+      if (!clients[clientName]) {
+        throw new Error(`Client with name "${clientName}" has not been defined in middleware`);
+      }
+      if (!setupedClients[clientName]) {
+        const clientOptions = { ...middlewareOptions, ...clients[clientName].options };
+        if (clientOptions.interceptors) {
+          enhancedGetState.action = action;
+          bindInterceptors(clients[clientName].client, enhancedGetState,
+            middlewareOptions.interceptors, clients[clientName].options.interceptors);
+        }
+        setupedClients[clientName] = {
+          client: clients[clientName].client,
+          options: clientOptions
+        };
+      }
+      const setupedClient = setupedClients[clientName];
+      const actionOptions = { ...setupedClient.options, ...setupedClient.options.getRequestOptions(action) };
+      const [REQUEST] = getActionTypes(action, actionOptions);
+      next({ ...action, type: REQUEST });
+      return setupedClient.client.request(actionOptions.getRequestConfig(action))
+        .then(
+          (response) => {
+            const newAction = actionOptions.onSuccess({ action, next, response, getState, dispatch }, actionOptions);
+            actionOptions.onComplete({ action: newAction, next, getState, dispatch }, actionOptions);
+            return newAction;
+          },
+          (error) => {
+            const newAction = actionOptions.onError({ action, next, error, getState, dispatch }, actionOptions);
+            actionOptions.onComplete({ action: newAction, next, getState, dispatch }, actionOptions);
+            return actionOptions.returnRejectedPromiseOnError ? Promise.reject(newAction) : newAction;
+          });
+    };
   };
 };