@zeniai/client-epic-state 5.1.4-beta4ND → 5.1.4-beta5ND

package/lib/entity/tenant/epic/initEmailConnectOAuthEpic.js

@@ -25,7 +25,12 @@ const defaultNavigate = (url) => {
 const initEmailConnectOAuthEpic = (actions$, _state$, zeniAPI, 
 // Test seam: callers can override to assert intended URL without actually
 // navigating. Default is full-page redirect via window.location.
-navigate = defaultNavigate) => actions$.pipe((0, operators_1.filter)(tenantReducer_1.initEmailConnectOAuth.match), (0, operators_1.switchMap)((action) => zeniAPI
+navigate = defaultNavigate) => actions$.pipe((0, operators_1.filter)(tenantReducer_1.initEmailConnectOAuth.match), 
+// Per-provider cancellation scope — switchMap at the outer level would
+// cancel an in-flight gmail init when an outlook init fires, stranding
+// the gmail provider's `saveConnectorCredentialsStateBySlug` in
+// `In-Progress` forever. groupBy gives each provider its own stream.
+(0, operators_1.groupBy)((action) => action.payload.provider), (0, operators_1.mergeMap)((perProvider$) => perProvider$.pipe((0, operators_1.switchMap)((action) => zeniAPI
     .postAndGetJSON(`${zeniAPI.apiEndPoints.authMicroServiceBaseUrl}/1.0/connectors/email/${action.payload.provider}/init`, { redirect_after_url: action.payload.redirectAfterUrl }, { 'zeni-tenant-id': action.payload.tenantId })
     .pipe((0, operators_1.mergeMap)((response) => {
     if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
@@ -50,5 +55,5 @@ navigate = defaultNavigate) => actions$.pipe((0, operators_1.filter)(tenantReduc
     return (0, rxjs_1.from)([
         (0, tenantReducer_1.initEmailConnectOAuthFailure)(action.payload.tenantId, action.payload.provider, (0, responsePayload_1.createZeniAPIStatus)(message)),
     ]);
-}))));
+}))))));
 exports.initEmailConnectOAuthEpic = initEmailConnectOAuthEpic;

package/lib/esm/entity/tenant/epic/initEmailConnectOAuthEpic.js

@@ -1,5 +1,5 @@
 import { from } from 'rxjs';
-import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { catchError, filter, groupBy, mergeMap, switchMap } from 'rxjs/operators';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../responsePayload';
 import { initEmailConnectOAuth, initEmailConnectOAuthFailure, initEmailConnectOAuthSuccess, } from '../tenantReducer';
 const defaultNavigate = (url) => {
@@ -22,7 +22,12 @@ const defaultNavigate = (url) => {
 export const initEmailConnectOAuthEpic = (actions$, _state$, zeniAPI, 
 // Test seam: callers can override to assert intended URL without actually
 // navigating. Default is full-page redirect via window.location.
-navigate = defaultNavigate) => actions$.pipe(filter(initEmailConnectOAuth.match), switchMap((action) => zeniAPI
+navigate = defaultNavigate) => actions$.pipe(filter(initEmailConnectOAuth.match), 
+// Per-provider cancellation scope — switchMap at the outer level would
+// cancel an in-flight gmail init when an outlook init fires, stranding
+// the gmail provider's `saveConnectorCredentialsStateBySlug` in
+// `In-Progress` forever. groupBy gives each provider its own stream.
+groupBy((action) => action.payload.provider), mergeMap((perProvider$) => perProvider$.pipe(switchMap((action) => zeniAPI
     .postAndGetJSON(`${zeniAPI.apiEndPoints.authMicroServiceBaseUrl}/1.0/connectors/email/${action.payload.provider}/init`, { redirect_after_url: action.payload.redirectAfterUrl }, { 'zeni-tenant-id': action.payload.tenantId })
     .pipe(mergeMap((response) => {
     if (isSuccessResponse(response) && response.data != null) {
@@ -47,4 +52,4 @@ navigate = defaultNavigate) => actions$.pipe(filter(initEmailConnectOAuth.match)
     return from([
         initEmailConnectOAuthFailure(action.payload.tenantId, action.payload.provider, createZeniAPIStatus(message)),
     ]);
-}))));
+}))))));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.1.4-beta4ND",
+  "version": "5.1.4-beta5ND",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",