@nsshunt/stsoauth2plugin 1.0.138 → 1.0.140

package/dist/stsoauth2plugin.mjs

@@ -1,23 +1,3 @@
-var __defProp = Object.defineProperty;
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-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) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
-var __privateWrapper = (obj, member, setter, getter) => ({
-  set _(value) {
-    __privateSet(obj, member, value, setter);
-  },
-  get _() {
-    return __privateGet(obj, member, getter);
-  }
-});
-var _router, _STORAGE_AUTHORIZE_OPTIONS_KEY, _aic, _options, _oauth2ManagerPort, _messageId, _messageHandlers, _messageTimeout, _worker, _transactionStore, _operationSemaphore, _maxSemaphoreRetries, _semaphoreRetrySleep, _STSOAuth2Manager_instances, LogDebugMessage_fn, LogInfoMessage_fn, LogErrorMessage_fn, _ProcessMessageResponse, _PostMessage, _HandleLogEvent, _HandleUpdateInstrumentEvent, _GetStore, _HandleErrorEvent, _HandleAuthenticateEvent, _SetupRoute, _crypto, _clientSessionStore, _cUtils, _qParams, _STORAGE_SESSION_KEY, _oauthWorkerPort, _options2, _logger, _agentManager, _STSOAuth2Worker_instances, LogDebugMessage_fn2, LogInfoMessage_fn2, LogErrorMessage_fn2, _HandleAuthenticateEvent2, _HandleErrorEvent2, _LogMessage, _GetAccessToken, _GetCookies, _UpdateInstrument, _ProcessCommand, _RestoreSession, _Authorize, _HandleRedirect, _GetTokenFromBroker, _GetToken, _RefreshToken, _Logout;
 import { inject } from "vue";
 import * as wt from "node:worker_threads";
 import { OAuth2ParameterType, Sleep, AgentManager, STSAxiosConfig } from "@nsshunt/stsutils";
@@ -1619,311 +1599,48 @@ const STSOauth2Store = defineStore("__sts__STSOauth2Store", {
   */
 });
 class STSOAuth2Manager {
+  #router = null;
+  #STORAGE_AUTHORIZE_OPTIONS_KEY = "authorize_options.stsmda.com.au";
+  #aic = null;
+  #options;
+  #oauth2ManagerPort;
+  #messageId = 0;
+  #messageHandlers = {};
+  // keyed by messageId
+  #messageTimeout = 1e4;
+  #worker;
+  #transactionStore;
+  // Transient transaction data used to establish a session via OAuth2 authorize handshake
+  #operationSemaphore = false;
+  #maxSemaphoreRetries = 100;
+  // 100 retries, i.e. allow 100 x 50 = 5000ms to unblock
+  #semaphoreRetrySleep = 50;
   // ms
   constructor(app, options) {
-    __privateAdd(this, _STSOAuth2Manager_instances);
-    __privateAdd(this, _router, null);
-    __privateAdd(this, _STORAGE_AUTHORIZE_OPTIONS_KEY, "authorize_options.stsmda.com.au");
-    __privateAdd(this, _aic, null);
-    __privateAdd(this, _options);
-    __privateAdd(this, _oauth2ManagerPort);
-    __privateAdd(this, _messageId, 0);
-    __privateAdd(this, _messageHandlers, {});
-    // keyed by messageId
-    __privateAdd(this, _messageTimeout, 1e4);
-    __privateAdd(this, _worker);
-    __privateAdd(this, _transactionStore);
-    // Transient transaction data used to establish a session via OAuth2 authorize handshake
-    __privateAdd(this, _operationSemaphore, false);
-    __privateAdd(this, _maxSemaphoreRetries, 100);
-    // 100 retries, i.e. allow 100 x 50 = 5000ms to unblock
-    __privateAdd(this, _semaphoreRetrySleep, 50);
-    __privateAdd(this, _ProcessMessageResponse, (data) => {
-      const messageResponse = data;
-      __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, chalk.yellow(`STSOAuth2Manager:#ProcessMessageResponse: message data = [${JSON.stringify(messageResponse)}]`));
-      if (messageResponse.messageId === -1) {
-        switch (messageResponse.command) {
-          case IOauth2ListenerCommand.AUTHENTICATE_EVENT:
-            __privateGet(this, _HandleAuthenticateEvent).call(this, messageResponse.payload);
-            break;
-          case IOauth2ListenerCommand.ERROR:
-            __privateGet(this, _HandleErrorEvent).call(this, messageResponse.payload);
-            break;
-          case IOauth2ListenerCommand.LOG:
-            __privateGet(this, _HandleLogEvent).call(this, messageResponse.payload);
-            break;
-          case IOauth2ListenerCommand.UPDATE_INSTRUMENT:
-            __privateGet(this, _HandleUpdateInstrumentEvent).call(this, messageResponse.payload.instrumentName, messageResponse.payload.telemetry);
-            break;
-          default:
-            throw new Error(`ProcessMessageResponse command [${messageResponse.command}] not valid.`);
-        }
-      } else {
-        const callBack = __privateGet(this, _messageHandlers)[messageResponse.messageId];
-        if (callBack) {
-          callBack(messageResponse);
-        } else {
-          throw new Error(`Message: [${messageResponse.messageId}] does not exists in callBacks.`);
-        }
-      }
-    });
-    __privateAdd(this, _PostMessage, (message) => {
-      message.messageId = __privateWrapper(this, _messageId)._++;
-      return new Promise((resolve, reject) => {
-        const timeout = setTimeout(() => {
-          delete __privateGet(this, _messageHandlers)[message.messageId];
-          reject(`Message: [${message.messageId}] timeout error after: [${__privateGet(this, _messageTimeout)}] ms.`);
-        }, __privateGet(this, _messageTimeout));
-        __privateGet(this, _messageHandlers)[message.messageId] = (response) => {
-          clearTimeout(timeout);
-          delete __privateGet(this, _messageHandlers)[message.messageId];
-          __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, chalk.yellow(`STSOAuth2Manager:#PostMessage: resolve callback response= [${JSON.stringify(response)}]`));
-          resolve(response);
-        };
-        __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, chalk.yellow(`STSOAuth2Manager:#PostMessage: posting message = [${JSON.stringify(message)}]`));
-        __privateGet(this, _oauth2ManagerPort).postMessage(message);
-      });
-    });
-    __privateAdd(this, _HandleLogEvent, (message) => {
-      if (__privateGet(this, _aic)) {
-        __privateGet(this, _aic).LogEx(message);
-      }
-      __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, message);
-    });
-    // UpdateInstrument = (instrumentName: Gauge, telemetry: InstrumentBaseTelemetry): void => {
-    __privateAdd(this, _HandleUpdateInstrumentEvent, (instrumentName, telemetry) => {
-      if (__privateGet(this, _aic)) {
-        __privateGet(this, _aic).UpdateInstrument(instrumentName, telemetry);
-      }
-    });
-    __privateAdd(this, _GetStore, () => {
-      return STSOauth2Store(__privateGet(this, _options).pinia);
-    });
-    // Will come from message channel
-    __privateAdd(this, _HandleErrorEvent, (error) => {
-      if (isNode) ;
-      else {
-        __privateGet(this, _GetStore).call(this).UpdateError({
-          // Authorize applications store
-          message: error
-        });
-        setTimeout(() => {
-          __privateGet(this, _router).replace(`${__privateGet(this, _options).uriBase}error`);
-        }, 0);
-      }
-    });
-    __privateAdd(this, _HandleAuthenticateEvent, (id_token) => {
-      if (isNode) ;
-      else {
-        if (__privateGet(this, _options).authenticateEvent) {
-          __privateGet(this, _options).authenticateEvent(id_token);
-        }
-        __privateGet(this, _GetStore).call(this).UpdateIdToken(id_token);
-      }
-    });
-    __privateAdd(this, _SetupRoute, (app, router) => {
-      __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, chalk.gray(`STSOAuth2Manager:#SetupRoute`));
-      router.beforeEach(async (to, from, next) => {
-        const oAuth2Manager = app.config.globalProperties.$sts[STSOAuth2ManagerPluginKey];
-        __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, chalk.gray(`beforeEach: from: [${from.path}], to: [${to.path}]`));
-        if (__privateGet(this, _GetStore).call(this).LoggedIn === false) {
-          __privateMethod(this, _STSOAuth2Manager_instances, LogInfoMessage_fn).call(this, `Not logged in`);
-          if (to.path.localeCompare(`${__privateGet(this, _options).uriBase}authorize`) === 0) {
-            __privateMethod(this, _STSOAuth2Manager_instances, LogInfoMessage_fn).call(this, `to = ${__privateGet(this, _options).uriBase}authorize`);
-            next();
-            return;
-          } else if (to.path.localeCompare(`${__privateGet(this, _options).uriBase}consent`) === 0) {
-            if (__privateGet(this, _GetStore).call(this).id_token) {
-              next();
-              return;
-            }
-          }
-          if (to.path.localeCompare(`${__privateGet(this, _options).uriBase}logout`) === 0) {
-            next();
-            return;
-          }
-          if (to.path.localeCompare(`${__privateGet(this, _options).uriBase}error`) === 0) {
-            next();
-            return;
-          }
-          if (to.path.localeCompare(`${__privateGet(this, _options).uriBase}config`) === 0) {
-            next();
-            return;
-          }
-          if (to.path.localeCompare(`${__privateGet(this, _options).uriBase}redirected`) === 0) {
-            next();
-            return;
-          }
-          const str = to.query;
-          if (str[OAuth2ParameterType.CODE] || str[OAuth2ParameterType.ERROR]) {
-            __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, chalk.magenta(`STSOAuth2Manager:#SetupRoute:Processing redirect: [${JSON.stringify(str)}]`));
-            const retVal = await oAuth2Manager.HandleRedirect(str);
-            __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, chalk.magenta(`STSOAuth2Manager:#SetupRoute:Redirect result: [${retVal}]`));
-            if (retVal) {
-              next({
-                path: `${__privateGet(this, _options).uriBase}`,
-                replace: true
-              });
-              return;
-            } else {
-              next({
-                path: `${__privateGet(this, _options).uriBase}error`,
-                replace: true
-              });
-              return;
-            }
-          }
-          __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, `STSOAuth2Manager:#SetupRoute:Restoring session`);
-          const sessionRestored = await oAuth2Manager.RestoreSession();
-          __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, `STSOAuth2Manager:#SetupRoute:Session restored: [${sessionRestored}]`);
-          if (sessionRestored !== true) {
-            __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, `STSOAuth2Manager:#SetupRoute:Session not restored - need to authorize`);
-            oAuth2Manager.Authorize();
-            next();
-            return;
-          } else {
-            next(`${__privateGet(this, _options).uriBase}`);
-            return;
-          }
-        } else {
-          if (to.path.localeCompare(`${__privateGet(this, _options).uriBase}consent`) === 0) {
-            next(`${__privateGet(this, _options).uriBase}`);
-            return;
-          }
-          if (to.path.localeCompare(`${__privateGet(this, _options).uriBase}authorize`) === 0) {
-            next(`${__privateGet(this, _options).uriBase}`);
-            return;
-          }
-          if (to.path.localeCompare(`${__privateGet(this, _options).uriBase}logout`) === 0) {
-            next(`${__privateGet(this, _options).uriBase}`);
-            return;
-          }
-          next();
-        }
-      });
-    });
-    //@@ this needs to be re-implemented so that access_token never leaves the auth worker
-    __publicField(this, "GetAccessToken", async () => {
-      const response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.ACCESS_TOKEN });
-      return response.payload;
-    });
-    // Update operation protected using operationSemaphore. This may occur when using workers and/or multiple async fetch operations.
-    __publicField(this, "ExecuteRefreshToken", async (retryCount = 0) => {
-      if (__privateGet(this, _operationSemaphore) === true) {
-        if (retryCount > __privateGet(this, _maxSemaphoreRetries)) {
-          throw new Error(`STSOAuth2Manager:ExecuteRefreshToken:maxSemaphoreRetries: [${__privateGet(this, _maxSemaphoreRetries)}] exceeded.`);
-        }
-        await Sleep(__privateGet(this, _semaphoreRetrySleep));
-        __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, chalk.cyan(`STSOAuth2Manager:ExecuteRefreshToken:locked by operationSemaphore, retry count: [${retryCount}]`));
-        return await this.ExecuteRefreshToken(retryCount + 1);
-      } else {
-        __privateSet(this, _operationSemaphore, true);
-        const response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.EXECUTE_REFRESH_TOKEN });
-        __privateSet(this, _operationSemaphore, false);
-        return response.payload;
-      }
-    });
-    __publicField(this, "GetCookies", async () => {
-      const response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.COOKIES });
-      return response.payload;
-    });
-    __publicField(this, "RestoreSession", async () => {
-      try {
-        __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, `STSOAuth2Manager:RestoreSession:postMessage: [${IOauth2ListenerCommand.RESTORE_SESSION}]`);
-        const response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.RESTORE_SESSION });
-        __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, `STSOAuth2Manager:RestoreSession:response: [${JSON.stringify(response.payload)}]`);
-        return response.payload;
-      } catch (error) {
-        __privateMethod(this, _STSOAuth2Manager_instances, LogErrorMessage_fn).call(this, chalk.red(`RestoreSession Error: ${error}`));
-        return false;
-      }
-    });
-    __publicField(this, "Authorize", async () => {
-      try {
-        const response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.AUTHORIZE });
-        __privateGet(this, _transactionStore).set(__privateGet(this, _STORAGE_AUTHORIZE_OPTIONS_KEY), response.payload.authorizeOptions);
-        const url = response.payload.url;
-        if (!isNode) {
-          window.location.replace(url);
-        } else {
-          return response.payload.authorizeOptionsClientCopy;
-        }
-      } catch (error) {
-        __privateMethod(this, _STSOAuth2Manager_instances, LogErrorMessage_fn).call(this, chalk.red(`Authorize Error: ${error}`));
-      }
-      return {};
-    });
-    __publicField(this, "HandleRedirect", async (queryVars) => {
-      try {
-        __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, chalk.magenta(`STSOAuth2Manager:HandleRedirect`));
-        let response = null;
-        if (queryVars[OAuth2ParameterType.CODE]) {
-          const authorizeOptions = __privateGet(this, _transactionStore).get(__privateGet(this, _STORAGE_AUTHORIZE_OPTIONS_KEY));
-          __privateGet(this, _transactionStore).remove(__privateGet(this, _STORAGE_AUTHORIZE_OPTIONS_KEY));
-          __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, chalk.magenta(`STSOAuth2Manager:HandleRedirect: sending HANDLE_REDIRECT command`));
-          response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.HANDLE_REDIRECT, payload: {
-            queryVars,
-            authorizeOptions
-          } });
-        } else {
-          response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.HANDLE_REDIRECT, payload: queryVars });
-        }
-        __privateMethod(this, _STSOAuth2Manager_instances, LogDebugMessage_fn).call(this, chalk.magenta(`STSOAuth2Manager:HandleRedirect: HANDLE_REDIRECT response: [${JSON.stringify(response)}]`));
-        return response.payload;
-      } catch (error) {
-        __privateMethod(this, _STSOAuth2Manager_instances, LogErrorMessage_fn).call(this, chalk.red(`HandleRedirect Error: ${error}`));
-        return false;
-      }
-    });
-    __publicField(this, "Logout", async () => {
-      try {
-        const response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.LOGOUT });
-        return response.payload;
-      } catch (error) {
-        __privateMethod(this, _STSOAuth2Manager_instances, LogErrorMessage_fn).call(this, chalk.red(`Logout Error: ${error}`));
-        return false;
-      }
-    });
-    __publicField(this, "InvokeExternalAPI", async () => {
-      try {
-        const response = await __privateGet(this, _PostMessage).call(this, { command: IOauth2ListenerCommand.LOGOUT });
-        return response.payload;
-      } catch (error) {
-        __privateMethod(this, _STSOAuth2Manager_instances, LogErrorMessage_fn).call(this, chalk.red(`InvokeExternalAPI Error: ${error}`));
-        return null;
-      }
-    });
-    __publicField(this, "LoggedIn", () => {
-      try {
-        return __privateGet(this, _GetStore).call(this).LoggedIn;
-      } catch (error) {
-        return false;
-      }
-    });
-    __privateSet(this, _options, options);
+    this.#options = options;
     if (!isNode) {
       if (app.config.globalProperties.$sts[STSInstrumentControllerPluginKey]) {
         const STSInstrumentController = app.config.globalProperties.$sts[STSInstrumentControllerPluginKey];
-        __privateSet(this, _aic, STSInstrumentController);
+        this.#aic = STSInstrumentController;
       }
-      __privateSet(this, _router, app.config.globalProperties.$router);
+      this.#router = app.config.globalProperties.$router;
     }
     if (isNode) {
-      __privateSet(this, _transactionStore, new ClientStorageFactory({ clientStorageType: ClientStorageType.MEMORY_STORAGE, usePrefix: false }).GetStorage());
+      this.#transactionStore = new ClientStorageFactory({ clientStorageType: ClientStorageType.MEMORY_STORAGE, usePrefix: false }).GetStorage();
     } else {
-      __privateSet(this, _transactionStore, new ClientStorageFactory({ clientStorageType: ClientStorageType.SESSION_STORAGE, usePrefix: false }).GetStorage());
+      this.#transactionStore = new ClientStorageFactory({ clientStorageType: ClientStorageType.SESSION_STORAGE, usePrefix: false }).GetStorage();
     }
