@contrail/flexplm 1.7.7-alpha.99f62a7 → 1.7.7-alpha.c59ab5b

package/lib/interfaces/interfaces.d.ts

@@ -1,15 +1,3 @@
-export interface SessionReuseConfig {
-    enabled?: boolean | string;
-    ttlSeconds?: number | string;
-    cookieName?: string;
-    retryStatuses?: number | number[] | string;
-}
-export interface FlexPLMConnectConfig {
-    staticHeaders?: {
-        [key: string]: string;
-    };
-    sessionReuse?: SessionReuseConfig;
-}
 export interface FCConfig {
     apiKey?: string;
     orgSlug?: string;
@@ -17,7 +5,7 @@ export interface FCConfig {
     configFile?: string;
     eventObjectClassParam?: string;
     eventFlexTypePathParam?: string;
-    flexplmConnect?: FlexPLMConnectConfig;
+    flexplmConnect?: any;
     taskId?: string;
     apiHost: string;
     userName(): string;

package/lib/publish/base-process-publish-assortment.js

@@ -909,7 +909,8 @@ class BaseProcessPublishAssortment {
                 ? itemFamilyChanges.assortmentItemFullChangeMap.get(entityReference)?.item
                 : itemFamilyChanges.itemFamilyObject;
             let seasonalData = await this.getSeasonalData(projectItem);
-            seasonalData = await map_utils_1.MapUtil.applyTransformMap(this.transformMapFile, this.mapFileUtil, seasonalData, 'LCSProductSeasonLink', 'vibe2flex');
+            const productSeasonMapKey = (await type_conversion_utils_1.TypeConversionUtils.getMapKey(this.transformMapFile, this.mapFileUtil, projectItem, type_conversion_utils_1.TypeConversionUtils.VIBE2FLEX_DIRECTION)) || 'LCSProductSeasonLink';
+            seasonalData = await map_utils_1.MapUtil.applyTransformMap(this.transformMapFile, this.mapFileUtil, seasonalData, productSeasonMapKey, 'vibe2flex');
             const LCSProduct = await this.getProductFederation(entityReference, itemToFederatedIdMapping, prodEntityData);
             const isCreatable = await type_conversion_utils_1.TypeConversionUtils.isOutboundCreatableFromEntity(this.transformMapFile, this.mapFileUtil, projectItem, { item: prodEntityData, assortment });
             const eventType = isCreatable ? 'UPSERT_ON_SEASON' : 'UPDATE_ON_SEASON';
@@ -944,7 +945,8 @@ class BaseProcessPublishAssortment {
             }
             const projectItem = this.getProjectItem(itemFamilyChanges, entityReference);
             let seasonalData = await this.getSeasonalData(projectItem);
-            seasonalData = await map_utils_1.MapUtil.applyTransformMap(this.transformMapFile, this.mapFileUtil, seasonalData, 'LCSSKUSeasonLink', 'vibe2flex');
+            const skuSeasonMapKey = (await type_conversion_utils_1.TypeConversionUtils.getMapKey(this.transformMapFile, this.mapFileUtil, projectItem, type_conversion_utils_1.TypeConversionUtils.VIBE2FLEX_DIRECTION)) || 'LCSSKUSeasonLink';
+            seasonalData = await map_utils_1.MapUtil.applyTransformMap(this.transformMapFile, this.mapFileUtil, seasonalData, skuSeasonMapKey, 'vibe2flex');
             const LCSSKU = await this.getSKUFederation(entityReference, itemToFederatedIdMapping, item);
             const isCreatable = await type_conversion_utils_1.TypeConversionUtils.isOutboundCreatableFromEntity(this.transformMapFile, this.mapFileUtil, projectItem, { item, assortment });
             const eventType = isCreatable ? 'UPSERT_ON_SEASON' : 'UPDATE_ON_SEASON';

package/lib/publish/base-process-publish-assortment.spec.js

@@ -1509,6 +1509,9 @@ describe('getEventsForItemFamilyChanges - conditional eventType', () => {
     };
     const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
     const dc = new data_converter_1.DataConverter(config, mapFileUtil);
+    beforeEach(() => {
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getMapKey').mockResolvedValue(null);
+    });
     afterEach(() => {
         jest.restoreAllMocks();
     });
@@ -1705,6 +1708,108 @@ describe('getEventsForItemFamilyChanges - conditional eventType', () => {
         // Verify SKU event called with assortment entity
         expect(type_conversion_utils_1.TypeConversionUtils.isOutboundCreatableFromEntity).toHaveBeenNthCalledWith(2, undefined, mapFileUtil, colorProjectItem, { item: itemData, assortment });
     });
+    it('should use dynamic map key for LCSSKUSeasonLink when getMapKey returns a custom key', async () => {
+        const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
+        const itemFamilyId = 'family123';
+        const colorId = 'color456';
+        const familyItemData = { id: itemFamilyId, identifier: 'FAM-123', itemNumber: 'FAM-123' };
+        const familyProjectItem = { id: 'proj0', updatedOn: '2023-01-15T00:00:00.000Z' };
+        const colorProjectItem = { id: 'proj1', updatedOn: '2023-01-15T00:00:00.000Z' };
+        const assortment = { id: 'assort123', name: 'Fall 2023 Assortment', publishToFlexPLM: true };
+        const seasonFed = { entityReference: 'assortment:assort123', objectClass: 'LCSSeason', flexPLMSeasonName: 'Fall 2023' };
+        const seasonalData = { someData: 'value' };
+        const itemFamilyChanges = new item_family_changes_1.ItemFamilyChanges(itemFamilyId, new Date('2023-01-01T00:00:00.000Z'));
+        itemFamilyChanges.colorUpdates.push(colorId);
+        itemFamilyChanges.assortmentItemFullChangeMap.set(itemFamilyId, { item: familyItemData, projectItem: familyProjectItem });
+        itemFamilyChanges.assortmentItemFullChangeMap.set(colorId, { item: { id: colorId, identifier: 'COLOR-456' }, projectItem: colorProjectItem });
+        jest.spyOn(bppa, 'getAssortment').mockResolvedValue(assortment);
+        jest.spyOn(bppa, 'getProjectItem')
+            .mockReturnValueOnce(familyProjectItem)
+            .mockReturnValueOnce(colorProjectItem);
+        jest.spyOn(bppa, 'getSeasonalData').mockResolvedValue(seasonalData);
+        jest.spyOn(map_utils_1.MapUtil, 'applyTransformMap').mockResolvedValue({ transformedData: 'value' });
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getIdentifierProperties').mockResolvedValue(['identifier']);
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getInformationalProperties').mockResolvedValue([]);
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'isOutboundCreatableFromEntity').mockResolvedValue(false);
+        // First call: product path (return null → falls back to default)
+        // Second call: SKU path (return custom key)
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getMapKey')
+            .mockResolvedValueOnce(null)
+            .mockResolvedValueOnce('LCSSKUSeasonLinkFlexOwned');
+        await bppa.getEventsForItemFamilyChanges(itemFamilyChanges, 'assort123', seasonFed, new Map());
+        expect(map_utils_1.MapUtil.applyTransformMap).toHaveBeenCalledWith(undefined, mapFileUtil, seasonalData, 'LCSSKUSeasonLinkFlexOwned', 'vibe2flex');
+    });
+    it('should fall back to LCSSKUSeasonLink when getMapKey returns null', async () => {
+        const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
+        const itemFamilyId = 'family123';
+        const colorId = 'color456';
+        const familyItemData = { id: itemFamilyId, identifier: 'FAM-123', itemNumber: 'FAM-123' };
+        const familyProjectItem = { id: 'proj0', updatedOn: '2023-01-15T00:00:00.000Z' };
+        const colorProjectItem = { id: 'proj1', updatedOn: '2023-01-15T00:00:00.000Z' };
+        const assortment = { id: 'assort123', name: 'Fall 2023 Assortment', publishToFlexPLM: true };
+        const seasonFed = { entityReference: 'assortment:assort123', objectClass: 'LCSSeason', flexPLMSeasonName: 'Fall 2023' };
+        const seasonalData = { someData: 'value' };
+        const itemFamilyChanges = new item_family_changes_1.ItemFamilyChanges(itemFamilyId, new Date('2023-01-01T00:00:00.000Z'));
+        itemFamilyChanges.colorUpdates.push(colorId);
+        itemFamilyChanges.assortmentItemFullChangeMap.set(itemFamilyId, { item: familyItemData, projectItem: familyProjectItem });
+        itemFamilyChanges.assortmentItemFullChangeMap.set(colorId, { item: { id: colorId, identifier: 'COLOR-456' }, projectItem: colorProjectItem });
+        jest.spyOn(bppa, 'getAssortment').mockResolvedValue(assortment);
+        jest.spyOn(bppa, 'getProjectItem')
+            .mockReturnValueOnce(familyProjectItem)
+            .mockReturnValueOnce(colorProjectItem);
+        jest.spyOn(bppa, 'getSeasonalData').mockResolvedValue(seasonalData);
+        jest.spyOn(map_utils_1.MapUtil, 'applyTransformMap').mockResolvedValue({ transformedData: 'value' });
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getIdentifierProperties').mockResolvedValue(['identifier']);
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getInformationalProperties').mockResolvedValue([]);
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'isOutboundCreatableFromEntity').mockResolvedValue(false);
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getMapKey').mockResolvedValue(null);
+        await bppa.getEventsForItemFamilyChanges(itemFamilyChanges, 'assort123', seasonFed, new Map());
+        expect(map_utils_1.MapUtil.applyTransformMap).toHaveBeenCalledWith(undefined, mapFileUtil, seasonalData, 'LCSSKUSeasonLink', 'vibe2flex');
+    });
+    it('should use dynamic map key for LCSProductSeasonLink when getMapKey returns a custom key', async () => {
+        const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
+        const itemFamilyId = 'family123';
+        const prodEntityData = { id: itemFamilyId, identifier: 'FAM-123', itemNumber: 'FAM-123' };
+        const projectItem = { id: 'proj1', updatedOn: '2023-01-15T00:00:00.000Z' };
+        const assortment = { id: 'assort123', name: 'Fall 2023 Assortment', publishToFlexPLM: true };
+        const seasonFed = { entityReference: 'assortment:assort123', objectClass: 'LCSSeason', flexPLMSeasonName: 'Fall 2023' };
+        const seasonalData = { someData: 'value' };
+        const itemFamilyChanges = new item_family_changes_1.ItemFamilyChanges(itemFamilyId, new Date('2023-01-01T00:00:00.000Z'));
+        itemFamilyChanges.familyUpdate = true;
+        itemFamilyChanges.assortmentItemFullChangeMap.set(itemFamilyId, { item: prodEntityData, projectItem });
+        jest.spyOn(bppa, 'getAssortment').mockResolvedValue(assortment);
+        jest.spyOn(bppa, 'getProjectItem').mockReturnValue(projectItem);
+        jest.spyOn(bppa, 'getSeasonalData').mockResolvedValue(seasonalData);
+        jest.spyOn(map_utils_1.MapUtil, 'applyTransformMap').mockResolvedValue({ transformedData: 'value' });
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getIdentifierProperties').mockResolvedValue(['identifier']);
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getInformationalProperties').mockResolvedValue([]);
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'isOutboundCreatableFromEntity').mockResolvedValue(false);
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getMapKey').mockResolvedValue('LCSProductSeasonLinkCustom');
+        await bppa.getEventsForItemFamilyChanges(itemFamilyChanges, 'assort123', seasonFed, new Map());
+        expect(map_utils_1.MapUtil.applyTransformMap).toHaveBeenCalledWith(undefined, mapFileUtil, seasonalData, 'LCSProductSeasonLinkCustom', 'vibe2flex');
+    });
+    it('should fall back to LCSProductSeasonLink when getMapKey returns null', async () => {
+        const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
+        const itemFamilyId = 'family123';
+        const prodEntityData = { id: itemFamilyId, identifier: 'FAM-123', itemNumber: 'FAM-123' };
+        const projectItem = { id: 'proj1', updatedOn: '2023-01-15T00:00:00.000Z' };
+        const assortment = { id: 'assort123', name: 'Fall 2023 Assortment', publishToFlexPLM: true };
+        const seasonFed = { entityReference: 'assortment:assort123', objectClass: 'LCSSeason', flexPLMSeasonName: 'Fall 2023' };
+        const seasonalData = { someData: 'value' };
+        const itemFamilyChanges = new item_family_changes_1.ItemFamilyChanges(itemFamilyId, new Date('2023-01-01T00:00:00.000Z'));
+        itemFamilyChanges.familyUpdate = true;
+        itemFamilyChanges.assortmentItemFullChangeMap.set(itemFamilyId, { item: prodEntityData, projectItem });
+        jest.spyOn(bppa, 'getAssortment').mockResolvedValue(assortment);
+        jest.spyOn(bppa, 'getProjectItem').mockReturnValue(projectItem);
+        jest.spyOn(bppa, 'getSeasonalData').mockResolvedValue(seasonalData);
+        jest.spyOn(map_utils_1.MapUtil, 'applyTransformMap').mockResolvedValue({ transformedData: 'value' });
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getIdentifierProperties').mockResolvedValue(['identifier']);
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getInformationalProperties').mockResolvedValue([]);
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'isOutboundCreatableFromEntity').mockResolvedValue(false);
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getMapKey').mockResolvedValue(null);
+        await bppa.getEventsForItemFamilyChanges(itemFamilyChanges, 'assort123', seasonFed, new Map());
+        expect(map_utils_1.MapUtil.applyTransformMap).toHaveBeenCalledWith(undefined, mapFileUtil, seasonalData, 'LCSProductSeasonLink', 'vibe2flex');
+    });
 });
 describe('sendToFlexPLM / handleVibeIQFile / sendPublishPayloadEvent', () => {
     const config = {
@@ -1932,6 +2037,7 @@ describe('released family with pre-development options', () => {
         jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getIdentifierProperties').mockResolvedValue(['itemNumber']);
         jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getInformationalProperties').mockResolvedValue([]);
         jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'isOutboundCreatableFromEntity').mockResolvedValue(true);
+        jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getMapKey').mockResolvedValue(null);
     };
     afterEach(() => { jest.restoreAllMocks(); });
     /////////////////////////////////////////////////////////////////////////////

package/lib/util/flexplm-connect.d.ts

@@ -1,16 +1,15 @@
 import { FCConfig, FlexPLMResponseData, PayloadType } from '../interfaces/interfaces';
 export declare class FlexPLMConnect {
     private config;
-    private sessions;
     private vibeEventEndpoint;
     private staticHeaders;
     payloadSendAsArray: boolean;
     constructor(_config: FCConfig, endPoint?: any, payloadAsArray?: any);
-    /** Releases the connection of a rejected response before it is replaced by a retry. */
-    private discardBody;
     private getRequestOptions;
-    getCSRF(getNewSession?: boolean, rejectedCookie?: string): any;
-    private fetchCSRF;
+    getCSRF(): Promise<{
+        nonce_key: any;
+        nonce: any;
+    }>;
     sendRequest(csrf: any, payload: any): Promise<Response>;
     protected processRequest(payload: any): Promise<FlexPLMResponseData>;
     sendToFlexPLM(payload: PayloadType): Promise<FlexPLMResponseData>;

package/lib/util/flexplm-connect.js

@@ -2,23 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlexPLMConnect = void 0;
 const app_framework_1 = require("@contrail/app-framework");
-const flexplm_session_manager_1 = require("./flexplm-session-manager");
-// Cookie values carry the session id: mask them in logs whatever the header-name casing.
-const maskCookieHeaders = (headers) => {
-    if (!headers)
-        return;
-    for (const key of Object.keys(headers)) {
-        if (key.toLowerCase() === 'cookie' && headers[key])
-            headers[key] = '***masked***';
-    }
-};
 class FlexPLMConnect {
     constructor(_config, endPoint = undefined, payloadAsArray = undefined) {
         this.vibeEventEndpoint = '';
         this.staticHeaders = undefined;
         this.payloadSendAsArray = true;
         this.config = _config;
-        this.sessions = new flexplm_session_manager_1.FlexPLMSessionManager(_config);
         this.vibeEventEndpoint = (endPoint)
             ? endPoint
             : this.config.vibeEventEndpoint;
@@ -29,22 +18,10 @@ class FlexPLMConnect {
             this.staticHeaders = this.config?.flexplmConnect?.staticHeaders;
         }
     }
-    // ET-390 - Session reuse
-    /** Releases the connection of a rejected response before it is replaced by a retry. */
-    async discardBody(response) {
-        try {
-            if (typeof response?.body?.cancel === 'function')
-                await response.body.cancel();
-        }
-        catch (e) {
-            // best effort: nothing to do if the body is already consumed or locked
-        }
-    }
     /////////////////////////////////////////////////////////////////////////////
     ///////// Custom getRequestOptions: start
     /////////////////////////////////////////////////////////////////////////////
-    // ET-390 - adding a new parameter sessionCookie to the getRequestOptions function
-    getRequestOptions(method, sessionCookie) {
+    getRequestOptions(method) {
         const csrfOptions = {
             method,
             headers: {
@@ -56,23 +33,9 @@ class FlexPLMConnect {
         if (this.staticHeaders) {
             Object.assign(csrfOptions.headers, this.staticHeaders);
         }
-        // Added for Session reuse - ET-390 - Starts
-        // Merge with a configured static Cookie header (any header-name casing) instead of replacing it.
-        const headers = csrfOptions.headers;
-        const staticCookieKeys = Object.keys(headers).filter(key => key.toLowerCase() === 'cookie');
-        const staticCookie = staticCookieKeys.map(key => headers[key]).join('; ');
-        const cookie = this.sessions.buildCookieHeader(staticCookie, sessionCookie);
-        staticCookieKeys.forEach(key => delete headers[key]);
-        if (cookie) {
-            headers['Cookie'] = cookie;
-        }
-        // Added for Session reuse - ET-390 - Ends
         if (app_framework_1.Logger.isInfoOn()) {
             const logOptions = JSON.parse(JSON.stringify(csrfOptions));
             logOptions['headers']['Authorization'] = logOptions?.headers?.Authorization.substring(0, 9);
-            // Added for Session reuse - ET-390 - Starts
-            maskCookieHeaders(logOptions.headers);
-            // Added for Session reuse - ET-390 - Ends
             console.info('csrfOptions: ' + JSON.stringify(logOptions));
         }
         return csrfOptions;
@@ -80,52 +43,13 @@ class FlexPLMConnect {
     /////////////////////////////////////////////////////////////////////////////
     ///////// Custom getRequestOptions: end
     /////////////////////////////////////////////////////////////////////////////
-    // ET-390 - adding a new parameter getNewSession to the getCSRF function
-    // Whenever a getCSRF is called without getNewSession, the default value of false will be used
-    // rejectedCookie: the cookie that was rejected by the caller, so a refresh already done by a concurrent event is not thrown away
-    async getCSRF(getNewSession = false, rejectedCookie) {
-        // Added for Session reuse - ET-390 - Starts
-        if (!this.sessions.options.enabled)
-            return this.fetchCSRF(undefined);
-        for (let wait = this.sessions.waitForInFlightAcquisition(); wait; wait = this.sessions.waitForInFlightAcquisition())
-            await wait;
-        if (getNewSession) {
-            const current = this.sessions.getCachedSession();
-            if (rejectedCookie === undefined || !current || current === rejectedCookie)
-                this.sessions.clearSession();
-        }
-        const cached = this.sessions.getCachedSession();
-        if (cached) {
-            try {
-                return await this.fetchCSRF(cached);
-            }
-            catch (e) {
-                if (!(e instanceof flexplm_session_manager_1.SessionRejectedError))
-                    throw e;
-                // if the cached cookie is rejected (401/403), drop it and acquire a new session (serialized)
-                if (this.sessions.getCachedSession() === cached)
-                    this.sessions.clearSession();
-                return this.getCSRF();
-            }
-        }
-        return this.sessions.runColdAcquisition(() => this.fetchCSRF(undefined));
-        // Added for Session reuse - ET-390 - Ends
-    }
-    async fetchCSRF(sentCookie) {
+    async getCSRF() {
         const urlContext = this.config.urlContext;
         const csrfEndpoint = this.config.csrfEndpoint;
         const csrfURL = this.config.apiHost + urlContext + csrfEndpoint;
         console.info('csrfURL: ' + csrfURL);
-        // getRequestOptions will be called with additional sentCookie parameter
-        const csrfOptions = this.getRequestOptions('GET', sentCookie);
+        const csrfOptions = this.getRequestOptions('GET');
         const response = await fetch(csrfURL, csrfOptions);
-        // Added for Session reuse - ET-390 - Starts
-        if (sentCookie && this.sessions.options.retryStatuses.includes(response.status)) {
-            console.warn('Cached FlexPLM session rejected on csrf call (status ' + response.status + '). Retrying with a new session.');
-            await this.discardBody(response);
-            throw new flexplm_session_manager_1.SessionRejectedError();
-        }
-        // Added for Session reuse - ET-390 - Ends
         if (response.status >= 300) {
             const message = 'Error connecting to FlexPLM:status: ' + response.status;
             console.error(message);
@@ -134,24 +58,14 @@ class FlexPLMConnect {
             e['httpResponseStatus'] = response.status;
             throw e;
         }
-        // Added for Session reuse - ET-390 - Starts
-        // If the cookie we sent was invalid, Windchill answers with a fresh Set-Cookie --> replace the cache.
-        let sessionCookie = sentCookie;
-        if (this.sessions.options.enabled) {
-            sessionCookie = this.sessions.extractSessionCookie(response) ?? sentCookie;
-            if (sessionCookie)
-                this.sessions.storeSession(sessionCookie, sentCookie);
-        }
-        // Added for Session reuse - ET-390 - Ends
         try {
             const body = await response.json();
             const nonce_key = body.items[0].attributes.nonce_key;
             const nonce = body.items[0].attributes.nonce;
-            // ET-390 - adding sessionCookie to the return
+            console.info('nonce_key: ' + nonce_key);
             return {
                 nonce_key,
-                nonce,
-                sessionCookie,
+                nonce
             };
         }
         catch (e) {
@@ -165,7 +79,7 @@ class FlexPLMConnect {
         if (this.payloadSendAsArray && !Array.isArray(payload)) {
             payload = [payload];
         }
-        const xferOptions = this.getRequestOptions('POST', csrf?.sessionCookie);
+        const xferOptions = this.getRequestOptions('POST');
         xferOptions['body'] = JSON.stringify(payload);
         xferOptions.headers[csrf.nonce_key] = csrf.nonce;
         const urlContext = this.config.urlContext;
@@ -176,7 +90,6 @@ class FlexPLMConnect {
             const logOptions = JSON.parse(JSON.stringify(xferOptions));
             if (logOptions?.headers?.Authorization)
                 logOptions.headers.Authorization = logOptions?.headers?.Authorization.substring(0, 9);
-            maskCookieHeaders(logOptions?.headers);
             if (csrf?.nonce_key)
                 logOptions.headers[csrf.nonce_key] = csrf.nonce ? `***masked(length:${csrf.nonce.length})***` : '***masked(empty)***';
             console.info('csrfOptions: ' + JSON.stringify(logOptions));
@@ -194,22 +107,13 @@ class FlexPLMConnect {
         if (app_framework_1.Logger.isInfoOn()) {
             console.info('payload: ' + JSON.stringify(payload));
         }
-        let csrf = await this.getCSRF();
+        const csrf = await this.getCSRF();
         if (!csrf) {
             const message = 'Failed to get CSRF nonce';
             console.error(message);
             throw new Error(message);
         }
-        /// Added for Session reuse - ET-390 - Starts
-        // const response = await this.sendRequest(csrf, payload);
-        let response = await this.sendRequest(csrf, payload);
-        if (csrf.sessionCookie && this.sessions.options.retryStatuses.includes(response.status)) {
-            console.warn('FlexPLM rejected session/nonce (status ' + response.status + '). Getting a new session and retrying once.');
-            await this.discardBody(response);
-            csrf = await this.getCSRF(true, csrf.sessionCookie);
-            response = await this.sendRequest(csrf, payload);
-        }
-        // Added for Session reuse - ET-390 - Ends
+        const response = await this.sendRequest(csrf, payload);
         const status = response.status;
         if (status >= 300) {
             const message = 'Error sending data to FlexPLM:status: ' + response.status;
@@ -262,35 +166,8 @@ class FlexPLMConnect {
         const urlContext = includeUrlContext ? this.config.urlContext : '';
         const path = urlPath || ('/servlet/rest' + this.vibeEventEndpoint);
         const vibeEventsURL = this.config.apiHost + urlContext + path;
-        // Added for Session reuse - ET-390 - Starts
-        const attempt = async () => {
-            if (!this.sessions.options.enabled) {
-                return { response: await fetch(vibeEventsURL, this.getRequestOptions('GET')), sent: undefined };
-            }
-            for (let wait = this.sessions.waitForInFlightAcquisition(); wait; wait = this.sessions.waitForInFlightAcquisition())
-                await wait;
-            const sent = this.sessions.getCachedSession();
-            const call = async () => {
-                const res = await fetch(vibeEventsURL, this.getRequestOptions('GET', sent));
-                // A rejected cookie must not be stored again; only keep a cookie that was accepted or newly issued.
-                if (!(sent && this.sessions.options.retryStatuses.includes(res.status))) {
-                    const cookie = this.sessions.extractSessionCookie(res) ?? sent;
-                    if (cookie)
-                        this.sessions.storeSession(cookie, sent);
-                }
-                return { response: res, sent };
-            };
-            return sent ? call() : this.sessions.runColdAcquisition(call);
-        };
-        const first = await attempt();
-        let response = first.response;
-        if (first.sent && this.sessions.options.retryStatuses.includes(response.status)) {
-            await this.discardBody(response);
-            if (this.sessions.getCachedSession() === first.sent)
-                this.sessions.clearSession();
-            response = (await attempt()).response;
-        }
-        // Added for Session reuse - ET-390 - Ends
+        const csrfOptions = this.getRequestOptions('GET');
+        const response = await fetch(vibeEventsURL, csrfOptions);
         if (response.status >= 300) {
             const message = 'Error connecting to FlexPLM:status: ' + response.status;
             console.error(message);