@contrail/flexplm 1.7.7-alpha.62e4b18 → 1.7.7-alpha.64e9563

package/lib/interfaces/interfaces.d.ts

@@ -6,10 +6,6 @@ export interface FCConfig {
     eventObjectClassParam?: string;
     eventFlexTypePathParam?: string;
     flexplmConnect?: any;
-    'flexplmConnect.sessionReuse.enabled'?: boolean | string;
-    'flexplmConnect.sessionReuse.ttlSeconds'?: number | string;
-    'flexplmConnect.sessionReuse.cookieName'?: string;
-    'flexplmConnect.sessionReuse.retryStatuses'?: number | number[] | string;
     taskId?: string;
     apiHost: string;
     userName(): string;

package/lib/util/flexplm-connect.js

@@ -71,28 +71,14 @@ class FlexPLMConnect {
     /////////////////////////////////////////////////////////////////////////////
     ///////// ET-390 - Session reuse: start
     /////////////////////////////////////////////////////////////////////////////
-    /*
-    private get sessionOptions() {
-      const sessReuseBool = this.config?.flexplmConnect?.sessionReuse;
-      console.info('sessReuseBool value is --> ' + sessReuseBool);
-      console.info('enabled value is --> ' + sessReuseBool?.enabled);
-      return {
-        enabled: sessReuseBool?.enabled === true || String(sessReuseBool?.enabled).toLowerCase() === 'true',
-        ttlMs: (sessReuseBool?.ttlSeconds ?? 900) * 1000,
-        cookieName: sessReuseBool?.cookieName ?? 'JSESSIONID',
-        retryStatuses: (sessReuseBool?.retryStatuses ?? [401, 403]) as number[],
-      };
-    }
-     */
     get sessionOptions() {
-        const cfg = this.config ?? {};
-        const sessReuseEntries = (name) => cfg[`flexplmConnect.sessionReuse.${name}`];
-        const enabled = sessReuseEntries('enabled');
+        const sessReuse = this.config?.flexplmConnect?.sessionReuse;
+        const enabled = sessReuse?.enabled;
         return {
             enabled: enabled === true || String(enabled).toLowerCase() === 'true',
-            ttlMs: parseTtlSeconds(sessReuseEntries('ttlSeconds')) * 1000,
-            cookieName: parseCookieName(sessReuseEntries('cookieName')),
-            retryStatuses: parseRetryStatuses(sessReuseEntries('retryStatuses')),
+            ttlMs: parseTtlSeconds(sessReuse?.ttlSeconds) * 1000,
+            cookieName: parseCookieName(sessReuse?.cookieName),
+            retryStatuses: parseRetryStatuses(sessReuse?.retryStatuses),
         };
     }
     /**
@@ -214,6 +200,7 @@ class FlexPLMConnect {
         }
         // Added for Session reuse - ET-390 - Starts
         const cookie = this.cookieHeader(sessionCookie);
+        console.info('cookie is --> : ' + cookie);
         if (cookie) {
             csrfOptions.headers['Cookie'] = cookie;
         }
@@ -243,7 +230,7 @@ class FlexPLMConnect {
             await wait;
         if (getNewSession) {
             const current = this.getCachedSession();
-            if (!current || current === rejectedCookie)
+            if (rejectedCookie === undefined || !current || current === rejectedCookie)
                 this.clearSession();
         }
         const cached = this.getCachedSession();
@@ -268,6 +255,7 @@ class FlexPLMConnect {
         const csrfEndpoint = this.config.csrfEndpoint;
         const csrfURL = this.config.apiHost + urlContext + csrfEndpoint;
         console.info('csrfURL: ' + csrfURL);
+        console.info('sentCookie is -->: ' + sentCookie);
         // getRequestOptions will be called with additional sentCookie parameter
         const csrfOptions = this.getRequestOptions('GET', sentCookie);
         const response = await fetch(csrfURL, csrfOptions);

package/lib/util/flexplm-connect.spec.js

@@ -39,12 +39,8 @@ const resp = (status, setCookie = [], json = csrfBody) => ({
 });
 let userCounter = 0;
 const uniqueUser = () => 'sess-user-' + (++userCounter);
-// The connector config is flat: keys look like 'flexplmConnect.sessionReuse.enabled'
-const sessionConfig = (user, sessionReuse = { enabled: true }) => {
-    const flat = {};
-    Object.entries(sessionReuse).forEach(([k, v]) => { flat[`flexplmConnect.sessionReuse.${k}`] = v; });
-    return createConfig({ userName: () => user, ...flat });
-};
+// The connector config nests the entries: { flexplmConnect: { sessionReuse: { enabled: true, ... } } }
+const sessionConfig = (user, sessionReuse = { enabled: true }) => createConfig({ userName: () => user, flexplmConnect: { sessionReuse } });
 const fetchMock = () => global.fetch;
 const callHeaders = (i) => fetchMock().mock.calls[i][1].headers;
 const callMethod = (i) => fetchMock().mock.calls[i][1].method;
@@ -610,6 +606,15 @@ describe('FlexPLMConnect session reuse - feature disabled (default)', () => {
         await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: false })).sendToFlexPLM(payload);
         expect(callHeaders(1).Cookie).toBeUndefined();
     });
+    it('should ignore the legacy flat key form', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1'])) // Set-Cookie present but must be ignored
+            .mockResolvedValueOnce(resp(200, [], {}));
+        const cfg = createConfig({ userName: () => u, 'flexplmConnect.sessionReuse.enabled': true });
+        await new flexplm_connect_1.FlexPLMConnect(cfg).sendToFlexPLM(payload);
+        expect(callHeaders(1).Cookie).toBeUndefined();
+    });
 });
 describe('FlexPLMConnect.getRequest session reuse', () => {
     it('should send the cached cookie on image/GET requests', async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/flexplm",
-  "version": "1.7.7-alpha.62e4b18",
+  "version": "1.7.7-alpha.64e9563",
   "description": "Library used for integration with flexplm.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",