@nsshunt/stsoauth2plugin 1.0.64 → 1.0.66

package/dist/stsoauth2plugin.umd.js

@@ -1,6 +1,6 @@
 (function(global2, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("vue"), require("debug"), require("node:worker_threads"), require("@nsshunt/stsutils"), require("@nsshunt/stsvueutils"), require("pinia"), require("@nsshunt/stspublisherserver"), require("node:https"), require("colors"), require("axios"), require("@nsshunt/stsinstrumentation")) : typeof define === "function" && define.amd ? define(["exports", "vue", "debug", "node:worker_threads", "@nsshunt/stsutils", "@nsshunt/stsvueutils", "pinia", "@nsshunt/stspublisherserver", "node:https", "colors", "axios", "@nsshunt/stsinstrumentation"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory(global2["@nsshunt/stsoauth2plugin"] = {}, global2.vue, global2.debug, global2.worker_threads, global2.stsutils, global2.stsvueutils, global2.pinia, global2.stspublisherserver, global2.https, null, global2.axios, global2.stsinstrumentation));
-})(this, function(exports2, vue, Debug, wt, stsutils, stsvueutils, pinia, stspublisherserver, https, colors, axios, stsinstrumentation) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("vue"), require("node:worker_threads"), require("@nsshunt/stsutils"), require("@nsshunt/stsvueutils"), require("pinia"), require("@nsshunt/stspublisherserver"), require("node:https"), require("colors"), require("axios"), require("@nsshunt/stsinstrumentation")) : typeof define === "function" && define.amd ? define(["exports", "vue", "node:worker_threads", "@nsshunt/stsutils", "@nsshunt/stsvueutils", "pinia", "@nsshunt/stspublisherserver", "node:https", "colors", "axios", "@nsshunt/stsinstrumentation"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory(global2["@nsshunt/stsoauth2plugin"] = {}, global2.vue, global2.worker_threads, global2.stsutils, global2.stsvueutils, global2.pinia, global2.stspublisherserver, global2.https, null, global2.axios, global2.stsinstrumentation));
+})(this, function(exports2, vue, wt, stsutils, stsvueutils, pinia, stspublisherserver, https, colors, axios, stsinstrumentation) {
   "use strict";var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => {
@@ -38,7 +38,7 @@ var __privateMethod = (obj, member, method) => {
   return method;
 };
 
-  var _crypto, _router, _cUtils, _qParams, _STORAGE_AUTHORIZE_OPTIONS_KEY, _STORAGE_SESSION_KEY, _aic, _options, _messages, _oauth2ManagerPort, _messageId, _messageHandlers, _messageTimeout, _worker, _transactionStore, _operationSemaphore, _maxSemaphoreRetries, _semaphoreRetrySleep, _ProcessMessageResponse, _PostMessage, _HandleLogEvent, _HandleUpdateInstrumentEvent, _GetStore, _HandleErrorEvent, _HandleAuthenticateEvent, _SetupRoute, _clientSessionStore, _cUtils2, _qParams2, _STORAGE_SESSION_KEY2, _oauthWorkerPort, _options2, _httpsAgent, _logger, _LogDebugMessage, LogDebugMessage_fn, _LogInfoMessage, LogInfoMessage_fn, _LogErrorMessage, LogErrorMessage_fn, _HandleAuthenticateEvent2, _HandleErrorEvent2, _LogMessage, _GetAccessToken, _GetCookies, _UpdateInstrument, _ProcessCommand, _RestoreSession, _Authorize, _HandleRedirect, _GetTokenFromBroker, _GetToken, _RefreshToken, _Logout;
+  var _crypto, _router, _cUtils, _qParams, _STORAGE_AUTHORIZE_OPTIONS_KEY, _STORAGE_SESSION_KEY, _aic, _options, _messages, _oauth2ManagerPort, _messageId, _messageHandlers, _messageTimeout, _worker, _transactionStore, _operationSemaphore, _maxSemaphoreRetries, _semaphoreRetrySleep, _LogDebugMessage, LogDebugMessage_fn, _LogInfoMessage, LogInfoMessage_fn, _LogErrorMessage, LogErrorMessage_fn, _ProcessMessageResponse, _PostMessage, _HandleLogEvent, _HandleUpdateInstrumentEvent, _GetStore, _HandleErrorEvent, _HandleAuthenticateEvent, _SetupRoute, _clientSessionStore, _cUtils2, _qParams2, _STORAGE_SESSION_KEY2, _oauthWorkerPort, _options2, _httpsAgent, _logger, _LogDebugMessage2, LogDebugMessage_fn2, _LogInfoMessage2, LogInfoMessage_fn2, _LogErrorMessage2, LogErrorMessage_fn2, _HandleAuthenticateEvent2, _HandleErrorEvent2, _LogMessage, _GetAccessToken, _GetCookies, _UpdateInstrument, _ProcessCommand, _RestoreSession, _Authorize, _HandleRedirect, _GetTokenFromBroker, _GetToken, _RefreshToken, _Logout;
   function _interopNamespaceDefault(e) {
     const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
     if (e) {
@@ -2546,15 +2546,12 @@ var __privateMethod = (obj, member, method) => {
     }
     */
   });
-  let debug;
-  if (isNode) {
-    debug = Debug(`proc:${process.pid}:stsoauth2manager.ts`);
-  } else {
-    debug = Debug(`proc:0:stsoauth2manager.ts`);
-  }
   class STSOAuth2Manager {
     // ms
     constructor(app, options) {
+      __privateAdd(this, _LogDebugMessage);
+      __privateAdd(this, _LogInfoMessage);
+      __privateAdd(this, _LogErrorMessage);
       // eslint-disable-next-line  @typescript-eslint/no-explicit-any
       __privateAdd(this, _router, null);
       __privateAdd(this, _cUtils, new CryptoUtils());
@@ -2579,7 +2576,7 @@ var __privateMethod = (obj, member, method) => {
       __privateAdd(this, _semaphoreRetrySleep, 50);
       __privateAdd(this, _ProcessMessageResponse, (data) => {
         const messageResponse = data;
-        debug(chalk$1.yellow(`STSOAuth2Manager:#ProcessMessageResponse: message data = [${JSON.stringify(messageResponse)}]`));
+        __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.yellow(`STSOAuth2Manager:#ProcessMessageResponse: message data = [${JSON.stringify(messageResponse)}]`));
         if (messageResponse.messageId === -1) {
           switch (messageResponse.command) {
             case IOauth2ListenerCommand.AUTHENTICATE_EVENT:
@@ -2616,10 +2613,10 @@ var __privateMethod = (obj, member, method) => {
           __privateGet(this, _messageHandlers)[message.messageId] = (response) => {
             clearTimeout(timeout);
             delete __privateGet(this, _messageHandlers)[message.messageId];
-            debug(chalk$1.yellow(`STSOAuth2Manager:#PostMessage: resolve callback response= [${JSON.stringify(response)}]`));
+            __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.yellow(`STSOAuth2Manager:#PostMessage: resolve callback response= [${JSON.stringify(response)}]`));
             resolve(response);
           };
-          debug(chalk$1.yellow(`STSOAuth2Manager:#PostMessage: posting message = [${JSON.stringify(message)}]`));
+          __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.yellow(`STSOAuth2Manager:#PostMessage: posting message = [${JSON.stringify(message)}]`));
           __privateGet(this, _oauth2ManagerPort).postMessage(message);
         });
       });
@@ -2627,7 +2624,7 @@ var __privateMethod = (obj, member, method) => {
         if (__privateGet(this, _aic)) {
           __privateGet(this, _aic).LogEx(message);
         }
-        debug(message);
+        __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, message);
       });
       // UpdateInstrument = (instrumentName: Gauge, telemetry: InstrumentBaseTelemetry): void => {
       __privateAdd(this, _HandleUpdateInstrumentEvent, (instrumentName, telemetry) => {
@@ -2663,14 +2660,14 @@ var __privateMethod = (obj, member, method) => {
         }
       });
       __privateAdd(this, _SetupRoute, (app, router) => {
-        debug(chalk$1.gray(`STSOAuth2Manager:#SetupRoute`));
+        __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.gray(`STSOAuth2Manager:#SetupRoute`));
         router.beforeEach(async (to, from, next) => {
           const oAuth2Manager = app.config.globalProperties.$sts[STSOAuth2ManagerPluginKey];
-          debug(chalk$1.gray(`beforeEach: from: [${from.path}], to: [${to.path}]`));
+          __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.gray(`beforeEach: from: [${from.path}], to: [${to.path}]`));
           if (__privateGet(this, _GetStore).call(this).LoggedIn === false) {
-            console.log(`Not logged in`);
+            __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, `Not logged in`);
             if (to.path.localeCompare(`${__privateGet(this, _options).uriBase}authorize`) === 0) {
-              console.log(`to = ${__privateGet(this, _options).uriBase}authorize`);
+              __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, `to = ${__privateGet(this, _options).uriBase}authorize`);
               next();
               return;
             } else if (to.path.localeCompare(`${__privateGet(this, _options).uriBase}consent`) === 0) {
@@ -2697,9 +2694,9 @@ var __privateMethod = (obj, member, method) => {
             }
             const str = to.query;
             if (str[stsutils.OAuth2ParameterType.CODE] || str[stsutils.OAuth2ParameterType.ERROR]) {
-              debug(chalk$1.magenta(`STSOAuth2Manager:#SetupRoute:Processing redirect: [${JSON.stringify(str)}]`));
+              __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`STSOAuth2Manager:#SetupRoute:Processing redirect: [${JSON.stringify(str)}]`));
               const retVal = await oAuth2Manager.HandleRedirect(str);
-              debug(chalk$1.magenta(`STSOAuth2Manager:#SetupRoute:Redirect result: [${retVal}]`));
+              __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`STSOAuth2Manager:#SetupRoute:Redirect result: [${retVal}]`));
               if (retVal) {
                 next({
                   path: `${__privateGet(this, _options).uriBase}`,
@@ -2714,11 +2711,11 @@ var __privateMethod = (obj, member, method) => {
                 return;
               }
             }
-            debug(`STSOAuth2Manager:#SetupRoute:Restoring session`);
+            __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, `STSOAuth2Manager:#SetupRoute:Restoring session`);
             const sessionRestored = await oAuth2Manager.RestoreSession();
-            debug(`STSOAuth2Manager:#SetupRoute:Session restored: [${sessionRestored}]`);
+            __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, `STSOAuth2Manager:#SetupRoute:Session restored: [${sessionRestored}]`);
             if (sessionRestored !== true) {
-              debug(`STSOAuth2Manager:#SetupRoute:Session not restored - need to authorize`);
+              __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, `STSOAuth2Manager:#SetupRoute:Session not restored - need to authorize`);
               oAuth2Manager.Authorize();
               next();
               return;
@@ -2755,7 +2752,7 @@ var __privateMethod = (obj, member, method) => {
             throw new Error(`STSOAuth2Manager:ExecuteRefreshToken:maxSemaphoreRetries: [${__privateGet(this, _maxSemaphoreRetries)}] exceeded.`);
           }
           await stsutils.Sleep(__privateGet(this, _semaphoreRetrySleep));
-          debug(chalk$1.cyan(`STSOAuth2Manager:ExecuteRefreshToken:locked by operationSemaphore, retry count: [${retryCount}]`));
+          __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.cyan(`STSOAuth2Manager:ExecuteRefreshToken:locked by operationSemaphore, retry count: [${retryCount}]`));
           return await this.ExecuteRefreshToken(retryCount + 1);
         } else {
           __privateSet(this, _operationSemaphore, true);
@@ -2771,12 +2768,12 @@ var __privateMethod = (obj, member, method) => {
       });
       __publicField(this, "RestoreSession", async () => {
         try {
-          debug(`STSOAuth2Manager:RestoreSession:postMessage: [${IOauth2ListenerCommand.RESTORE_SESSION}]`);
+          __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, `STSOAuth2Manager:RestoreSession:postMessage: [${IOauth2ListenerCommand.RESTORE_SESSION}]`);
           const response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.RESTORE_SESSION });
