@rockcarver/frodo-lib 0.16.2-2 → 0.16.2-4

package/esm/api/BaseApi.mjs

@@ -8,7 +8,7 @@ import storage from '../storage/SessionStorage';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { curlirizeMessage, printMessage } from '../ops/utils/Console';
-import _curlirize from 'axios-curlirize';
+import _curlirize from '../ext/axios-curlirize/curlirize';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../package.json'), 'utf8'));
 axiosRetry(axios, {
@@ -107,7 +107,10 @@ export function generateAmApi(resource, requestOverride = {}) {
   let headers = {
     'User-Agent': userAgent,
     'Content-Type': 'application/json',
-    'Accept-API-Version': resource.apiVersion,
+    // only add API version if we have it
+    ...(resource.apiVersion && {
+      'Accept-API-Version': resource.apiVersion
+    }),
     // only send session cookie if we know its name and value
     ...(storage.session.getCookieName() && storage.session.getCookieValue() && {
       Cookie: `${storage.session.getCookieName()}=${storage.session.getCookieValue()}`
@@ -151,8 +154,14 @@ export function generateAmApi(resource, requestOverride = {}) {
 export function generateOauth2Api(resource, requestOverride = {}) {
   let headers = {
     'User-Agent': userAgent,
-    'Accept-API-Version': resource.apiVersion,
-    Cookie: `${storage.session.raw['cookieName']}=${storage.session.raw['cookieValue']}`
+    // only add API version if we have it
+    ...(resource.apiVersion && {
+      'Accept-API-Version': resource.apiVersion
+    }),
+    // only send session cookie if we know its name and value
+    ...(storage.session.getCookieName() && storage.session.getCookieValue() && {
+      Cookie: `${storage.session.getCookieName()}=${storage.session.getCookieValue()}`
+    })
   };
   if (requestOverride['headers']) {
     headers = {
@@ -288,7 +297,10 @@ export function generateESVApi(resource, requestOverride = {}) {
   const headers = {
     'User-Agent': userAgent,
     'Content-Type': 'application/json',
-    'Accept-API-Version': resource.apiVersion
+    // only add API version if we have it
+    ...(resource.apiVersion && {
+      'Accept-API-Version': resource.apiVersion
+    })
   };
   const requestDetails = {
     // baseURL: getTenantURL(storage.session.getTenant()),

package/esm/ext/axios-curlirize/curlirize.mjs

@@ -0,0 +1,38 @@
+import { CurlHelper } from './lib/CurlHelper';
+function defaultLogCallback(curlResult, err = undefined) {
+  const {
+    command
+  } = curlResult;
+  if (err) {
+    console.error(err);
+  } else {
+    console.info(command);
+  }
+}
+export default ((instance, callback = defaultLogCallback) => {
+  instance.interceptors.request.use(req => {
+    try {
+      const curl = new CurlHelper(req);
+      req.curlObject = curl;
+      req.curlCommand = curl.generateCommand();
+      req.clearCurl = () => {
+        delete req.curlObject;
+        delete req.curlCommand;
+        delete req.clearCurl;
+      };
+    } catch (err) {
+      // Even if the axios middleware is stopped, no error should occur outside.
+      callback(null, err);
+    } finally {
+      if (req.curlirize !== false) {
+        callback({
+          command: req.curlCommand,
+          object: req.curlObject
+        });
+      }
+      // eslint-disable-next-line no-unsafe-finally
+      return req;
+    }
+  });
+});
+//# sourceMappingURL=curlirize.js.map

package/esm/ext/axios-curlirize/lib/CurlHelper.mjs

@@ -0,0 +1,67 @@
+export class CurlHelper {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+  constructor(config) {
+    this.request = config;
+  }
+  getHeaders() {
+    let headers = this.request.headers,
+      curlHeaders = '';
+
+    // get the headers concerning the appropriate method (defined in the global axios instance)
+    // eslint-disable-next-line no-prototype-builtins
+    if (headers.hasOwnProperty('common')) {
+      headers = this.request.headers[this.request.method];
+    }
+
+    // add any custom headers (defined upon calling methods like .get(), .post(), etc.)
+    for (const property in this.request.headers) {
+      if (!['common', 'delete', 'get', 'head', 'patch', 'post', 'put'].includes(property)) {
+        headers[property] = this.request.headers[property];
+      }
+    }
+    for (const property in headers) {
+      const header = `${property}:${headers[property]}`;
+      curlHeaders = `${curlHeaders} -H "${header}"`;
+    }
+    return curlHeaders.trim();
+  }
+  getMethod() {
+    return `-X ${this.request.method.toUpperCase()}`;
+  }
+  getBody() {
+    if (typeof this.request.data !== 'undefined' && this.request.data !== '' && this.request.data !== null && this.request.method.toUpperCase() !== 'GET') {
+      const data = typeof this.request.data === 'object' || Object.prototype.toString.call(this.request.data) === '[object Array]' ? JSON.stringify(this.request.data) : this.request.data;
+      return `--data '${data}'`.trim();
+    } else {
+      return '';
+    }
+  }
+  getUrl() {
+    if (this.request.baseURL) {
+      return this.request.baseURL + '/' + this.request.url;
+    }
+    return this.request.url;
+  }
+  getQueryString() {
+    let params = '',
+      i = 0;
+    for (const param in this.request.params) {
+      params += i !== 0 ? `&${param}=${this.request.params[param]}` : `?${param}=${this.request.params[param]}`;
+      i++;
+    }
+    return params;
+  }
+  getBuiltURL() {
+    let url = this.getUrl();
+    if (this.getQueryString() !== '') {
+      url = url.charAt(url.length - 1) === '/' ? url.substr(0, url.length - 1) : url;
+      url += this.getQueryString();
+    }
+    return url.trim();
+  }
+  generateCommand() {
+    return `curl ${this.getMethod()} ${this.getHeaders()} ${this.getBody()} "${this.getBuiltURL()}"`.trim().replace(/\s{2,}/g, ' ');
+  }
+}
+//# sourceMappingURL=CurlHelper.js.map

package/esm/index.mjs

@@ -2,6 +2,7 @@ import Color from 'colors';
 Color.enable();
 
 // Api Layer
+export * as AgentRaw from './api/AgentApi';
 export * as EmailTemplateRaw from './api/EmailTemplateApi';
 export * as NodeRaw from './api/NodeApi';
 export * as SecretsRaw from './api/SecretsApi';
@@ -13,6 +14,7 @@ export * as VariablesRaw from './api/VariablesApi';
 
 // Ops Layer
 export * as Admin from './ops/AdminOps';
+export * as Agent from './ops/AgentOps';
 export * as Authenticate from './ops/AuthenticateOps';
 export * as CirclesOfTrust from './ops/CirclesOfTrustOps';
 export * as ConnectionProfile from './ops/ConnectionProfileOps';