-    if (__privateGet(this, _options).workerFactory) {
-      __privateSet(this, _worker, __privateGet(this, _options).workerFactory());
+    if (this.#options.workerFactory) {
+      this.#worker = this.#options.workerFactory();
     } else {
       throw new Error(`STSOAuth2Manager:constructor: Cannot init STSOAuth2Manager - this.#options.workerFactory not specified`);
     }
     if (!isNode) {
-      __privateGet(this, _worker).onmessage = (data) => {
-        __privateMethod(this, _STSOAuth2Manager_instances, LogInfoMessage_fn).call(this, chalk.green(`this.#worker.onmessage = [${data}]`));
+      this.#worker.onmessage = (data) => {
+        this.#LogInfoMessage(chalk.green(`this.#worker.onmessage = [${data}]`));
       };
-      __privateGet(this, _worker).onerror = (error) => {
-        __privateMethod(this, _STSOAuth2Manager_instances, LogInfoMessage_fn).call(this, chalk.green(`this.#worker.onerror = [${JSON.stringify(error)}]`));
+      this.#worker.onerror = (error) => {
+        this.#LogInfoMessage(chalk.green(`this.#worker.onerror = [${JSON.stringify(error)}]`));
       };
     }
     let workerMessage;
@@ -1934,14 +1651,14 @@ class STSOAuth2Manager {
         port2: oauth2WorkerPort
         // worker port
       } = new wt.MessageChannel();
-      __privateSet(this, _oauth2ManagerPort, oauth2ManagerPort);
+      this.#oauth2ManagerPort = oauth2ManagerPort;
       workerMessage = {
         workerPort: oauth2WorkerPort,
-        options: __privateGet(this, _options).workerOptions
+        options: this.#options.workerOptions
       };
-      __privateGet(this, _worker).postMessage(workerMessage, [oauth2WorkerPort]);
-      __privateGet(this, _oauth2ManagerPort).on("message", (payload) => {
-        __privateGet(this, _ProcessMessageResponse).call(this, payload);
+      this.#worker.postMessage(workerMessage, [oauth2WorkerPort]);
+      this.#oauth2ManagerPort.on("message", (payload) => {
+        this.#ProcessMessageResponse(payload);
       }).unref();
     } else {
       const {
@@ -1950,50 +1667,290 @@ class STSOAuth2Manager {
         port2: oauth2WorkerPort
         // worker port
       } = new MessageChannel();
-      __privateSet(this, _oauth2ManagerPort, oauth2ManagerPort);
+      this.#oauth2ManagerPort = oauth2ManagerPort;
       workerMessage = {
         workerPort: oauth2WorkerPort,
-        options: __privateGet(this, _options).workerOptions
+        options: this.#options.workerOptions
       };
-      __privateGet(this, _worker).postMessage(workerMessage, [oauth2WorkerPort]);
-      __privateGet(this, _oauth2ManagerPort).onmessage = (data) => {
-        __privateGet(this, _ProcessMessageResponse).call(this, data.data);
+      this.#worker.postMessage(workerMessage, [oauth2WorkerPort]);
+      this.#oauth2ManagerPort.onmessage = (data) => {
+        this.#ProcessMessageResponse(data.data);
       };
-      __privateGet(this, _SetupRoute).call(this, app, __privateGet(this, _router));
+      this.#SetupRoute(app, this.#router);
     }
   }