-          debug(`STSOAuth2Manager:RestoreSession:response: [${JSON.stringify(response.payload)}]`);
+          __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, `STSOAuth2Manager:RestoreSession:response: [${JSON.stringify(response.payload)}]`);
           return response.payload;
         } catch (error) {
-          console.log(chalk$1.red(`RestoreSession Error: ${error}`));
+          __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`RestoreSession Error: ${error}`));
           return false;
         }
       });
@@ -2791,18 +2788,18 @@ var __privateMethod = (obj, member, method) => {
             return response.payload.authorizeOptionsClientCopy;
           }
         } catch (error) {
-          console.log(chalk$1.red(`Authorize Error: ${error}`));
+          __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`Authorize Error: ${error}`));
         }
         return {};
       });
       __publicField(this, "HandleRedirect", async (queryVars) => {
         try {
-          debug(chalk$1.magenta(`STSOAuth2Manager:HandleRedirect`));
+          __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`STSOAuth2Manager:HandleRedirect`));
           let response = null;
           if (queryVars[stsutils.OAuth2ParameterType.CODE]) {
             const authorizeOptions = __privateGet(this, _transactionStore).get(__privateGet(this, _STORAGE_AUTHORIZE_OPTIONS_KEY));
             __privateGet(this, _transactionStore).remove(__privateGet(this, _STORAGE_AUTHORIZE_OPTIONS_KEY));
-            debug(chalk$1.magenta(`STSOAuth2Manager:HandleRedirect: sending HANDLE_REDIRECT command`));
+            __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`STSOAuth2Manager:HandleRedirect: sending HANDLE_REDIRECT command`));
             response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.HANDLE_REDIRECT, payload: {
               queryVars,
               authorizeOptions
@@ -2810,10 +2807,10 @@ var __privateMethod = (obj, member, method) => {
           } else {
             response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.HANDLE_REDIRECT, payload: queryVars });
           }
