Fixed onRequest for fsa actions

klis87 · May 23, 2020 · f53088d · f53088d
1 parent 8935f12
commit f53088d
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/packages/redux-requests/src/middleware/create-send-requests-middleware.js b/packages/redux-requests/src/middleware/create-send-requests-middleware.js
@@ -65,9 +65,19 @@ const maybeCallOnRequestInterceptor = (action, config, store) => {
     config.onRequest &&
     (!action.meta || action.meta.runOnRequest !== false)
   ) {
+    if (action.request) {
+      return {
+        ...action,
+        request: config.onRequest(payload.request, action, store),
+      };
+    }
+
     return {
       ...action,
-      request: config.onRequest(payload.request, action, store),
+      payload: {
+        ...action.payload,
+        request: config.onRequest(payload.request, action, store),
+      },
     };
   }
 
@@ -78,9 +88,19 @@ const maybeCallOnRequestMeta = (action, store) => {
   const payload = getActionPayload(action);
 
   if (action.meta && action.meta.onRequest) {
+    if (action.request) {
+      return {
+        ...action,
+        request: action.meta.onRequest(payload.request, action, store),
+      };
+    }
+
     return {
       ...action,
-      request: action.meta.onRequest(payload.request, action, store),
+      payload: {
+        ...action.payload,
+        request: action.meta.onRequest(payload.request, action, store),
+      },
     };
   }