+  #LogDebugMessage(message) {
+    this.#options.logger.debug(message);
+  }
+  #LogInfoMessage(message) {
+    this.#options.logger.info(message);
+  }
+  #LogErrorMessage(message) {
+    this.#options.logger.error(message);
+  }
+  #ProcessMessageResponse = (data) => {
+    const messageResponse = data;
+    this.#LogDebugMessage(chalk.yellow(`STSOAuth2Manager:#ProcessMessageResponse: message data = [${JSON.stringify(messageResponse)}]`));
+    if (messageResponse.messageId === -1) {
+      switch (messageResponse.command) {
+        case IOauth2ListenerCommand.AUTHENTICATE_EVENT:
+          this.#HandleAuthenticateEvent(messageResponse.payload);
+          break;
+        case IOauth2ListenerCommand.ERROR:
+          this.#HandleErrorEvent(messageResponse.payload);
+          break;
+        case IOauth2ListenerCommand.LOG:
+          this.#HandleLogEvent(messageResponse.payload);
+          break;
+        case IOauth2ListenerCommand.UPDATE_INSTRUMENT:
+          this.#HandleUpdateInstrumentEvent(messageResponse.payload.instrumentName, messageResponse.payload.telemetry);
+          break;
+        default:
+          throw new Error(`ProcessMessageResponse command [${messageResponse.command}] not valid.`);
+      }
+    } else {
+      const callBack = this.#messageHandlers[messageResponse.messageId];
+      if (callBack) {
+        callBack(messageResponse);
+      } else {
+        throw new Error(`Message: [${messageResponse.messageId}] does not exists in callBacks.`);
+      }
+    }
+  };
+  #PostMessage = (message) => {
+    message.messageId = this.#messageId++;
+    return new Promise((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        delete this.#messageHandlers[message.messageId];
+        reject(`Message: [${message.messageId}] timeout error after: [${this.#messageTimeout}] ms.`);
+      }, this.#messageTimeout);
+      this.#messageHandlers[message.messageId] = (response) => {
+        clearTimeout(timeout);
+        delete this.#messageHandlers[message.messageId];
+        this.#LogDebugMessage(chalk.yellow(`STSOAuth2Manager:#PostMessage: resolve callback response= [${JSON.stringify(response)}]`));
+        resolve(response);
+      };
+      this.#LogDebugMessage(chalk.yellow(`STSOAuth2Manager:#PostMessage: posting message = [${JSON.stringify(message)}]`));
+      this.#oauth2ManagerPort.postMessage(message);
+    });
+  };
+  #HandleLogEvent = (message) => {
+    if (this.#aic) {
+      this.#aic.LogEx(message);
+    }
+    this.#LogDebugMessage(message);
+  };
+  // UpdateInstrument = (instrumentName: Gauge, telemetry: InstrumentBaseTelemetry): void => {
+  #HandleUpdateInstrumentEvent = (instrumentName, telemetry) => {
+    if (this.#aic) {
+      this.#aic.UpdateInstrument(instrumentName, telemetry);
+    }
+  };
+  #GetStore = () => {
+    return STSOauth2Store(this.#options.pinia);
+  };
+  // Will come from message channel
+  #HandleErrorEvent = (error) => {
+    if (isNode) ;
+    else {
+      this.#GetStore().UpdateError({
+        // Authorize applications store
+        message: error
+      });
+      setTimeout(() => {
+        this.#router.replace(`${this.#options.uriBase}error`);
+      }, 0);
+    }
+  };
+  #HandleAuthenticateEvent = (id_token) => {
+    if (isNode) ;
+    else {
+      if (this.#options.authenticateEvent) {
+        this.#options.authenticateEvent(id_token);
+      }
+      this.#GetStore().UpdateIdToken(id_token);
+    }
+  };
+  #SetupRoute = (app, router) => {
+    this.#LogDebugMessage(chalk.gray(`STSOAuth2Manager:#SetupRoute`));
+    router.beforeEach(async (to, from, next) => {
+      const oAuth2Manager = app.config.globalProperties.$sts[STSOAuth2ManagerPluginKey];
+      this.#LogDebugMessage(chalk.gray(`beforeEach: from: [${from.path}], to: [${to.path}]`));
+      if (this.#GetStore().LoggedIn === false) {
+        this.#LogInfoMessage(`Not logged in`);
+        if (to.path.localeCompare(`${this.#options.uriBase}authorize`) === 0) {
+          this.#LogInfoMessage(`to = ${this.#options.uriBase}authorize`);
+          next();
+          return;
+        } else if (to.path.localeCompare(`${this.#options.uriBase}consent`) === 0) {
+          if (this.#GetStore().id_token) {
+            next();
+            return;
+          }
+        }
+        if (to.path.localeCompare(`${this.#options.uriBase}logout`) === 0) {
+          next();
+          return;
+        }
+        if (to.path.localeCompare(`${this.#options.uriBase}error`) === 0) {
+          next();
+          return;
+        }
+        if (to.path.localeCompare(`${this.#options.uriBase}config`) === 0) {
+          next();
+          return;
+        }
+        if (to.path.localeCompare(`${this.#options.uriBase}redirected`) === 0) {
+          next();
+          return;
+        }
+        const str = to.query;
+        if (str[OAuth2ParameterType.CODE] || str[OAuth2ParameterType.ERROR]) {
+          this.#LogDebugMessage(chalk.magenta(`STSOAuth2Manager:#SetupRoute:Processing redirect: [${JSON.stringify(str)}]`));
+          const retVal = await oAuth2Manager.HandleRedirect(str);
+          this.#LogDebugMessage(chalk.magenta(`STSOAuth2Manager:#SetupRoute:Redirect result: [${retVal}]`));
+          if (retVal) {
+            next({
+              path: `${this.#options.uriBase}`,
+              replace: true
+            });
+            return;
+          } else {
+            next({
+              path: `${this.#options.uriBase}error`,
+              replace: true
+            });
+            return;
+          }
+        }
+        this.#LogDebugMessage(`STSOAuth2Manager:#SetupRoute:Restoring session`);
+        const sessionRestored = await oAuth2Manager.RestoreSession();
+        this.#LogDebugMessage(`STSOAuth2Manager:#SetupRoute:Session restored: [${sessionRestored}]`);
+        if (sessionRestored !== true) {
+          this.#LogDebugMessage(`STSOAuth2Manager:#SetupRoute:Session not restored - need to authorize`);
+          oAuth2Manager.Authorize();
+          next();
+          return;
+        } else {
+          next(`${this.#options.uriBase}`);
+          return;
+        }
+      } else {
+        if (to.path.localeCompare(`${this.#options.uriBase}consent`) === 0) {
+          next(`${this.#options.uriBase}`);
+          return;
+        }
+        if (to.path.localeCompare(`${this.#options.uriBase}authorize`) === 0) {
+          next(`${this.#options.uriBase}`);
+          return;
+        }
+        if (to.path.localeCompare(`${this.#options.uriBase}logout`) === 0) {
+          next(`${this.#options.uriBase}`);
+          return;
+        }
+        next();
+      }
+    });
+  };
+  //@@ this needs to be re-implemented so that access_token never leaves the auth worker
+  GetAccessToken = async () => {
+    const response = await this.#PostMessage({ command: IOauth2ListenerCommand.ACCESS_TOKEN });
+    return response.payload;
+  };
+  // Update operation protected using operationSemaphore. This may occur when using workers and/or multiple async fetch operations.
+  ExecuteRefreshToken = async (retryCount = 0) => {
+    if (this.#operationSemaphore === true) {
+      if (retryCount > this.#maxSemaphoreRetries) {
+        throw new Error(`STSOAuth2Manager:ExecuteRefreshToken:maxSemaphoreRetries: [${this.#maxSemaphoreRetries}] exceeded.`);
+      }
+      await Sleep(this.#semaphoreRetrySleep);
+      this.#LogDebugMessage(chalk.cyan(`STSOAuth2Manager:ExecuteRefreshToken:locked by operationSemaphore, retry count: [${retryCount}]`));
+      return await this.ExecuteRefreshToken(retryCount + 1);
+    } else {
+      this.#operationSemaphore = true;
+      const response = await this.#PostMessage({ command: IOauth2ListenerCommand.EXECUTE_REFRESH_TOKEN });
+      this.#operationSemaphore = false;
+      return response.payload;
+    }
+  };
+  GetCookies = async () => {
+    const response = await this.#PostMessage({ command: IOauth2ListenerCommand.COOKIES });
+    return response.payload;
+  };
+  RestoreSession = async () => {
+    try {
+      this.#LogDebugMessage(`STSOAuth2Manager:RestoreSession:postMessage: [${IOauth2ListenerCommand.RESTORE_SESSION}]`);
+      const response = await this.#PostMessage({ command: IOauth2ListenerCommand.RESTORE_SESSION });
+      this.#LogDebugMessage(`STSOAuth2Manager:RestoreSession:response: [${JSON.stringify(response.payload)}]`);
+      return response.payload;
+    } catch (error) {
+      this.#LogErrorMessage(chalk.red(`RestoreSession Error: ${error}`));
+      return false;
+    }
+  };
+  Authorize = async () => {
+    try {
+      const response = await this.#PostMessage({ command: IOauth2ListenerCommand.AUTHORIZE });
+      this.#transactionStore.set(this.#STORAGE_AUTHORIZE_OPTIONS_KEY, response.payload.authorizeOptions);
+      const url = response.payload.url;
+      if (!isNode) {
+        window.location.replace(url);
+      } else {
+        return response.payload.authorizeOptionsClientCopy;
+      }
+    } catch (error) {
+      this.#LogErrorMessage(chalk.red(`Authorize Error: ${error}`));
+    }
+    return {};
+  };
+  HandleRedirect = async (queryVars) => {
+    try {
+      this.#LogDebugMessage(chalk.magenta(`STSOAuth2Manager:HandleRedirect`));
+      let response = null;
+      if (queryVars[OAuth2ParameterType.CODE]) {
+        const authorizeOptions = this.#transactionStore.get(this.#STORAGE_AUTHORIZE_OPTIONS_KEY);
+        this.#transactionStore.remove(this.#STORAGE_AUTHORIZE_OPTIONS_KEY);
+        this.#LogDebugMessage(chalk.magenta(`STSOAuth2Manager:HandleRedirect: sending HANDLE_REDIRECT command`));
+        response = await this.#PostMessage({ command: IOauth2ListenerCommand.HANDLE_REDIRECT, payload: {
+          queryVars,
+          authorizeOptions
+        } });
+      } else {
+        response = await this.#PostMessage({ command: IOauth2ListenerCommand.HANDLE_REDIRECT, payload: queryVars });
+      }
+      this.#LogDebugMessage(chalk.magenta(`STSOAuth2Manager:HandleRedirect: HANDLE_REDIRECT response: [${JSON.stringify(response)}]`));
+      return response.payload;
+    } catch (error) {
+      this.#LogErrorMessage(chalk.red(`HandleRedirect Error: ${error}`));
+      return false;
+    }
+  };
+  Logout = async () => {
+    try {
+      const response = await this.#PostMessage({ command: IOauth2ListenerCommand.LOGOUT });
+      return response.payload;
+    } catch (error) {
+      this.#LogErrorMessage(chalk.red(`Logout Error: ${error}`));
+      return false;
+    }
+  };
+  InvokeExternalAPI = async () => {
+    try {
+      const response = await this.#PostMessage({ command: IOauth2ListenerCommand.LOGOUT });
+      return response.payload;
+    } catch (error) {
+      this.#LogErrorMessage(chalk.red(`InvokeExternalAPI Error: ${error}`));
+      return null;
+    }
+  };
+  LoggedIn = () => {
+    try {
+      return this.#GetStore().LoggedIn;
+    } catch (error) {
+      return false;
+    }
+  };
 }