-          debug(chalk$1.magenta(`STSOAuth2Manager:HandleRedirect: HANDLE_REDIRECT response: [${JSON.stringify(response)}]`));
+          __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`STSOAuth2Manager:HandleRedirect: HANDLE_REDIRECT response: [${JSON.stringify(response)}]`));
           return response.payload;
         } catch (error) {
-          console.log(chalk$1.red(`HandleRedirect Error: ${error}`));
+          __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`HandleRedirect Error: ${error}`));
           return false;
         }
       });
@@ -2822,7 +2819,7 @@ var __privateMethod = (obj, member, method) => {
           const response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.LOGOUT });
           return response.payload;
         } catch (error) {
-          console.log(chalk$1.red(`Logout Error: ${error}`));
+          __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`Logout Error: ${error}`));
           return false;
         }
       });
@@ -2832,7 +2829,7 @@ var __privateMethod = (obj, member, method) => {
           const response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.LOGOUT });
           return response.payload;
         } catch (error) {
-          console.log(chalk$1.red(`InvokeExternalAPI Error: ${error}`));
+          __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`InvokeExternalAPI Error: ${error}`));
           return null;
         }
       });
@@ -2863,10 +2860,10 @@ var __privateMethod = (obj, member, method) => {
       }
       if (!isNode) {
         __privateGet(this, _worker).onmessage = (data) => {
-          console.log(chalk$1.green(`this.#worker.onmessage = [${data}]`));
+          __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, chalk$1.green(`this.#worker.onmessage = [${data}]`));
         };
