From fb71d8e353d8da952c13d5d215f0d14598f8f095 Mon Sep 17 00:00:00 2001 From: AthanasiosKoumpouras Date: Sun, 10 Dec 2017 02:54:04 +0000 Subject: [PATCH 1/3] wrong params --- src/middleware.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/middleware.js b/src/middleware.js index b1b8631..02ccd31 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -77,8 +77,8 @@ export const multiClientMiddleware = (clients, customMiddlewareOptions) => { }; }; -export default (client, customMiddlewareOptions, customClientOptions) => { +export default (clients, customMiddlewareOptions, customClientOptions) => { const middlewareOptions = { ...defaultOptions, ...customMiddlewareOptions }; const options = customClientOptions || {}; - return multiClientMiddleware({ [middlewareOptions.defaultClientName]: { client, options } }, middlewareOptions); + return multiClientMiddleware(clients, middlewareOptions); }; From e299b21f47496e6b872d685056ee085a27510fee Mon Sep 17 00:00:00 2001 From: AthanasiosKoumpouras Date: Wed, 20 Dec 2017 15:19:06 +0000 Subject: [PATCH 2/3] Add action interceptors --- src/middleware.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/middleware.js b/src/middleware.js index 02ccd31..5ab49e2 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -39,14 +39,15 @@ export const multiClientMiddleware = (clients, customMiddlewareOptions) => { if (!setupedClients[clientName]) { const clientOptions = { ...middlewareOptions, ...clients[clientName].options }; - if (clientOptions.interceptors) { - const middlewareInterceptors = middlewareOptions.interceptors; - const clientInterceptors = clients[clientName].options && clients[clientName].options.interceptors; - const injectToInterceptor = { getState, dispatch, getSourceAction }; - bindInterceptors(clients[clientName].client, injectToInterceptor, middlewareInterceptors, clientInterceptors); + var actionOptions = action.payload.options || {}; + var middlewareInterceptors = middlewareOptions.interceptors; + var clientInterceptors = clients[clientName].options && clients[clientName].options.interceptors; + var actionInterceptors = actionOptions.interceptors || {}; + clientInterceptors = Object.assign(clientInterceptors, actionInterceptors); + var injectToInterceptor = { getState: getState, dispatch: dispatch, getSourceAction: getSourceAction }; + bindInterceptors(clients[clientName].client, injectToInterceptor, middlewareInterceptors, clientInterceptors); } - setupedClients[clientName] = { client: clients[clientName].client, options: clientOptions From 028546f3769b6657b776a68498fdd7979e943a92 Mon Sep 17 00:00:00 2001 From: Athanasios Koumpouras Date: Sun, 21 Jan 2018 16:24:35 +0000 Subject: [PATCH 3/3] Makevariable local --- src/middleware.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/middleware.js b/src/middleware.js index 5ab49e2..4fdde88 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -40,11 +40,11 @@ export const multiClientMiddleware = (clients, customMiddlewareOptions) => { if (!setupedClients[clientName]) { const clientOptions = { ...middlewareOptions, ...clients[clientName].options }; if (clientOptions.interceptors) { - var actionOptions = action.payload.options || {}; + let actionOptions = action.payload.options || {}; var middlewareInterceptors = middlewareOptions.interceptors; var clientInterceptors = clients[clientName].options && clients[clientName].options.interceptors; var actionInterceptors = actionOptions.interceptors || {}; - clientInterceptors = Object.assign(clientInterceptors, actionInterceptors); + clientInterceptors = Object.assign(clientInterceptors, actionInterceptors); var injectToInterceptor = { getState: getState, dispatch: dispatch, getSourceAction: getSourceAction }; bindInterceptors(clients[clientName].client, injectToInterceptor, middlewareInterceptors, clientInterceptors); }