-_router = new WeakMap();
-_STORAGE_AUTHORIZE_OPTIONS_KEY = new WeakMap();
-_aic = new WeakMap();
-_options = new WeakMap();
-_oauth2ManagerPort = new WeakMap();
-_messageId = new WeakMap();
-_messageHandlers = new WeakMap();
-_messageTimeout = new WeakMap();
-_worker = new WeakMap();
-_transactionStore = new WeakMap();
-_operationSemaphore = new WeakMap();
-_maxSemaphoreRetries = new WeakMap();
-_semaphoreRetrySleep = new WeakMap();
-_STSOAuth2Manager_instances = new WeakSet();
-LogDebugMessage_fn = function(message) {
-  __privateGet(this, _options).logger.debug(message);
-};
-LogInfoMessage_fn = function(message) {
-  __privateGet(this, _options).logger.info(message);
-};
-LogErrorMessage_fn = function(message) {
-  __privateGet(this, _options).logger.error(message);
-};
-_ProcessMessageResponse = new WeakMap();
-_PostMessage = new WeakMap();
-_HandleLogEvent = new WeakMap();
-_HandleUpdateInstrumentEvent = new WeakMap();
-_GetStore = new WeakMap();
-_HandleErrorEvent = new WeakMap();
-_HandleAuthenticateEvent = new WeakMap();
-_SetupRoute = new WeakMap();
 var sha256$2 = { exports: {} };
 function commonjsRequire(path) {
   throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
@@ -2010,7 +1967,7 @@ function requireCore() {
         module.exports = factory();
       }
     })(core, function() {
-      var CryptoJS = CryptoJS || function(Math2, undefined$1) {
+      var CryptoJS = CryptoJS || (function(Math2, undefined$1) {
         var crypto2;
         if (typeof window !== "undefined" && window.crypto) {
           crypto2 = window.crypto;
@@ -2050,7 +2007,7 @@ function requireCore() {
           }
           throw new Error("Native crypto module could not be used to get secure random number.");
         };
-        var create = Object.create || /* @__PURE__ */ function() {
+        var create = Object.create || /* @__PURE__ */ (function() {
           function F() {
           }
           return function(obj) {
@@ -2060,10 +2017,10 @@ function requireCore() {
             F.prototype = null;
             return subtype;
           };
-        }();
+        })();
         var C = {};
         var C_lib = C.lib = {};
-        var Base = C_lib.Base = /* @__PURE__ */ function() {
+        var Base = C_lib.Base = /* @__PURE__ */ (function() {
           return {
             /**
              * Creates a new object that inherits from this object.
@@ -2162,7 +2119,7 @@ function requireCore() {
               return this.init.prototype.extend(this);
             }
           };
-        }();
+        })();
         var WordArray = C_lib.WordArray = Base.extend({
           /**
            * Initializes a newly created word array.
@@ -2600,7 +2557,7 @@ function requireCore() {
         });
         var C_algo = C.algo = {};
         return C;
-      }(Math);
+      })(Math);
       return CryptoJS;
     });
   })(core$1);
@@ -2839,62 +2796,59 @@ function requireEncBase64() {
 var encBase64Exports = requireEncBase64();
 const Base64 = /* @__PURE__ */ getDefaultExportFromCjs(encBase64Exports);
 class CryptoUtils {
+  #crypto;
   constructor() {
-    __privateAdd(this, _crypto);
-    __publicField(this, "DigestMessage", async function(message) {
-      const hashDigest = sha256(message);
-      return Base64.stringify(hashDigest);
-    });
-    __publicField(this, "CreateRandomString", (size = 43) => {
-      const randomValues = Array.from(__privateGet(this, _crypto).getRandomValues(new Uint8Array(size)));
-      const b64 = btoa(String.fromCharCode(...randomValues));
-      return b64;
-    });
     try {
-      __privateSet(this, _crypto, crypto);
+      this.#crypto = crypto;
     } catch {
-      __privateSet(this, _crypto, require("node:crypto"));
+      this.#crypto = require("node:crypto");
     }
   }
+  DigestMessage = async function(message) {
+    const hashDigest = sha256(message);
+    return Base64.stringify(hashDigest);
+  };
+  CreateRandomString = (size = 43) => {
+    const randomValues = Array.from(this.#crypto.getRandomValues(new Uint8Array(size)));
+    const b64 = btoa(String.fromCharCode(...randomValues));
+    return b64;
+  };
 }
-_crypto = new WeakMap();
 class QueryParams {
-  constructor() {
-    __publicField(this, "DecodeQueryParams", (params) => {
-      const retObj = {};
-      Object.keys(params).filter((k) => typeof params[k] !== "undefined").map((k) => {
-        retObj[decodeURIComponent(k)] = decodeURIComponent(params[k]);
-      });
-      return retObj;
+  DecodeQueryParams = (params) => {
+    const retObj = {};
+    Object.keys(params).filter((k) => typeof params[k] !== "undefined").map((k) => {
+      retObj[decodeURIComponent(k)] = decodeURIComponent(params[k]);
     });
-    __publicField(this, "CreateQueryParams", (params) => {
-      return Object.keys(params).filter((k) => typeof params[k] !== "undefined").map((k) => {
-        if (Array.isArray(params[k])) {
-          return encodeURIComponent(k) + "=" + encodeURIComponent(params[k].join(" "));
-        } else {
-          return encodeURIComponent(k) + "=" + encodeURIComponent(params[k]);
-        }
-      }).join("&");
-    });
-    __publicField(this, "_GetQueryParams", (param) => {
-      let retVal = {};
-      const uri = param.split("?");
-      if (uri.length == 2) {
-        const vars = uri[1].split("&");
-        const getVars = {};
-        let tmp;
-        vars.forEach(function(v) {
-          tmp = v.split("=");
-          if (tmp.length == 2) getVars[tmp[0]] = tmp[1];
-        });
-        retVal = this.DecodeQueryParams(getVars);
+    return retObj;
+  };
+  CreateQueryParams = (params) => {
+    return Object.keys(params).filter((k) => typeof params[k] !== "undefined").map((k) => {
+      if (Array.isArray(params[k])) {
+        return encodeURIComponent(k) + "=" + encodeURIComponent(params[k].join(" "));
+      } else {
+        return encodeURIComponent(k) + "=" + encodeURIComponent(params[k]);
       }
-      return retVal;
-    });
-    __publicField(this, "GetQueryParams", () => {
-      return this._GetQueryParams(window.location.href);
-    });
-  }
+    }).join("&");
+  };
+  _GetQueryParams = (param) => {
+    let retVal = {};
+    const uri = param.split("?");
+    if (uri.length == 2) {
+      const vars = uri[1].split("&");
+      const getVars = {};
+      let tmp;
+      vars.forEach(function(v) {
+        tmp = v.split("=");
+        if (tmp.length == 2) getVars[tmp[0]] = tmp[1];
+      });
+      retVal = this.DecodeQueryParams(getVars);
+    }
+    return retVal;
+  };
+  GetQueryParams = () => {
+    return this._GetQueryParams(window.location.href);
+  };
 }
 var StatusCodes;
 (function(StatusCodes2) {
@@ -2958,494 +2912,470 @@ var StatusCodes;
   StatusCodes2[StatusCodes2["NETWORK_AUTHENTICATION_REQUIRED"] = 511] = "NETWORK_AUTHENTICATION_REQUIRED";
 })(StatusCodes || (StatusCodes = {}));
 class STSOAuth2Worker {
+  //#storageManager = null;
+  #clientSessionStore;
+  #cUtils = new CryptoUtils();
+  #qParams = new QueryParams();
+  #STORAGE_SESSION_KEY = "session.stsmda.com.au";
+  //@@#aic = null;
+  #oauthWorkerPort;
+  #options;
+  #logger;
+  #agentManager = null;
   constructor(workerPort, options, logger) {
-    __privateAdd(this, _STSOAuth2Worker_instances);
-    //#storageManager = null;
-    __privateAdd(this, _clientSessionStore);
-    __privateAdd(this, _cUtils, new CryptoUtils());
-    __privateAdd(this, _qParams, new QueryParams());
-    __privateAdd(this, _STORAGE_SESSION_KEY, "session.stsmda.com.au");
-    //@@#aic = null;
-    __privateAdd(this, _oauthWorkerPort);
-    __privateAdd(this, _options2);
-    __privateAdd(this, _logger);
-    __privateAdd(this, _agentManager, null);
-    // Attempt to restore a previous session using the STSBroker
-    /*
-        { parameterType: OAuth2ParameterType.CLIENT_ID, errorType: authErrorType.CLIENT_ID_MISMATCH },
-        { parameterType: OAuth2ParameterType.SCOPE, errorType: authErrorType.SCOPE_MISMATCH }
-        { parameterType: OAuth2ParameterType.REDIRECT_URI, errorType: authErrorType.REDIRECT_URI_MISMATCH },
-        { parameterType: OAuth2ParameterType.AUDIENCE, errorType: authErrorType.SCOPE_MISMATCH }
-    
-        Successful Response
-        {
-            "access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Ik5HVEZ2ZEstZnl0aEV1Q...",
-            "token_type": "Bearer",
-            "expires_in": 3599,
-            "scope": "https%3A%2F%2Fgraph.microsoft.com%2Fmail.read",
-            "refresh_token": "AwABAAAAvPM1KaPlrEqdFSBzjqfTGAMxZGUTdM0t4B4...",
-            "id_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJub25lIn0.eyJhdWQiOiIyZDRkMTFhMi1mODE0LTQ2YTctOD...",
-        }
-    
-        Error Response
-        {
-            "error": "invalid_scope",
-            "error_description": "AADSTS70011: The provided value for the input parameter 'scope' is not valid. The scope https://foo.microsoft.com/mail.read is not valid.\r\nTrace ID: 255d1aef-8c98-452f-ac51-23d051240864\r\nCorrelation ID: fb3d2015-bc17-4bb9-bb85-30c5cf1aaaa7\r\nTimestamp: 2016-01-09 02:02:12Z",
-            "error_codes": [
-                70011
-            ],
-            "timestamp": "2016-01-09 02:02:12Z",
+    this.#options = options;
+    this.#logger = logger;
+    this.#LogDebugMessage(`STSOAuth2Worker:constructor:#options: [${JSON.stringify(this.#options)}]`);
+    this.#clientSessionStore = new ClientStorageFactory({ clientStorageType: ClientStorageType.MEMORY_STORAGE, usePrefix: false }).GetStorage();
+    this.#oauthWorkerPort = workerPort;
+    this.#LogDebugMessage(`STSOAuth2Worker:constructor:#oauthWorkerPort: [${JSON.stringify(this.#oauthWorkerPort)}]`);
+    if (isNode && this.#options.agentOptions) {
+      this.#agentManager = new AgentManager({
+        agentOptions: this.#options.agentOptions,
+        httpAgentFactory(options2) {
+          return new http.Agent(options2);
+        },
+        httpsAgentFactory(options2) {
+          return new https.Agent(options2);
         }
-      
-        */
-    __privateAdd(this, _HandleAuthenticateEvent2, (id_token) => {
-      const message = {
-        messageId: -1,
-        // un-solicited message
-        command: IOauth2ListenerCommand.AUTHENTICATE_EVENT
-      };
-      __privateGet(this, _ProcessCommand).call(this, message, id_token);
-    });
-    // eslint-disable-next-line  @typescript-eslint/no-explicit-any
-    __privateAdd(this, _HandleErrorEvent2, (error) => {
-      const message = {
-        messageId: -1,
-        // un-solicited message
-        command: IOauth2ListenerCommand.ERROR
-      };
-      __privateGet(this, _ProcessCommand).call(this, message, error);
-    });
-    __privateAdd(this, _LogMessage, (messageToSend) => {
-      const message = {
-        messageId: -1,
-        // un-solicited message
-        command: IOauth2ListenerCommand.LOG
-      };
-      __privateGet(this, _ProcessCommand).call(this, message, messageToSend);
+      });
+    }
+    this.SetupListener();
+    this.#UpdateInstrument(Gauge.LOGGER, {
+      LogMessage: `STSOauth2 Plugin - Successfully Loaded`
     });
-    __privateAdd(this, _GetAccessToken, () => {
-      const sessionData = __privateGet(this, _clientSessionStore).get(__privateGet(this, _STORAGE_SESSION_KEY));
+  }
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  #LogDebugMessage(message) {
+    this.#logger.debug(message);
+  }
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  #LogInfoMessage(message) {
+    this.#logger.info(message);
+  }
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  #LogErrorMessage(message) {
+    this.#logger.error(message);
+  }
+  // Attempt to restore a previous session using the STSBroker
+  /*
+      { parameterType: OAuth2ParameterType.CLIENT_ID, errorType: authErrorType.CLIENT_ID_MISMATCH },
+      { parameterType: OAuth2ParameterType.SCOPE, errorType: authErrorType.SCOPE_MISMATCH }
+      { parameterType: OAuth2ParameterType.REDIRECT_URI, errorType: authErrorType.REDIRECT_URI_MISMATCH },
+      { parameterType: OAuth2ParameterType.AUDIENCE, errorType: authErrorType.SCOPE_MISMATCH }
+  
+      Successful Response
+      {
+          "access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Ik5HVEZ2ZEstZnl0aEV1Q...",
+          "token_type": "Bearer",
+          "expires_in": 3599,
+          "scope": "https%3A%2F%2Fgraph.microsoft.com%2Fmail.read",
+          "refresh_token": "AwABAAAAvPM1KaPlrEqdFSBzjqfTGAMxZGUTdM0t4B4...",
+          "id_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJub25lIn0.eyJhdWQiOiIyZDRkMTFhMi1mODE0LTQ2YTctOD...",
+      }
+  
+      Error Response
+      {
+          "error": "invalid_scope",
+          "error_description": "AADSTS70011: The provided value for the input parameter 'scope' is not valid. The scope https://foo.microsoft.com/mail.read is not valid.\r\nTrace ID: 255d1aef-8c98-452f-ac51-23d051240864\r\nCorrelation ID: fb3d2015-bc17-4bb9-bb85-30c5cf1aaaa7\r\nTimestamp: 2016-01-09 02:02:12Z",
+          "error_codes": [
+              70011
+          ],
+          "timestamp": "2016-01-09 02:02:12Z",
+      }
+    
+      */
+  #HandleAuthenticateEvent = (id_token) => {
+    const message = {
+      messageId: -1,
+      // un-solicited message
+      command: IOauth2ListenerCommand.AUTHENTICATE_EVENT
+    };
+    this.#ProcessCommand(message, id_token);
+  };
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  #HandleErrorEvent = (error) => {
+    const message = {
+      messageId: -1,
+      // un-solicited message
+      command: IOauth2ListenerCommand.ERROR
+    };
+    this.#ProcessCommand(message, error);
+  };
+  #LogMessage = (messageToSend) => {
+    const message = {
+      messageId: -1,
+      // un-solicited message
+      command: IOauth2ListenerCommand.LOG
+    };
+    this.#ProcessCommand(message, messageToSend);
+  };
+  #GetAccessToken = () => {
+    const sessionData = this.#clientSessionStore.get(this.#STORAGE_SESSION_KEY);
+    if (sessionData) {
+      const tokens = sessionData.tokenResponse;
+      return tokens.access_token;
+    } else {
+      return null;
+    }
+  };
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  #GetCookies = () => {
+    if (isNode) {
+      const sessionData = this.#clientSessionStore.get(this.#STORAGE_SESSION_KEY);
       if (sessionData) {
-        const tokens = sessionData.tokenResponse;
-        return tokens.access_token;
+        return sessionData.brokerCookie;
       } else {
         return null;
       }
+    } else {
+      return null;
+    }
+  };
+  #UpdateInstrument = (instrumentName, telemetry) => {
+    const message = {
+      messageId: -1,
+      // un-solicited message
+      command: IOauth2ListenerCommand.UPDATE_INSTRUMENT
+    };
+    this.#ProcessCommand(message, {
+      instrumentName,
+      telemetry
     });
-    // eslint-disable-next-line  @typescript-eslint/no-explicit-any
-    __privateAdd(this, _GetCookies, () => {
-      if (isNode) {
-        const sessionData = __privateGet(this, _clientSessionStore).get(__privateGet(this, _STORAGE_SESSION_KEY));
-        if (sessionData) {
-          return sessionData.brokerCookie;
-        } else {
-          return null;
-        }
-      } else {
-        return null;
+  };
+  SetupListener = () => {
+    this.#oauthWorkerPort.onmessage = async (data) => {
+      const auth2ListenerMessage = data.data;
+      this.#LogDebugMessage(`STSOAuth2Worker:SetupListener:onmessage: [${auth2ListenerMessage.command}]`);
+      switch (auth2ListenerMessage.command) {
+        case IOauth2ListenerCommand.RESTORE_SESSION:
+          this.#ProcessCommand(auth2ListenerMessage, await this.#RestoreSession());
+          break;
+        case IOauth2ListenerCommand.AUTHORIZE:
+          this.#ProcessCommand(auth2ListenerMessage, await this.#Authorize());
+          break;
+        case IOauth2ListenerCommand.HANDLE_REDIRECT:
+          this.#ProcessCommand(auth2ListenerMessage, await this.#HandleRedirect(auth2ListenerMessage.payload));
+          break;
+        case IOauth2ListenerCommand.LOGOUT:
+          this.#ProcessCommand(auth2ListenerMessage, await this.#Logout());
+          break;
+        //@@ Need a way of keeping this out of the main thread - should always stay within the worker
+        case IOauth2ListenerCommand.ACCESS_TOKEN:
+          this.#ProcessCommand(auth2ListenerMessage, await this.#GetAccessToken());
+          break;
+        case IOauth2ListenerCommand.EXECUTE_REFRESH_TOKEN:
+          this.#ProcessCommand(auth2ListenerMessage, await this.#RefreshToken());
+          break;
+        case IOauth2ListenerCommand.COOKIES:
+          this.#ProcessCommand(auth2ListenerMessage, await this.#GetCookies());
+          break;
+        default:
+          throw new Error(`Command: [${auth2ListenerMessage.command}'] not found.`);
       }
-    });
-    __privateAdd(this, _UpdateInstrument, (instrumentName, telemetry) => {
-      const message = {
-        messageId: -1,
-        // un-solicited message
-        command: IOauth2ListenerCommand.UPDATE_INSTRUMENT
-      };
-      __privateGet(this, _ProcessCommand).call(this, message, {
-        instrumentName,
-        telemetry
-      });
-    });
-    __publicField(this, "SetupListener", () => {
-      __privateGet(this, _oauthWorkerPort).onmessage = async (data) => {
-        const auth2ListenerMessage = data.data;
-        __privateMethod(this, _STSOAuth2Worker_instances, 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));
-            break;
-          case IOauth2ListenerCommand.AUTHORIZE:
-            __privateGet(this, _ProcessCommand).call(this, auth2ListenerMessage, await __privateGet(this, _Authorize).call(this));
-            break;
-          case IOauth2ListenerCommand.HANDLE_REDIRECT:
-            __privateGet(this, _ProcessCommand).call(this, auth2ListenerMessage, await __privateGet(this, _HandleRedirect).call(this, auth2ListenerMessage.payload));
-            break;
-          case IOauth2ListenerCommand.LOGOUT:
-            __privateGet(this, _ProcessCommand).call(this, auth2ListenerMessage, await __privateGet(this, _Logout).call(this));
-            break;
-          //@@ Need a way of keeping this out of the main thread - should always stay within the worker
-          case IOauth2ListenerCommand.ACCESS_TOKEN:
-            __privateGet(this, _ProcessCommand).call(this, auth2ListenerMessage, await __privateGet(this, _GetAccessToken).call(this));
-            break;
-          case IOauth2ListenerCommand.EXECUTE_REFRESH_TOKEN:
-            __privateGet(this, _ProcessCommand).call(this, auth2ListenerMessage, await __privateGet(this, _RefreshToken).call(this));
-            break;
-          case IOauth2ListenerCommand.COOKIES:
-            __privateGet(this, _ProcessCommand).call(this, auth2ListenerMessage, await __privateGet(this, _GetCookies).call(this));
-            break;
-          default:
-            throw new Error(`Command: [${auth2ListenerMessage.command}'] not found.`);
+    };
+  };
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  #ProcessCommand = async (auth2ListenerMessage, response) => {
+    const messageResponse = {
+      messageId: auth2ListenerMessage.messageId,
+      command: auth2ListenerMessage.command,
+      payload: response
+    };
+    this.#oauthWorkerPort.postMessage(messageResponse);
+  };
+  #RestoreSession = async () => {
+    let restoredSessionData = null;
+    const sessionData = this.#clientSessionStore.get(this.#STORAGE_SESSION_KEY);
+    if (sessionData) {
+      restoredSessionData = sessionData.tokenResponse;
+      this.#LogInfoMessage("Session restored from client storage.");
+      this.#LogMessage("Session restored from client storage.");
+    } else {
+      const url = `${this.#options.brokerendpoint}:${this.#options.brokerport}${this.#options.brokerapiroot}/session`;
+      this.#LogInfoMessage("RestoreSession");
+      this.#LogInfoMessage(url);
+      this.#LogMessage("RestoreSession.");
+      this.#LogMessage(url);
+      try {
+        const rConfig = new STSAxiosConfig(url, "post").withData({
+          [OAuth2ParameterType.CLIENT_ID]: this.#options.client_id,
+          [OAuth2ParameterType.SCOPE]: this.#options.scope,
+          [OAuth2ParameterType.REDIRECT_URI]: this.#options.redirect_uri,
+          [OAuth2ParameterType.AUDIENCE]: this.#options.audience
+        }).withDefaultHeaders().withCredentials().withTimeout(this.#options.timeout);
+        this.#LogDebugMessage(chalk.magenta(`#RestoreSession:session request detail: [${JSON.stringify(rConfig)}]`));
+        if (isNode && this.#agentManager) {
+          rConfig.withAgentManager(this.#agentManager);
         }
-      };
-    });
-    // eslint-disable-next-line  @typescript-eslint/no-explicit-any
-    __privateAdd(this, _ProcessCommand, async (auth2ListenerMessage, response) => {
-      const messageResponse = {
-        messageId: auth2ListenerMessage.messageId,
-        command: auth2ListenerMessage.command,
-        payload: response
-      };
-      __privateGet(this, _oauthWorkerPort).postMessage(messageResponse);
-    });
-    __privateAdd(this, _RestoreSession, async () => {
-      let restoredSessionData = null;
-      const sessionData = __privateGet(this, _clientSessionStore).get(__privateGet(this, _STORAGE_SESSION_KEY));
-      if (sessionData) {
-        restoredSessionData = sessionData.tokenResponse;
-        __privateMethod(this, _STSOAuth2Worker_instances, 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, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, "RestoreSession");
-        __privateMethod(this, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, url);
-        __privateGet(this, _LogMessage).call(this, "RestoreSession.");
-        __privateGet(this, _LogMessage).call(this, url);
-        try {
-          const rConfig = new STSAxiosConfig(url, "post").withData({
-            [OAuth2ParameterType.CLIENT_ID]: __privateGet(this, _options2).client_id,
-            [OAuth2ParameterType.SCOPE]: __privateGet(this, _options2).scope,
-            [OAuth2ParameterType.REDIRECT_URI]: __privateGet(this, _options2).redirect_uri,
-            [OAuth2ParameterType.AUDIENCE]: __privateGet(this, _options2).audience
-          }).withDefaultHeaders().withCredentials().withTimeout(__privateGet(this, _options2).timeout);
-          __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk.magenta(`#RestoreSession:session request detail: [${JSON.stringify(rConfig)}]`));
-          if (isNode && __privateGet(this, _agentManager)) {
-            rConfig.withAgentManager(__privateGet(this, _agentManager));
-          }
-          const retVal = await axios(rConfig.config);
-          if (retVal.data.status === StatusCodes.OK) {
-            restoredSessionData = retVal.data.detail;
-            if (restoredSessionData) {
-              const newSessionData = {
-                tokenResponse: restoredSessionData
-              };
-              if (isNode) {
-                newSessionData.brokerCookie = retVal.headers["set-cookie"];
-              }
-              __privateGet(this, _clientSessionStore).set(__privateGet(this, _STORAGE_SESSION_KEY), newSessionData);
-              __privateMethod(this, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, "Session restored from server side cookie.");
-            } else {
-              __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, `Could not restore previous session. No restoredSessionData available.`);
-              __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, JSON.stringify(retVal.data));
+        const retVal = await axios(rConfig.config);
+        if (retVal.data.status === StatusCodes.OK) {
+          restoredSessionData = retVal.data.detail;
+          if (restoredSessionData) {
+            const newSessionData = {
+              tokenResponse: restoredSessionData
+            };
+            if (isNode) {
+              newSessionData.brokerCookie = retVal.headers["set-cookie"];
             }
+            this.#clientSessionStore.set(this.#STORAGE_SESSION_KEY, newSessionData);
+            this.#LogInfoMessage("Session restored from server side cookie.");
           } else {
-            __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, "Could not restore previous session:-");
-            __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, JSON.stringify(retVal.data));
+            this.#LogErrorMessage(`Could not restore previous session. No restoredSessionData available.`);
+            this.#LogErrorMessage(JSON.stringify(retVal.data));
           }
-        } catch (error) {
-          __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, "Could not restore previous session (error state):-");
-          __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, error);
-          __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, JSON.stringify(error));
+        } else {
+          this.#LogErrorMessage("Could not restore previous session:-");
+          this.#LogErrorMessage(JSON.stringify(retVal.data));
         }
+      } catch (error) {
+        this.#LogErrorMessage("Could not restore previous session (error state):-");
+        this.#LogErrorMessage(error);
+        this.#LogErrorMessage(JSON.stringify(error));
       }
-      if (restoredSessionData !== null) {
-        __privateGet(this, _HandleAuthenticateEvent2).call(this, restoredSessionData.id_token);
-        __privateMethod(this, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, "Refreshing tokens ...");
-        return await __privateGet(this, _RefreshToken).call(this);
+    }
+    if (restoredSessionData !== null) {
+      this.#HandleAuthenticateEvent(restoredSessionData.id_token);
+      this.#LogInfoMessage("Refreshing tokens ...");
+      return await this.#RefreshToken();
+    } else {
+      this.#HandleAuthenticateEvent(null);
+      return false;
+    }
+  };
+  #Authorize = async () => {
+    this.#LogInfoMessage("Authorize ...");
+    const client_id = this.#options.client_id;
+    const nonce = this.#cUtils.CreateRandomString();
+    const response_type = [AuthorizeOptionsResponseType.CODE];
+    const redirect_uri = this.#options.redirect_uri;
+    const response_mode = AuthorizeOptionsResponseMode.QUERY;
+    const scope = this.#options.scope;
+    const state = this.#cUtils.CreateRandomString();
+    const code_verifier = this.#cUtils.CreateRandomString();
+    const code_challenge = await this.#cUtils.DigestMessage(code_verifier);
+    const code_challenge_method = "S256";
+    const authorizeOptions = {
+      client_id,
+      nonce,
+      response_type,
+      redirect_uri,
+      response_mode,
+      scope,
+      state,
+      code_challenge,
+      code_challenge_method
+    };
+    const authorizeOptionsClientCopy = { ...authorizeOptions };
+    const url = `${this.#options.authorizeendpoint}:${this.#options.authorizeport}${this.#options.authorizeapiroot}${this.#options.authorizeapi}?${this.#qParams.CreateQueryParams(authorizeOptions)}`;
+    this.#LogInfoMessage(url);
+    authorizeOptions.code_verifier = code_verifier;
+    this.#LogInfoMessage(`Authorize:authorizeOptions: [${JSON.stringify(authorizeOptions)}]`);
+    return {
+      url,
+      authorizeOptions,
+      authorizeOptionsClientCopy
+    };
+  };
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  #HandleRedirect = async (payload) => {
+    const queryVars = payload.queryVars;
+    const authorizeOptions = payload.authorizeOptions;
+    this.#LogDebugMessage(chalk.magenta(`#HandleRedirect: HandleRedirect`));
+    this.#LogDebugMessage(chalk.magenta(`#HandleRedirect: HandleRedirect:Query Vars: [${JSON.stringify(queryVars)}]`));
+    if (queryVars[OAuth2ParameterType.CODE]) {
+      const response = queryVars;
+      this.#LogInfoMessage(`authorizeOptions from transaction state: [${JSON.stringify(authorizeOptions)}]`);
+      const redirectState = response.state;
+      const authorizeOptionsState = authorizeOptions.state;
+      if (authorizeOptionsState.localeCompare(redirectState) === 0) {
+        this.#LogInfoMessage(chalk.green("redirected state (from queryVars) matched previously saved transaction authorizeOptions state"));
+        return await this.#GetToken(authorizeOptions, response);
       } else {
-        __privateGet(this, _HandleAuthenticateEvent2).call(this, null);
+        this.#LogErrorMessage(chalk.red("redirected state (from queryVars) did NOT match previously saved transaction authorizeOptions state"));
+        this.#LogErrorMessage(chalk.red(`authorizeOptionsState: [${authorizeOptionsState}]`));
+        this.#LogErrorMessage(chalk.red(`redirectState: [${redirectState}]`));
+        this.#HandleErrorEvent({ message: "State un-matched" });
         return false;
       }
-    });
-    __privateAdd(this, _Authorize, async () => {
-      __privateMethod(this, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, "Authorize ...");
-      const client_id = __privateGet(this, _options2).client_id;
-      const nonce = __privateGet(this, _cUtils).CreateRandomString();
-      const response_type = [AuthorizeOptionsResponseType.CODE];
-      const redirect_uri = __privateGet(this, _options2).redirect_uri;
-      const response_mode = AuthorizeOptionsResponseMode.QUERY;
-      const scope = __privateGet(this, _options2).scope;
-      const state = __privateGet(this, _cUtils).CreateRandomString();
-      const code_verifier = __privateGet(this, _cUtils).CreateRandomString();
-      const code_challenge = await __privateGet(this, _cUtils).DigestMessage(code_verifier);
-      const code_challenge_method = "S256";
-      const authorizeOptions = {
-        client_id,
-        nonce,
-        response_type,
-        redirect_uri,
-        response_mode,
-        scope,
-        state,
-        code_challenge,
-        code_challenge_method
-      };
-      const authorizeOptionsClientCopy = { ...authorizeOptions };
-      const url = `${__privateGet(this, _options2).authorizeendpoint}:${__privateGet(this, _options2).authorizeport}${__privateGet(this, _options2).authorizeapiroot}${__privateGet(this, _options2).authorizeapi}?${__privateGet(this, _qParams).CreateQueryParams(authorizeOptions)}`;
-      __privateMethod(this, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, url);
-      authorizeOptions.code_verifier = code_verifier;
-      __privateMethod(this, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, `Authorize:authorizeOptions: [${JSON.stringify(authorizeOptions)}]`);
-      return {
-        url,
-        authorizeOptions,
-        authorizeOptionsClientCopy
-      };
-    });
-    // eslint-disable-next-line  @typescript-eslint/no-explicit-any
-    __privateAdd(this, _HandleRedirect, async (payload) => {
-      const queryVars = payload.queryVars;
-      const authorizeOptions = payload.authorizeOptions;
-      __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk.magenta(`#HandleRedirect: HandleRedirect`));
-      __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk.magenta(`#HandleRedirect: HandleRedirect:Query Vars: [${JSON.stringify(queryVars)}]`));
-      if (queryVars[OAuth2ParameterType.CODE]) {
-        const response = queryVars;
-        __privateMethod(this, _STSOAuth2Worker_instances, 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, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, chalk.green("redirected state (from queryVars) matched previously saved transaction authorizeOptions state"));
-          return await __privateGet(this, _GetToken).call(this, authorizeOptions, response);
-        } else {
-          __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red("redirected state (from queryVars) did NOT match previously saved transaction authorizeOptions state"));
-          __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red(`authorizeOptionsState: [${authorizeOptionsState}]`));
-          __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red(`redirectState: [${redirectState}]`));
-          __privateGet(this, _HandleErrorEvent2).call(this, { message: "State un-matched" });
-          return false;
+    } else if (queryVars[OAuth2ParameterType.ERROR]) {
+      this.#LogErrorMessage(chalk.red(`State un-matched (1)`));
+      this.#HandleErrorEvent({ message: "State un-matched" });
+      return false;
+    } else {
+      this.#LogErrorMessage(chalk.red(`State un-matched (2)`));
+      this.#HandleErrorEvent({ message: "State un-matched" });
+      return false;
+    }
+  };
+  /*
+      client_id=6731de76-14a6-49ae-97bc-6eba6914391e
+      &scope=https%3A%2F%2Fgraph.microsoft.com%2Fmail.read
+      &code=OAAABAAAAiL9Kn2Z27UubvWFPbm0gLWQJVzCTE9UkP3pSx1aXxUjq3n8b2JRLk4OxVXr...
+      &redirect_uri=http%3A%2F%2Flocalhost%2Fmyapp%2F
+      &grant_type=authorization_code
+      &code_verifier=ThisIsntRandomButItNeedsToBe43CharactersLong 
+      &client_secret=JqQX2PNo9bpM0uEihUPzyrh    // NOTE: Only required for web apps. This secret needs to be URL-Encoded.
+  
+      Successful Response
+      {
+          "access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Ik5HVEZ2ZEstZnl0aEV1Q...",
+          "token_type": "Bearer",
+          "expires_in": 3599,
+          "scope": "https%3A%2F%2Fgraph.microsoft.com%2Fmail.read",
+          "refresh_token": "AwABAAAAvPM1KaPlrEqdFSBzjqfTGAMxZGUTdM0t4B4...",
+          "id_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJub25lIn0.eyJhdWQiOiIyZDRkMTFhMi1mODE0LTQ2YTctOD...",
+      }
+      */
+  // Get access_token, refresh_token and id_token using OAuth2 Authorization Code Flow
+  #GetTokenFromBroker = async (authorizationCodeFlowParameters) => {
+    this.#LogDebugMessage(chalk.magenta(`#GetTokenFromBroker`));
+    this.#clientSessionStore.remove(this.#STORAGE_SESSION_KEY);
+    const url = `${this.#options.brokerendpoint}:${this.#options.brokerport}${this.#options.brokerapiroot}/token`;
+    try {
+      const rConfig = new STSAxiosConfig(url, "post").withDefaultHeaders().withData(authorizationCodeFlowParameters).withCredentials().withTimeout(this.#options.timeout);
+      this.#LogDebugMessage(chalk.magenta(`#GetTokenFromBroker: request config: [${JSON.stringify(rConfig)}]`));
+      if (isNode && this.#agentManager) {
+        rConfig.withAgentManager(this.#agentManager);
+      }
+      this.#LogDebugMessage(chalk.magenta(`#GetTokenFromBroker: axios API call`));
+      const retVal = await axios(rConfig.config);
+      this.#LogDebugMessage(chalk.magenta(`#GetTokenFromBroker: axios API call result: [${retVal.status}]`));
+      if (retVal.status === StatusCodes.OK) {
+        this.#LogDebugMessage(chalk.magenta(`#GetTokenFromBroker: storing tokens`));
+        const tokenResponse = retVal.data;
+        this.#HandleAuthenticateEvent(tokenResponse.id_token);
+        const newSessionData = {
+          tokenResponse
+        };
+        if (isNode) {
+          newSessionData.brokerCookie = retVal.headers["set-cookie"];
         }
-      } else if (queryVars[OAuth2ParameterType.ERROR]) {
-        __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red(`State un-matched (1)`));
-        __privateGet(this, _HandleErrorEvent2).call(this, { message: "State un-matched" });
+        this.#clientSessionStore.set(this.#STORAGE_SESSION_KEY, newSessionData);
+        return true;
+      } else if (retVal.status === StatusCodes.UNAUTHORIZED) {
+        this.#LogDebugMessage(chalk.magenta(`#GetTokenFromBroker: NOT storing tokens, status: [${retVal.status}]`));
+        this.#HandleAuthenticateEvent(null);
         return false;
       } else {
-        __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red(`State un-matched (2)`));
-        __privateGet(this, _HandleErrorEvent2).call(this, { message: "State un-matched" });
+        this.#LogDebugMessage(chalk.magenta(`#GetTokenFromBroker: NOT storing tokens (general error 1), status: [${retVal.status}]`));
+        this.#HandleAuthenticateEvent(null);
+        this.#LogErrorMessage(chalk.red("Could not obtain access_token from token end-point:-"));
+        this.#LogErrorMessage(chalk.red(JSON.stringify(retVal.data)));
         return false;
       }
-    });
-    /*
-        client_id=6731de76-14a6-49ae-97bc-6eba6914391e
-        &scope=https%3A%2F%2Fgraph.microsoft.com%2Fmail.read
-        &code=OAAABAAAAiL9Kn2Z27UubvWFPbm0gLWQJVzCTE9UkP3pSx1aXxUjq3n8b2JRLk4OxVXr...
-        &redirect_uri=http%3A%2F%2Flocalhost%2Fmyapp%2F
-        &grant_type=authorization_code
-        &code_verifier=ThisIsntRandomButItNeedsToBe43CharactersLong 
-        &client_secret=JqQX2PNo9bpM0uEihUPzyrh    // NOTE: Only required for web apps. This secret needs to be URL-Encoded.
-    
-        Successful Response
-        {
-            "access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Ik5HVEZ2ZEstZnl0aEV1Q...",
-            "token_type": "Bearer",
-            "expires_in": 3599,
-            "scope": "https%3A%2F%2Fgraph.microsoft.com%2Fmail.read",
-            "refresh_token": "AwABAAAAvPM1KaPlrEqdFSBzjqfTGAMxZGUTdM0t4B4...",
-            "id_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJub25lIn0.eyJhdWQiOiIyZDRkMTFhMi1mODE0LTQ2YTctOD...",
-        }
-        */
-    // Get access_token, refresh_token and id_token using OAuth2 Authorization Code Flow
-    __privateAdd(this, _GetTokenFromBroker, async (authorizationCodeFlowParameters) => {
-      __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk.magenta(`#GetTokenFromBroker`));
-      __privateGet(this, _clientSessionStore).remove(__privateGet(this, _STORAGE_SESSION_KEY));
-      const url = `${__privateGet(this, _options2).brokerendpoint}:${__privateGet(this, _options2).brokerport}${__privateGet(this, _options2).brokerapiroot}/token`;
+    } catch (error) {
+      this.#LogErrorMessage(chalk.red(`#GetTokenFromBroker: NOT storing tokens (general error 2), status: [${error}]`));
+      this.#HandleAuthenticateEvent(null);
+      return false;
+    }
+  };
+  // Get access_token, refresh_token and id_token using OAuth2 Authorization Code Flow
+  #GetToken = async (authorizeOptions, authorizeResponse) => {
+    this.#LogInfoMessage("#GetToken");
+    this.#LogInfoMessage(authorizeResponse);
+    this.#clientSessionStore.remove(this.#STORAGE_SESSION_KEY);
+    const authorizationCodeFlowParameters = {
+      client_id: this.#options.client_id,
+      scope: this.#options.scope,
+      code: authorizeResponse.code,
+      redirect_uri: this.#options.redirect_uri,
+      grant_type: OAuthGrantTypes.AUTHORIZATION_CODE,
+      code_verifier: authorizeOptions.code_verifier
+    };
+    return await this.#GetTokenFromBroker(authorizationCodeFlowParameters);
+  };
+  /*
+  	// Line breaks for legibility only
+  
+  POST /{tenant}/oauth2/v2.0/token HTTP/1.1
+  Host: https://login.microsoftonline.com
+  Content-Type: application/x-www-form-urlencoded
+  
+  client_id=535fb089-9ff3-47b6-9bfb-4f1264799865
+  &scope=https%3A%2F%2Fgraph.microsoft.com%2Fmail.read
+  &refresh_token=OAAABAAAAiL9Kn2Z27UubvWFPbm0gLWQJVzCTE9UkP3pSx1aXxUjq...
+  &grant_type=refresh_token
+  &client_secret=sampleCredentia1s    // NOTE: Only required for web apps. This secret needs to be URL-Encoded
+  
+  Error Response
+  {
+  	"error": "invalid_scope",
+  	"error_description": "AADSTS70011: The provided value for the input parameter 'scope' is not valid. The scope https://foo.microsoft.com/mail.read is not valid.\r\nTrace ID: 255d1aef-8c98-452f-ac51-23d051240864\r\nCorrelation ID: fb3d2015-bc17-4bb9-bb85-30c5cf1aaaa7\r\nTimestamp: 2016-01-09 02:02:12Z",
+  	"error_codes": [
+  	  70011
+  	],
+  	"timestamp": "2016-01-09 02:02:12Z",
+  	"trace_id": "255d1aef-8c98-452f-ac51-23d051240864",
+  	"correlation_id": "fb3d2015-bc17-4bb9-bb85-30c5cf1aaaa7"
+    }
+  */
+  #RefreshToken = async () => {
+    this.#LogDebugMessage(chalk.cyan(`STSOAuth2Worker:#RefreshToken:start`));
+    const sessionData = this.#clientSessionStore.get(this.#STORAGE_SESSION_KEY);
+    if (sessionData) {
+      this.#LogDebugMessage(chalk.cyan(`STSOAuth2Worker:#RefreshToken:sessionData: [${JSON.stringify(sessionData)}]`));
+      const currentSessionData = sessionData.tokenResponse;
+      const refreshFlowParameters = {
+        client_id: this.#options.client_id,
+        scope: this.#options.scope,
+        refresh_token: currentSessionData.refresh_token,
+        grant_type: OAuthGrantTypes.REFRESH_TOKEN
+      };
+      return await this.#GetTokenFromBroker(refreshFlowParameters);
+    } else {
+      this.#LogErrorMessage(chalk.red(`STSOAuth2Worker:#RefreshToken:sessionData not found within clientSessionStore`));
+      return false;
+    }
+  };
+  // call broker to logout
+  // broker to logout of server
+  // delete cookie
+  // clear session storage
+  // clear all state from $store
+  #Logout = async () => {
+    this.#LogInfoMessage("Logout");
+    const url = `${this.#options.brokerendpoint}:${this.#options.brokerport}${this.#options.brokerapiroot}/logout`;
+    this.#LogInfoMessage(url);
+    const sessionData = this.#clientSessionStore.get(this.#STORAGE_SESSION_KEY);
+    if (sessionData) {
+      const currentSessionData = sessionData.tokenResponse;
+      const refresh_token = currentSessionData.refresh_token;
+      this.#LogInfoMessage(refresh_token);
+      const decodedRefreshToken = jwtDecode(refresh_token);
+      this.#LogInfoMessage(decodedRefreshToken);
+      const sessionId = decodedRefreshToken.sts_session;
+      this.#LogInfoMessage(sessionId);
+      this.#clientSessionStore.remove(this.#STORAGE_SESSION_KEY);
+      this.#HandleAuthenticateEvent(null);
       try {
-        const rConfig = new STSAxiosConfig(url, "post").withDefaultHeaders().withData(authorizationCodeFlowParameters).withCredentials().withTimeout(__privateGet(this, _options2).timeout);
-        __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk.magenta(`#GetTokenFromBroker: request config: [${JSON.stringify(rConfig)}]`));
-        if (isNode && __privateGet(this, _agentManager)) {
-          rConfig.withAgentManager(__privateGet(this, _agentManager));
+        const rConfig = new STSAxiosConfig(url, "post").withData({
+          sessionId
+        }).withDefaultHeaders().withCredentials().withTimeout(this.#options.timeout);
+        if (isNode && this.#agentManager) {
+          rConfig.withAgentManager(this.#agentManager);
         }
-        __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk.magenta(`#GetTokenFromBroker: axios API call`));
+        this.#LogDebugMessage(chalk.magenta(`#Logout: request config: [${rConfig}]`));
         const retVal = await axios(rConfig.config);
-        __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk.magenta(`#GetTokenFromBroker: axios API call result: [${retVal.status}]`));
-        if (retVal.status === StatusCodes.OK) {
-          __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk.magenta(`#GetTokenFromBroker: storing tokens`));
-          const tokenResponse = retVal.data;
-          __privateGet(this, _HandleAuthenticateEvent2).call(this, tokenResponse.id_token);
-          const newSessionData = {
-            tokenResponse
-          };
-          if (isNode) {
-            newSessionData.brokerCookie = retVal.headers["set-cookie"];
-          }
-          __privateGet(this, _clientSessionStore).set(__privateGet(this, _STORAGE_SESSION_KEY), newSessionData);
+        if (retVal.data.status === StatusCodes.OK) {
           return true;
-        } else if (retVal.status === StatusCodes.UNAUTHORIZED) {
-          __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk.magenta(`#GetTokenFromBroker: NOT storing tokens, status: [${retVal.status}]`));
-          __privateGet(this, _HandleAuthenticateEvent2).call(this, null);
-          return false;
         } else {
-          __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk.magenta(`#GetTokenFromBroker: NOT storing tokens (general error 1), status: [${retVal.status}]`));
-          __privateGet(this, _HandleAuthenticateEvent2).call(this, null);
-          __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red("Could not obtain access_token from token end-point:-"));
-          __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red(JSON.stringify(retVal.data)));
+          this.#LogErrorMessage(chalk.red("Error during logout (1: server side)"));
+          this.#LogErrorMessage(chalk.red(JSON.stringify(retVal.data)));
           return false;
         }
       } catch (error) {
-        __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red(`#GetTokenFromBroker: NOT storing tokens (general error 2), status: [${error}]`));
-        __privateGet(this, _HandleAuthenticateEvent2).call(this, null);
+        this.#LogErrorMessage(chalk.red("Error during logout (2: server side)"));
+        this.#LogErrorMessage(chalk.red(error));
+        this.#LogErrorMessage(chalk.red(JSON.stringify(error)));
         return false;
       }