-        __privateGet(this, _worker).onerror = function(error) {
-          console.log(chalk$1.green(`this.#worker.onerror = [${JSON.stringify(error)}]`));
+        __privateGet(this, _worker).onerror = (error) => {
+          __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, chalk$1.green(`this.#worker.onerror = [${JSON.stringify(error)}]`));
         };
       }
       let workerMessage;
@@ -2923,6 +2920,18 @@ var __privateMethod = (obj, member, method) => {
   _operationSemaphore = new WeakMap();
   _maxSemaphoreRetries = new WeakMap();
   _semaphoreRetrySleep = new WeakMap();
+  _LogDebugMessage = new WeakSet();
+  LogDebugMessage_fn = function(message) {
+    __privateGet(this, _options).logger.debug(message);
+  };
+  _LogInfoMessage = new WeakSet();
+  LogInfoMessage_fn = function(message) {
+    __privateGet(this, _options).logger.info(message);
+  };
+  _LogErrorMessage = new WeakSet();
+  LogErrorMessage_fn = function(message) {
+    __privateGet(this, _options).logger.error(message);
+  };
   _ProcessMessageResponse = new WeakMap();
   _PostMessage = new WeakMap();
   _HandleLogEvent = new WeakMap();
@@ -2995,11 +3004,11 @@ var __privateMethod = (obj, member, method) => {
   class STSOAuth2Worker {
     constructor(workerPort, options, logger) {
       // eslint-disable-next-line  @typescript-eslint/no-explicit-any
-      __privateAdd(this, _LogDebugMessage);
+      __privateAdd(this, _LogDebugMessage2);
       // eslint-disable-next-line  @typescript-eslint/no-explicit-any
-      __privateAdd(this, _LogInfoMessage);
+      __privateAdd(this, _LogInfoMessage2);
       // eslint-disable-next-line  @typescript-eslint/no-explicit-any
-      __privateAdd(this, _LogErrorMessage);
+      __privateAdd(this, _LogErrorMessage2);
       //#storageManager = null;
       __privateAdd(this, _clientSessionStore, void 0);
       __privateAdd(this, _cUtils2, new CryptoUtils());
@@ -3099,7 +3108,7 @@ var __privateMethod = (obj, member, method) => {
       __publicField(this, "SetupListener", () => {
         __privateGet(this, _oauthWorkerPort).onmessage = async (data) => {
           const auth2ListenerMessage = data.data;
-          __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, `STSOAuth2Worker:SetupListener:onmessage: [${auth2ListenerMessage.command}]`);
+          __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, `STSOAuth2Worker:SetupListener:onmessage: [${auth2ListenerMessage.command}]`);
           switch (auth2ListenerMessage.command) {
             case IOauth2ListenerCommand.RESTORE_SESSION:
               __privateGet(this, _ProcessCommand).call(this, auth2ListenerMessage, await __privateGet(this, _RestoreSession).call(this));
@@ -3141,12 +3150,12 @@ var __privateMethod = (obj, member, method) => {
         const sessionData = __privateGet(this, _clientSessionStore).get(__privateGet(this, _STORAGE_SESSION_KEY2));
         if (sessionData) {
           restoredSessionData = sessionData.tokenResponse;
-          __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, "Session restored from client storage.");
+          __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, "Session restored from client storage.");
           __privateGet(this, _LogMessage).call(this, "Session restored from client storage.");
         } else {
           const url = `${__privateGet(this, _options2).brokerendpoint}:${__privateGet(this, _options2).brokerport}${__privateGet(this, _options2).brokerapiroot}/session`;
-          __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, "RestoreSession");
-          __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, url);
+          __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, "RestoreSession");
+          __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, url);
           __privateGet(this, _LogMessage).call(this, "RestoreSession.");
           __privateGet(this, _LogMessage).call(this, url);
           try {
@@ -3163,7 +3172,7 @@ var __privateMethod = (obj, member, method) => {
               // Ensure cookies are passed to the service
               timeout: __privateGet(this, _options2).timeout
             };
-            __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`#RestoreSession:session request detail: [${JSON.stringify(rConfig)}]`));
+            __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.magenta(`#RestoreSession:session request detail: [${JSON.stringify(rConfig)}]`));
             if (isNode) {
               rConfig.httpsAgent = __privateGet(this, _httpsAgent);
             }
@@ -3178,24 +3187,24 @@ var __privateMethod = (obj, member, method) => {
                   newSessionData.brokerCookie = retVal.headers["set-cookie"];
                 }
                 __privateGet(this, _clientSessionStore).set(__privateGet(this, _STORAGE_SESSION_KEY2), newSessionData);
-                __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, "Session restored from server side cookie.");
+                __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, "Session restored from server side cookie.");
               } else {
-                __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, `Could not restore previous session. No restoredSessionData available.`);
-                __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, JSON.stringify(retVal.data));
+                __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, `Could not restore previous session. No restoredSessionData available.`);
+                __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, JSON.stringify(retVal.data));
               }
             } else {
-              __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, "Could not restore previous session:-");
-              __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, JSON.stringify(retVal.data));
+              __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, "Could not restore previous session:-");
+              __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, JSON.stringify(retVal.data));
             }
           } catch (error) {
-            __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, "Could not restore previous session (error state):-");
-            __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, error);
-            __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, JSON.stringify(error));
+            __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, "Could not restore previous session (error state):-");
+            __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, error);
+            __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, JSON.stringify(error));
           }
         }
         if (restoredSessionData !== null) {
           __privateGet(this, _HandleAuthenticateEvent2).call(this, restoredSessionData.id_token);
-          __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, "Refreshing tokens ...");
+          __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, "Refreshing tokens ...");
           return await __privateGet(this, _RefreshToken).call(this);
         } else {
           __privateGet(this, _HandleAuthenticateEvent2).call(this, null);
@@ -3203,7 +3212,7 @@ var __privateMethod = (obj, member, method) => {
         }
       });
       __privateAdd(this, _Authorize, async () => {
-        __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, "Authorize ...");
+        __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, "Authorize ...");
         const client_id = __privateGet(this, _options2).client_id;
         const nonce = __privateGet(this, _cUtils2).CreateRandomString();
         const response_type = [AuthorizeOptionsResponseType.CODE];
