@contrail/flexplm 1.7.7-alpha.01fb300 → 1.7.7-alpha.1ad98c2

package/lib/util/flexplm-connect.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlexPLMConnect = void 0;
 const app_framework_1 = require("@contrail/app-framework");
-// Module-level on purpose: a new FlexPLMConnect is constructed for every event. Declaring for Session reusing use case.
+// Module-level on purpose: a new FlexPLMConnect is constructed for every event. Declaring for Session resuing use case.
 const sessionCache = new Map();
 // Added for Session reuse - ET-390 - Ends
 class FlexPLMConnect {
@@ -41,6 +41,7 @@ class FlexPLMConnect {
         const cfg = this.config ?? {};
         const sessReuseEntries = (name) => cfg[`flexplmConnect.sessionReuse.${name}`];
         const enabled = sessReuseEntries('enabled');
+        console.info('sessionReuse.enabled value is --> ' + enabled);
         return {
             enabled: enabled === true || String(enabled).toLowerCase() === 'true',
             ttlMs: (sessReuseEntries('ttlSeconds') ?? 900) * 1000,
@@ -62,10 +63,12 @@ class FlexPLMConnect {
             sessionCache.delete(key);
             return undefined;
         }
+        console.info('cachedSessValue.cookie: ' + cachedSessValue.cookie);
         return cachedSessValue.cookie;
     }
     storeSession(cookie) {
         // sliding expiry: Windchill's session timeout is also sliding
+        console.info('cookie: ' + cookie);
         sessionCache.set(this.getSessionKey(), { cookie, expiresAt: Date.now() + this.sessionOptions.ttlMs });
     }
     clearSession() {
@@ -74,6 +77,7 @@ class FlexPLMConnect {
     /** Returns the session cookie value Windchill issued on this response, if any (last one wins). */
     extractSessionCookie(response) {
         const respHeader = response?.headers;
+        console.info('respHeader: ' + respHeader);
         if (!respHeader)
             return undefined;
         let raw = [];
@@ -93,6 +97,7 @@ class FlexPLMConnect {
                 cookieNameMatcher = regexFilter.exec(line);
             }
         }
+        console.info('jSession: ' + jSession);
         return jSession;
     }
     cookieHeader(sessionCookie) {
@@ -119,6 +124,7 @@ class FlexPLMConnect {
         }
         // Added for Session reuse - ET-390 - Starts
         const cookie = this.cookieHeader(sessionCookie);
+        console.info('sessionReuse--cookie --> ' + cookie);
         if (cookie) {
             csrfOptions.headers['Cookie'] = cookie;
         }
@@ -132,6 +138,7 @@ class FlexPLMConnect {
             // Added for Session reuse - ET-390 - Ends
             console.info('csrfOptions: ' + JSON.stringify(logOptions));
         }
+        console.info('csrfOptions --> ' + csrfOptions);
         return csrfOptions;
     }
     /////////////////////////////////////////////////////////////////////////////
@@ -152,6 +159,7 @@ class FlexPLMConnect {
         const csrfOptions = this.getRequestOptions('GET', sentCookie);
         // Added for Session reuse - ET-390 - Ends
         let response = await fetch(csrfURL, csrfOptions);
+        console.info('response.status: ' + response.status);
         // Added for Session reuse - ET-390 - Starts
         // if the response status is 401 or 403, then get a new session id
         if (sentCookie && this.sessionOptions.retryStatuses.includes(response.status)) {
@@ -182,7 +190,9 @@ class FlexPLMConnect {
             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);
+            console.info('sessionCookie: ' + sessionCookie);
+            //ET-390 - adding sessionCookie to the return
             return {
                 nonce_key,
                 nonce,
@@ -311,6 +321,8 @@ class FlexPLMConnect {
                 this.storeSession(cachedCookie);
         }
         // Added for Session reuse - ET-390 - Ends
+        console.info('if loop entry 1: ' + this.sessionOptions.retryStatuses.includes(response.status));
+        console.info('response.status1: ' + response.status);
         if (response.status >= 300) {
             const message = 'Error connecting to FlexPLM:status: ' + response.status;
             console.error(message);

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

@@ -39,12 +39,7 @@ 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 });
-};
+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;

package/package.json

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