-    });
-    // Get access_token, refresh_token and id_token using OAuth2 Authorization Code Flow
-    __privateAdd(this, _GetToken, async (authorizeOptions, authorizeResponse) => {
-      __privateMethod(this, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, "#GetToken");
-      __privateMethod(this, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, authorizeResponse);
-      __privateGet(this, _clientSessionStore).remove(__privateGet(this, _STORAGE_SESSION_KEY));
-      const authorizationCodeFlowParameters = {
-        client_id: __privateGet(this, _options2).client_id,
-        scope: __privateGet(this, _options2).scope,
-        code: authorizeResponse.code,
-        redirect_uri: __privateGet(this, _options2).redirect_uri,
-        grant_type: OAuthGrantTypes.AUTHORIZATION_CODE,
-        code_verifier: authorizeOptions.code_verifier
-      };
-      return await __privateGet(this, _GetTokenFromBroker).call(this, authorizationCodeFlowParameters);
-    });
-    /*
-    	// Line breaks for legibility only
-    
-    POST /{tenant}/oauth2/v2.0/token HTTP/1.1
-    Host: https://login.microsoftonline.com
-    Content-Type: application/x-www-form-urlencoded
-    
-    client_id=535fb089-9ff3-47b6-9bfb-4f1264799865
-    &scope=https%3A%2F%2Fgraph.microsoft.com%2Fmail.read
-    &refresh_token=OAAABAAAAiL9Kn2Z27UubvWFPbm0gLWQJVzCTE9UkP3pSx1aXxUjq...
-    &grant_type=refresh_token
-    &client_secret=sampleCredentia1s    // NOTE: Only required for web apps. This secret needs to be URL-Encoded
-    
-    Error Response
-    {
-    	"error": "invalid_scope",
-    	"error_description": "AADSTS70011: The provided value for the input parameter 'scope' is not valid. The scope https://foo.microsoft.com/mail.read is not valid.\r\nTrace ID: 255d1aef-8c98-452f-ac51-23d051240864\r\nCorrelation ID: fb3d2015-bc17-4bb9-bb85-30c5cf1aaaa7\r\nTimestamp: 2016-01-09 02:02:12Z",
-    	"error_codes": [
-    	  70011
-    	],
-    	"timestamp": "2016-01-09 02:02:12Z",
-    	"trace_id": "255d1aef-8c98-452f-ac51-23d051240864",
-    	"correlation_id": "fb3d2015-bc17-4bb9-bb85-30c5cf1aaaa7"
-      }
-    */
-    __privateAdd(this, _RefreshToken, async () => {
-      __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk.cyan(`STSOAuth2Worker:#RefreshToken:start`));
-      const sessionData = __privateGet(this, _clientSessionStore).get(__privateGet(this, _STORAGE_SESSION_KEY));
-      if (sessionData) {
-        __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk.cyan(`STSOAuth2Worker:#RefreshToken:sessionData: [${JSON.stringify(sessionData)}]`));
-        const currentSessionData = sessionData.tokenResponse;
-        const refreshFlowParameters = {
-          client_id: __privateGet(this, _options2).client_id,
-          scope: __privateGet(this, _options2).scope,
-          refresh_token: currentSessionData.refresh_token,
-          grant_type: OAuthGrantTypes.REFRESH_TOKEN
-        };
-        return await __privateGet(this, _GetTokenFromBroker).call(this, refreshFlowParameters);
-      } else {
-        __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red(`STSOAuth2Worker:#RefreshToken:sessionData not found within clientSessionStore`));
-        return false;
-      }
-    });
-    // call broker to logout
-    // broker to logout of server
-    // delete cookie
-    // clear session storage
-    // clear all state from $store
-    __privateAdd(this, _Logout, async () => {
-      __privateMethod(this, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, "Logout");
-      const url = `${__privateGet(this, _options2).brokerendpoint}:${__privateGet(this, _options2).brokerport}${__privateGet(this, _options2).brokerapiroot}/logout`;
-      __privateMethod(this, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, url);
-      const sessionData = __privateGet(this, _clientSessionStore).get(__privateGet(this, _STORAGE_SESSION_KEY));
-      if (sessionData) {
-        const currentSessionData = sessionData.tokenResponse;
-        const refresh_token = currentSessionData.refresh_token;
-        __privateMethod(this, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, refresh_token);
-        const decodedRefreshToken = jwtDecode(refresh_token);
-        __privateMethod(this, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, decodedRefreshToken);
-        const sessionId = decodedRefreshToken.sts_session;
-        __privateMethod(this, _STSOAuth2Worker_instances, LogInfoMessage_fn2).call(this, sessionId);
-        __privateGet(this, _clientSessionStore).remove(__privateGet(this, _STORAGE_SESSION_KEY));
-        __privateGet(this, _HandleAuthenticateEvent2).call(this, null);
-        try {
-          const rConfig = new STSAxiosConfig(url, "post").withData({
-            sessionId
-          }).withDefaultHeaders().withCredentials().withTimeout(__privateGet(this, _options2).timeout);
-          if (isNode && __privateGet(this, _agentManager)) {
-            rConfig.withAgentManager(__privateGet(this, _agentManager));
-          }
-          __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk.magenta(`#Logout: request config: [${rConfig}]`));
-          const retVal = await axios(rConfig.config);
-          if (retVal.data.status === StatusCodes.OK) {
-            return true;
-          } else {
-            __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red("Error during logout (1: server side)"));
-            __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red(JSON.stringify(retVal.data)));
-            return false;
-          }
-        } catch (error) {
-          __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red("Error during logout (2: server side)"));
-          __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red(error));
-          __privateMethod(this, _STSOAuth2Worker_instances, LogErrorMessage_fn2).call(this, chalk.red(JSON.stringify(error)));
-          return false;
-        }
-      } else {
-        __privateMethod(this, _STSOAuth2Worker_instances, 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, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, `STSOAuth2Worker:constructor:#options: [${JSON.stringify(__privateGet(this, _options2))}]`);
-    __privateSet(this, _clientSessionStore, new ClientStorageFactory({ clientStorageType: ClientStorageType.MEMORY_STORAGE, usePrefix: false }).GetStorage());
-    __privateSet(this, _oauthWorkerPort, workerPort);
-    __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, `STSOAuth2Worker:constructor:#oauthWorkerPort: [${JSON.stringify(__privateGet(this, _oauthWorkerPort))}]`);
-    if (isNode && __privateGet(this, _options2).agentOptions) {
-      __privateSet(this, _agentManager, new AgentManager({
-        agentOptions: __privateGet(this, _options2).agentOptions,
-        httpAgentFactory(options2) {
-          return new http.Agent(options2);
-        },
-        httpsAgentFactory(options2) {
-          return new https.Agent(options2);
-        }
-      }));
+    } else {
+      this.#LogInfoMessage("Error during logout. Could not restore session from session storage.");
+      return false;
     }