@@ -3227,9 +3236,9 @@ var __privateMethod = (obj, member, method) => {
         };
         const authorizeOptionsClientCopy = { ...authorizeOptions };
         const url = `${__privateGet(this, _options2).authorizeendpoint}:${__privateGet(this, _options2).authorizeport}${__privateGet(this, _options2).authorizeapiroot}${__privateGet(this, _options2).authorizeapi}?${__privateGet(this, _qParams2).CreateQueryParams(authorizeOptions)}`;
-        __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, url);
+        __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, url);
         authorizeOptions.code_verifier = code_verifier;
-        __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, `Authorize:authorizeOptions: [${JSON.stringify(authorizeOptions)}]`);
+        __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, `Authorize:authorizeOptions: [${JSON.stringify(authorizeOptions)}]`);
         return {
           url,
           authorizeOptions,
@@ -3240,29 +3249,29 @@ var __privateMethod = (obj, member, method) => {
       __privateAdd(this, _HandleRedirect, async (payload) => {
         const queryVars = payload.queryVars;
         const authorizeOptions = payload.authorizeOptions;
-        __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`#HandleRedirect: HandleRedirect`));
-        __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`#HandleRedirect: HandleRedirect:Query Vars: [${JSON.stringify(queryVars)}]`));
+        __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.magenta(`#HandleRedirect: HandleRedirect`));
+        __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.magenta(`#HandleRedirect: HandleRedirect:Query Vars: [${JSON.stringify(queryVars)}]`));
         if (queryVars[stsutils.OAuth2ParameterType.CODE]) {
           const response = queryVars;
-          __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, `authorizeOptions from transaction state: [${JSON.stringify(authorizeOptions)}]`);
+          __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, `authorizeOptions from transaction state: [${JSON.stringify(authorizeOptions)}]`);
           const redirectState = response.state;
           const authorizeOptionsState = authorizeOptions.state;
           if (authorizeOptionsState.localeCompare(redirectState) === 0) {
-            __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, chalk$1.green("redirected state (from queryVars) matched previously saved transaction authorizeOptions state"));
+            __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, chalk$1.green("redirected state (from queryVars) matched previously saved transaction authorizeOptions state"));
             return await __privateGet(this, _GetToken).call(this, authorizeOptions, response);
           } else {
-            __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red("redirected state (from queryVars) did NOT match previously saved transaction authorizeOptions state"));
-            __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`authorizeOptionsState: [${authorizeOptionsState}]`));
-            __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`redirectState: [${redirectState}]`));
+            __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red("redirected state (from queryVars) did NOT match previously saved transaction authorizeOptions state"));
+            __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red(`authorizeOptionsState: [${authorizeOptionsState}]`));
+            __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red(`redirectState: [${redirectState}]`));
             __privateGet(this, _HandleErrorEvent2).call(this, { message: "State un-matched" });
             return false;
           }
         } else if (queryVars[stsutils.OAuth2ParameterType.ERROR]) {
-          __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`State un-matched (1)`));
+          __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red(`State un-matched (1)`));
           __privateGet(this, _HandleErrorEvent2).call(this, { message: "State un-matched" });
           return false;
         } else {
-          __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`State un-matched (2)`));
+          __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red(`State un-matched (2)`));
           __privateGet(this, _HandleErrorEvent2).call(this, { message: "State un-matched" });
           return false;
         }
