@nsshunt/stsoauth2plugin 1.0.113 → 1.0.114

package/dist/stsoauth2plugin.mjs

@@ -17,7 +17,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     return __privateGet(obj, member, getter);
   }
 });
-var _router, _STORAGE_AUTHORIZE_OPTIONS_KEY, _aic, _options2, _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, _options3, _logger, _agentManager, _STSOAuth2Worker_instances, LogDebugMessage_fn2, LogInfoMessage_fn2, LogErrorMessage_fn2, _HandleAuthenticateEvent2, _HandleErrorEvent2, _LogMessage, _GetAccessToken, _GetCookies, _UpdateInstrument, _ProcessCommand, _RestoreSession, _Authorize, _HandleRedirect, _GetTokenFromBroker, _GetToken, _RefreshToken, _Logout;
+var _router, _STORAGE_AUTHORIZE_OPTIONS_KEY, _aic, _options2, _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, _options3, _logger, _agentManager2, _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 } from "@nsshunt/stsutils";
@@ -3301,7 +3301,7 @@ var __privateWrapper2 = (obj, member, setter, getter) => ({
     return __privateGet2(obj, member, getter);
   }
 });
-var _options, _httpAgent, _httpsAgent, _agentResetInterval, _requestCount, _SetupResetInterval, _GetAgentOptions;
+var _options, _httpAgent, _httpsAgent, _agentResetInterval, _requestCount, _SetupResetInterval, _GetAgentOptions, _url, _method, _headers, _data, _agentManager, _timeout, _withCredentials;
 var ansiStyles$1 = { exports: {} };
 var colorName;
 var hasRequiredColorName;
@@ -5071,6 +5071,86 @@ _agentResetInterval = /* @__PURE__ */ new WeakMap();
 _requestCount = /* @__PURE__ */ new WeakMap();
 _SetupResetInterval = /* @__PURE__ */ new WeakMap();
 _GetAgentOptions = /* @__PURE__ */ new WeakMap();