-    this.SetupListener();
-    __privateGet(this, _UpdateInstrument).call(this, Gauge.LOGGER, {
-      LogMessage: `STSOauth2 Plugin - Successfully Loaded`
-    });
-  }
+  };
 }
-_clientSessionStore = new WeakMap();
-_cUtils = new WeakMap();
-_qParams = new WeakMap();
-_STORAGE_SESSION_KEY = new WeakMap();
-_oauthWorkerPort = new WeakMap();
-_options2 = new WeakMap();
-_logger = new WeakMap();
-_agentManager = new WeakMap();
-_STSOAuth2Worker_instances = new WeakSet();
-// eslint-disable-next-line  @typescript-eslint/no-explicit-any
-LogDebugMessage_fn2 = function(message) {
-  __privateGet(this, _logger).debug(message);
-};
-// eslint-disable-next-line  @typescript-eslint/no-explicit-any
-LogInfoMessage_fn2 = function(message) {
-  __privateGet(this, _logger).info(message);
-};
-// eslint-disable-next-line  @typescript-eslint/no-explicit-any
-LogErrorMessage_fn2 = function(message) {
-  __privateGet(this, _logger).error(message);
-};
-_HandleAuthenticateEvent2 = new WeakMap();
-_HandleErrorEvent2 = new WeakMap();
-_LogMessage = new WeakMap();
-_GetAccessToken = new WeakMap();
-_GetCookies = new WeakMap();
-_UpdateInstrument = new WeakMap();
-_ProcessCommand = new WeakMap();
-_RestoreSession = new WeakMap();
-_Authorize = new WeakMap();
-_HandleRedirect = new WeakMap();
-_GetTokenFromBroker = new WeakMap();
-_GetToken = new WeakMap();
-_RefreshToken = new WeakMap();
-_Logout = new WeakMap();
 const TestStore = defineStore("__sts__TestStore", {
   state: () => {
     return {