@@ -3288,7 +3297,7 @@ var __privateMethod = (obj, member, method) => {
           */
       // Get access_token, refresh_token and id_token using OAuth2 Authorization Code Flow
       __privateAdd(this, _GetTokenFromBroker, async (authorizationCodeFlowParameters) => {
-        __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`#GetTokenFromBroker`));
+        __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.magenta(`#GetTokenFromBroker`));
         __privateGet(this, _clientSessionStore).remove(__privateGet(this, _STORAGE_SESSION_KEY2));
         const url = `${__privateGet(this, _options2).brokerendpoint}:${__privateGet(this, _options2).brokerport}${__privateGet(this, _options2).brokerapiroot}/token`;
         try {
@@ -3300,15 +3309,15 @@ var __privateMethod = (obj, member, method) => {
             // Ensure cookies are passed to the service
             timeout: __privateGet(this, _options2).timeout
           };
-          __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`#GetTokenFromBroker: request config: [${JSON.stringify(rConfig)}]`));
+          __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.magenta(`#GetTokenFromBroker: request config: [${JSON.stringify(rConfig)}]`));
           if (isNode) {
             rConfig.httpsAgent = __privateGet(this, _httpsAgent);
           }
-          __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`#GetTokenFromBroker: axios API call`));
+          __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.magenta(`#GetTokenFromBroker: axios API call`));
           const retVal = await axios(rConfig);