+class STSAxiosConfig {
+  constructor(url, method, headers, timeout) {
+    __privateAdd2(this, _url);
+    __privateAdd2(this, _method);
+    __privateAdd2(this, _headers);
+    __privateAdd2(this, _data);
+    __privateAdd2(this, _agentManager);
+    __privateAdd2(this, _timeout);
+    __privateAdd2(this, _withCredentials);
+    __privateSet2(this, _url, url);
+    __privateSet2(this, _method, method);
+    if (headers !== void 0) {
+      __privateSet2(this, _headers, headers);
+    }
+    if (timeout !== void 0) {
+      __privateSet2(this, _timeout, timeout);
+    }
+  }
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  withData(data) {
+    __privateSet2(this, _data, data);
+    return this;
+  }
+  // 'Content-Type': 'application/json'
+  withHeaders(headers) {
+    __privateSet2(this, _headers, headers);
+    return this;
+  }
+  withDefaultHeaders() {
+    __privateSet2(this, _headers, {
+      "Content-Type": "application/json"
+    });
+    return this;
+  }
+  withCredentials() {
+    __privateSet2(this, _withCredentials, true);
+    return this;
+  }
+  withTimeout(timeout) {
+    __privateSet2(this, _timeout, timeout);
+    return this;
+  }
+  withAgentManager(agentManager) {
+    __privateSet2(this, _agentManager, agentManager);
+    return this;
+  }
+  get config() {
+    const retVal = {
+      url: __privateGet2(this, _url),
+      method: __privateGet2(this, _method)
+    };
+    if (__privateGet2(this, _headers)) {
+      retVal.headers = __privateGet2(this, _headers);
+    }
+    if (__privateGet2(this, _agentManager) !== void 0) {
+      if (__privateGet2(this, _agentManager).IsHttps(__privateGet2(this, _url))) {
+        retVal.httpsAgent = __privateGet2(this, _agentManager).GetAgent(__privateGet2(this, _url));
+      } else {
+        retVal.httpAgent = __privateGet2(this, _agentManager).GetAgent(__privateGet2(this, _url));
+      }
+    }
+    if (__privateGet2(this, _data) !== void 0) {
+      retVal.data = __privateGet2(this, _data);
+    }
+    if (__privateGet2(this, _timeout) !== void 0) {
+      retVal.timeout = __privateGet2(this, _timeout);
+    }
+    if (__privateGet2(this, _withCredentials) !== void 0 && __privateGet2(this, _withCredentials) === true) {
+      retVal.withCredentials = true;
+    }
+    return retVal;
+  }
+}
+_url = /* @__PURE__ */ new WeakMap();
+_method = /* @__PURE__ */ new WeakMap();
+_headers = /* @__PURE__ */ new WeakMap();
+_data = /* @__PURE__ */ new WeakMap();
+_agentManager = /* @__PURE__ */ new WeakMap();
+_timeout = /* @__PURE__ */ new WeakMap();
+_withCredentials = /* @__PURE__ */ new WeakMap();
 class STSOAuth2Worker {
   constructor(workerPort, options, logger) {
     __privateAdd(this, _STSOAuth2Worker_instances);
@@ -5083,7 +5163,7 @@ class STSOAuth2Worker {
     __privateAdd(this, _oauthWorkerPort);
     __privateAdd(this, _options3);
     __privateAdd(this, _logger);
-    __privateAdd(this, _agentManager, null);
+    __privateAdd(this, _agentManager2, null);
     // Attempt to restore a previous session using the STSBroker
     /*
         { parameterType: OAuth2ParameterType.CLIENT_ID, errorType: authErrorType.CLIENT_ID_MISMATCH },
@@ -5224,28 +5304,17 @@ class STSOAuth2Worker {
         __privateGet(this, _LogMessage).call(this, "RestoreSession.");
         __privateGet(this, _LogMessage).call(this, url);
         try {
-          const rConfig = {
-            method: "post",
-            url,
-            data: {
-              [OAuth2ParameterType.CLIENT_ID]: __privateGet(this, _options3).client_id,
-              [OAuth2ParameterType.SCOPE]: __privateGet(this, _options3).scope,
-              [OAuth2ParameterType.REDIRECT_URI]: __privateGet(this, _options3).redirect_uri,
-              [OAuth2ParameterType.AUDIENCE]: __privateGet(this, _options3).audience
-            },
-            withCredentials: true,
-            // Ensure cookies are passed to the service
-            timeout: __privateGet(this, _options3).timeout
-          };
+          const rConfig = new STSAxiosConfig(url, "post").withData({
+            [OAuth2ParameterType.CLIENT_ID]: __privateGet(this, _options3).client_id,
+            [OAuth2ParameterType.SCOPE]: __privateGet(this, _options3).scope,
+            [OAuth2ParameterType.REDIRECT_URI]: __privateGet(this, _options3).redirect_uri,
+            [OAuth2ParameterType.AUDIENCE]: __privateGet(this, _options3).audience
+          }).withDefaultHeaders().withCredentials().withTimeout(__privateGet(this, _options3).timeout);
           __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk$2.magenta(`#RestoreSession:session request detail: [${JSON.stringify(rConfig)}]`));
-          if (isNode && __privateGet(this, _agentManager)) {
-            if (__privateGet(this, _agentManager).IsHttps(url)) {
-              rConfig.httpsAgent = __privateGet(this, _agentManager).GetAgent(url);
-            } else {
-              rConfig.httpAgent = __privateGet(this, _agentManager).GetAgent(url);
-            }
+          if (isNode && __privateGet(this, _agentManager2)) {
+            rConfig.withAgentManager(__privateGet(this, _agentManager2));
           }
-          const retVal = await axios(rConfig);
+          const retVal = await axios(rConfig.config);
           if (retVal.data.status === StatusCodes.OK) {
             restoredSessionData = retVal.data.detail;
             if (restoredSessionData) {
@@ -5370,24 +5439,13 @@ class STSOAuth2Worker {
       __privateGet(this, _clientSessionStore).remove(__privateGet(this, _STORAGE_SESSION_KEY));
       const url = `${__privateGet(this, _options3).brokerendpoint}:${__privateGet(this, _options3).brokerport}${__privateGet(this, _options3).brokerapiroot}/token`;
       try {
-        const rConfig = {
-          method: "post",
-          url,
-          data: authorizationCodeFlowParameters,
-          withCredentials: true,
-          // Ensure cookies are passed to the service
-          timeout: __privateGet(this, _options3).timeout
-        };
+        const rConfig = new STSAxiosConfig(url, "post").withDefaultHeaders().withData(authorizationCodeFlowParameters).withCredentials().withTimeout(__privateGet(this, _options3).timeout);
         __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk$2.magenta(`#GetTokenFromBroker: request config: [${JSON.stringify(rConfig)}]`));
-        if (isNode && __privateGet(this, _agentManager)) {
-          if (__privateGet(this, _agentManager).IsHttps(url)) {
-            rConfig.httpsAgent = __privateGet(this, _agentManager).GetAgent(url);
-          } else {
-            rConfig.httpAgent = __privateGet(this, _agentManager).GetAgent(url);
-          }
+        if (isNode && __privateGet(this, _agentManager2)) {
+          rConfig.withAgentManager(__privateGet(this, _agentManager2));
         }
         __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk$2.magenta(`#GetTokenFromBroker: axios API call`));
-        const retVal = await axios(rConfig);
+        const retVal = await axios(rConfig.config);
         __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk$2.magenta(`#GetTokenFromBroker: axios API call result: [${retVal.status}]`));
         if (retVal.status === StatusCodes.OK) {
           __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk$2.magenta(`#GetTokenFromBroker: storing tokens`));
@@ -5497,25 +5555,14 @@ class STSOAuth2Worker {
         __privateGet(this, _clientSessionStore).remove(__privateGet(this, _STORAGE_SESSION_KEY));
         __privateGet(this, _HandleAuthenticateEvent2).call(this, null);
         try {
-          const rConfig = {
-            method: "post",
-            url,
-            data: {
-              sessionId
-            },
-            withCredentials: true,
-            // Ensure cookies are passed to the service
-            timeout: __privateGet(this, _options3).timeout
-          };
-          __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk$2.magenta(`#Logout: request config: [${rConfig}]`));
-          if (isNode && __privateGet(this, _agentManager)) {
-            if (__privateGet(this, _agentManager).IsHttps(url)) {
-              rConfig.httpsAgent = __privateGet(this, _agentManager).GetAgent(url);
-            } else {
-              rConfig.httpAgent = __privateGet(this, _agentManager).GetAgent(url);
-            }
+          const rConfig = new STSAxiosConfig(url, "post").withData({
+            sessionId
+          }).withDefaultHeaders().withCredentials().withTimeout(__privateGet(this, _options3).timeout);
+          if (isNode && __privateGet(this, _agentManager2)) {
+            rConfig.withAgentManager(__privateGet(this, _agentManager2));
           }
-          const retVal = await axios(rConfig);
+          __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, chalk$2.magenta(`#Logout: request config: [${rConfig}]`));
+          const retVal = await axios(rConfig.config);
           if (retVal.data.status === StatusCodes.OK) {
             return true;
           } else {
@@ -5541,7 +5588,7 @@ class STSOAuth2Worker {
     __privateSet(this, _oauthWorkerPort, workerPort);
     __privateMethod(this, _STSOAuth2Worker_instances, LogDebugMessage_fn2).call(this, `STSOAuth2Worker:constructor:#oauthWorkerPort: [${JSON.stringify(__privateGet(this, _oauthWorkerPort))}]`);
     if (isNode && __privateGet(this, _options3).agentOptions) {
-      __privateSet(this, _agentManager, new AgentManager({
+      __privateSet(this, _agentManager2, new AgentManager({
         agentOptions: __privateGet(this, _options3).agentOptions
       }));
     }
@@ -5558,7 +5605,7 @@ _STORAGE_SESSION_KEY = new WeakMap();
 _oauthWorkerPort = new WeakMap();
 _options3 = new WeakMap();
 _logger = new WeakMap();
-_agentManager = new WeakMap();
+_agentManager2 = new WeakMap();
 _STSOAuth2Worker_instances = new WeakSet();
 // eslint-disable-next-line  @typescript-eslint/no-explicit-any
 LogDebugMessage_fn2 = function(message) {