-          __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`#GetTokenFromBroker: axios API call result: [${retVal.status}]`));
+          __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.magenta(`#GetTokenFromBroker: axios API call result: [${retVal.status}]`));
           if (retVal.status === StatusCodes.OK) {
-            __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`#GetTokenFromBroker: storing tokens`));
+            __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.magenta(`#GetTokenFromBroker: storing tokens`));
             const tokenResponse = retVal.data;
             __privateGet(this, _HandleAuthenticateEvent2).call(this, tokenResponse.id_token);
             const newSessionData = {
@@ -3320,26 +3329,26 @@ var __privateMethod = (obj, member, method) => {
             __privateGet(this, _clientSessionStore).set(__privateGet(this, _STORAGE_SESSION_KEY2), newSessionData);
             return true;
           } else if (retVal.status === StatusCodes.UNAUTHORIZED) {
-            __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`#GetTokenFromBroker: NOT storing tokens, status: [${retVal.status}]`));
+            __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.magenta(`#GetTokenFromBroker: NOT storing tokens, status: [${retVal.status}]`));
             __privateGet(this, _HandleAuthenticateEvent2).call(this, null);
             return false;
           } else {
-            __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`#GetTokenFromBroker: NOT storing tokens (general error 1), status: [${retVal.status}]`));
+            __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.magenta(`#GetTokenFromBroker: NOT storing tokens (general error 1), status: [${retVal.status}]`));
             __privateGet(this, _HandleAuthenticateEvent2).call(this, null);
-            __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red("Could not obtain access_token from token end-point:-"));
-            __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(JSON.stringify(retVal.data)));
+            __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red("Could not obtain access_token from token end-point:-"));
+            __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red(JSON.stringify(retVal.data)));
             return false;
           }
         } catch (error) {
-          __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`#GetTokenFromBroker: NOT storing tokens (general error 2), status: [${error}]`));
+          __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red(`#GetTokenFromBroker: NOT storing tokens (general error 2), status: [${error}]`));
           __privateGet(this, _HandleAuthenticateEvent2).call(this, null);
           return false;
         }
       });
       // Get access_token, refresh_token and id_token using OAuth2 Authorization Code Flow
       __privateAdd(this, _GetToken, async (authorizeOptions, authorizeResponse) => {
-        __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, "#GetToken");
-        __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, authorizeResponse);
+        __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, "#GetToken");
+        __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, authorizeResponse);
         __privateGet(this, _clientSessionStore).remove(__privateGet(this, _STORAGE_SESSION_KEY2));
         const authorizationCodeFlowParameters = {
           client_id: __privateGet(this, _options2).client_id,
@@ -3377,10 +3386,10 @@ var __privateMethod = (obj, member, method) => {
         }
       */
       __privateAdd(this, _RefreshToken, async () => {
-        __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.cyan(`STSOAuth2Worker:#RefreshToken:start`));
+        __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.cyan(`STSOAuth2Worker:#RefreshToken:start`));
         const sessionData = __privateGet(this, _clientSessionStore).get(__privateGet(this, _STORAGE_SESSION_KEY2));
         if (sessionData) {
-          __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.cyan(`STSOAuth2Worker:#RefreshToken:sessionData: [${JSON.stringify(sessionData)}]`));
+          __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.cyan(`STSOAuth2Worker:#RefreshToken:sessionData: [${JSON.stringify(sessionData)}]`));
           const currentSessionData = sessionData.tokenResponse;
           const refreshFlowParameters = {
             client_id: __privateGet(this, _options2).client_id,
@@ -3390,7 +3399,7 @@ var __privateMethod = (obj, member, method) => {
           };
           return await __privateGet(this, _GetTokenFromBroker).call(this, refreshFlowParameters);
         } else {
-          __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`STSOAuth2Worker:#RefreshToken:sessionData not found within clientSessionStore`));
+          __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red(`STSOAuth2Worker:#RefreshToken:sessionData not found within clientSessionStore`));
           return false;
         }
       });
@@ -3400,18 +3409,18 @@ var __privateMethod = (obj, member, method) => {
       // clear session storage
       // clear all state from $store
       __privateAdd(this, _Logout, async () => {
-        __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, "Logout");
+        __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, "Logout");
         const url = `${__privateGet(this, _options2).brokerendpoint}:${__privateGet(this, _options2).brokerport}${__privateGet(this, _options2).brokerapiroot}/logout`;
-        __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, url);
+        __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, url);
         const sessionData = __privateGet(this, _clientSessionStore).get(__privateGet(this, _STORAGE_SESSION_KEY2));
         if (sessionData) {
           const currentSessionData = sessionData.tokenResponse;
           const refresh_token = currentSessionData.refresh_token;
-          __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, refresh_token);
+          __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, refresh_token);
           const decodedRefreshToken = jwtDecode(refresh_token);
-          __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, decodedRefreshToken);
+          __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, decodedRefreshToken);
           const sessionId = decodedRefreshToken.sts_session;
-          __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, sessionId);
+          __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, sessionId);
           __privateGet(this, _clientSessionStore).remove(__privateGet(this, _STORAGE_SESSION_KEY2));
           __privateGet(this, _HandleAuthenticateEvent2).call(this, null);
           try {
@@ -3425,7 +3434,7 @@ var __privateMethod = (obj, member, method) => {
               // Ensure cookies are passed to the service
               timeout: __privateGet(this, _options2).timeout
             };
-            __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.magenta(`#Logout: request config: [${rConfig}]`));
+            __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.magenta(`#Logout: request config: [${rConfig}]`));
             if (isNode) {
               rConfig.httpsAgent = __privateGet(this, _httpsAgent);
             }
@@ -3433,27 +3442,27 @@ var __privateMethod = (obj, member, method) => {
             if (retVal.data.status === StatusCodes.OK) {
               return true;
             } else {
-              __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red("Error during logout (1: server side)"));
-              __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(JSON.stringify(retVal.data)));
+              __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red("Error during logout (1: server side)"));
+              __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red(JSON.stringify(retVal.data)));
               return false;
             }
           } catch (error) {
-            __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red("Error during logout (2: server side)"));
-            __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(error));
-            __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(JSON.stringify(error)));
+            __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red("Error during logout (2: server side)"));
+            __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red(error));
+            __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red(JSON.stringify(error)));
             return false;
           }
         } else {
-          __privateMethod(this, _LogInfoMessage, LogInfoMessage_fn).call(this, "Error during logout. Could not restore session from session storage.");
+          __privateMethod(this, _LogInfoMessage2, LogInfoMessage_fn2).call(this, "Error during logout. Could not restore session from session storage.");
           return false;
         }
       });
       __privateSet(this, _options2, options);
       __privateSet(this, _logger, logger);
-      __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, `STSOAuth2Worker:constructor:#options: [${JSON.stringify(__privateGet(this, _options2))}]`);
+      __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, `STSOAuth2Worker:constructor:#options: [${JSON.stringify(__privateGet(this, _options2))}]`);
       __privateSet(this, _clientSessionStore, new stsvueutils.ClientStorageFactory({ clientStorageType: stsvueutils.ClientStorageType.MEMORY_STORAGE, usePrefix: false }).GetStorage());
       __privateSet(this, _oauthWorkerPort, workerPort);
-      __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, `STSOAuth2Worker:constructor:#oauthWorkerPort: [${JSON.stringify(__privateGet(this, _oauthWorkerPort))}]`);
+      __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, `STSOAuth2Worker:constructor:#oauthWorkerPort: [${JSON.stringify(__privateGet(this, _oauthWorkerPort))}]`);
       if (isNode && __privateGet(this, _options2).agentOptions) {
         __privateSet(this, _httpsAgent, new https.Agent({
           keepAlive: __privateGet(this, _options2).agentOptions.keepAlive,
@@ -3479,16 +3488,16 @@ var __privateMethod = (obj, member, method) => {
   _options2 = new WeakMap();
   _httpsAgent = new WeakMap();
   _logger = new WeakMap();
-  _LogDebugMessage = new WeakSet();
-  LogDebugMessage_fn = function(message) {
+  _LogDebugMessage2 = new WeakSet();
+  LogDebugMessage_fn2 = function(message) {
     __privateGet(this, _logger).debug(message);
   };
-  _LogInfoMessage = new WeakSet();
-  LogInfoMessage_fn = function(message) {
+  _LogInfoMessage2 = new WeakSet();
+  LogInfoMessage_fn2 = function(message) {
     __privateGet(this, _logger).info(message);
   };
-  _LogErrorMessage = new WeakSet();
-  LogErrorMessage_fn = function(message) {
+  _LogErrorMessage2 = new WeakSet();
+  LogErrorMessage_fn2 = function(message) {
     __privateGet(this, _logger).error(message);
   };
   _HandleAuthenticateEvent2 = new WeakMap();