@k-int/bruno-shared-scripts 1.0.0 → 1.1.1

package/es/index.js

@@ -2,6 +2,9 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __esm = (fn, res) => function __init() {
+  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -16,12 +19,180 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// src/utils/baseUrl.js
+var okapiProtocol, okapiUrl, okapiPort, getBaseUrl, setBaseUrl;
+var init_baseUrl = __esm({
+  "src/utils/baseUrl.js"() {
+    okapiProtocol = bru.getEnvVar("okapiProtocol");
+    okapiUrl = bru.getEnvVar("okapiUrl");
+    okapiPort = bru.getEnvVar("okapiPort");
+    getBaseUrl = () => {
+      return bru.getEnvVar("baseUrl");
+    };
+    setBaseUrl = () => {
+      const baseUrl = `${okapiProtocol}://${okapiUrl}${okapiPort ? ":" + okapiPort : ""}`;
+      bru.setEnvVar("baseUrl", baseUrl);
+    };
+  }
+});
+
+// src/auth/auth-utils.js
+var getTenant, getToken, getIgnoreCreds, getUserName, getPassword, getCreds;
+var init_auth_utils = __esm({
+  "src/auth/auth-utils.js"() {
+    getTenant = () => {
+      return bru.getEnvVar("x-okapi-tenant-value");
+    };
+    getToken = () => {
+      return bru.getVar("x-okapi-token");
+    };
+    getIgnoreCreds = () => {
+      return bru.getEnvVar("ignoreCreds");
+    };
+    getUserName = () => {
+      return bru.getEnvVar("username");
+    };
+    getPassword = () => {
+      return bru.getEnvVar("password");
+    };
+    getCreds = () => {
+      const username = getUserName();
+      const password = getPassword();
+      return {
+        username,
+        password
+      };
+    };
+  }
+});
+
+// src/auth/login.js
+var axios, getLoginWithExpiryUrl, getLoginUrl, doALogin, loginFunc, login, loginWithExpiry;
+var init_login = __esm({
+  "src/auth/login.js"() {
+    init_utils();
+    init_auth_utils();
+    axios = require("axios");
+    getLoginWithExpiryUrl = () => {
+      const baseUrl = getBaseUrl();
+      return `${baseUrl}/bl-users/login-with-expiry`;
+    };
+    getLoginUrl = () => {
+      const baseUrl = getBaseUrl();
+      return `${baseUrl}/authn/login`;
+    };
+    doALogin = async ({
+      urlOverride = void 0,
+      withExpiry = true,
+      suppressConsole = true
+    } = {}) => {
+      !suppressConsole && console.log(`doALogin(${urlOverride}, ${withExpiry})`);
+      const ignoreCreds = getIgnoreCreds();
+      const preExistingHeaders = req.getHeaders();
+      const preExistingTenant = preExistingHeaders[Object.keys(preExistingHeaders).find((key) => key.toLowerCase() === "X-Okapi-Tenant".toLowerCase())];
+      if (!preExistingTenant) {
+        req.setHeader("x-okapi-tenant", getTenant());
+      }
+      if (!ignoreCreds || ignoreCreds === false) {
+        const url = urlOverride ?? (withExpiry ? getLoginWithExpiryUrl() : getLoginUrl());
+        const creds = getCreds();
+        const tenant = getTenant();
+        const config = getBaseRequestConfig();
+        !suppressConsole && console.log(`Sending login request to ${url} with creds ${JSON.stringify(creds)} for tenant: ${tenant}`);
+        return await axios.post(
+          url,
+          creds,
+          config
+        );
+      }
+    };
+    loginFunc = async ({
+      urlOverride = void 0,
+      withExpiry = true,
+      suppressConsole = true
+    } = {}) => {
+      !suppressConsole && console.log(`loginFunc(${urlOverride}, ${withExpiry})`);
+      await doALogin({ urlOverride, withExpiry, suppressConsole }).then((loginResp) => {
+        !suppressConsole && console.log("Setting request headers...");
+        req.setHeader("Cookie", loginResp.headers["set-cookie"]);
+        const token = loginResp.headers["x-okapi-token"];
+        bru.setVar("x-okapi-token-value", token);
+        if (!withExpiry) {
+          req.setHeader("x-okapi-token", getToken());
+        }
+      }).catch((err) => {
+        console.error("Failed to login to folio: %o", err);
+      });
+    };
+    login = (urlOverride) => loginFunc({ urlOverride, withExpiry: false });
+    loginWithExpiry = (urlOverride) => loginFunc({ urlOverride });
+  }
+});
+
+// src/auth/index.js
+var auth_exports = {};
+__export(auth_exports, {
+  doALogin: () => doALogin,
+  getCreds: () => getCreds,
+  getIgnoreCreds: () => getIgnoreCreds,
+  getLoginUrl: () => getLoginUrl,
+  getLoginWithExpiryUrl: () => getLoginWithExpiryUrl,
+  getPassword: () => getPassword,
+  getTenant: () => getTenant,
+  getToken: () => getToken,
+  getUserName: () => getUserName,
+  login: () => login,
+  loginWithExpiry: () => loginWithExpiry
+});
+var init_auth = __esm({
+  "src/auth/index.js"() {
+    init_login();
+    init_auth_utils();
+  }
+});
+
+// src/utils/config.js
+var getBaseRequestConfig;
+var init_config = __esm({
+  "src/utils/config.js"() {
+    init_auth();
+    getBaseRequestConfig = () => {
+      const tenant = getTenant();
+      return {
+        headers: {
+          "Content-type": "application/json",
+          "x-okapi-tenant": tenant
+        }
+      };
+    };
+  }
+});
+
+// src/utils/index.js
+var utils_exports = {};
+__export(utils_exports, {
+  getBaseRequestConfig: () => getBaseRequestConfig,
+  getBaseUrl: () => getBaseUrl,
+  setBaseUrl: () => setBaseUrl
+});
+var init_utils = __esm({
+  "src/utils/index.js"() {
+    init_baseUrl();
+    init_config();
+  }
+});
+
 // src/index.js
 var index_exports = {};
 __export(index_exports, {
+  doALogin: () => doALogin,
+  getBaseRequestConfig: () => getBaseRequestConfig,
   getBaseUrl: () => getBaseUrl,
   getCreds: () => getCreds,
+  getFolioAxios: () => getFolioAxios,
   getIgnoreCreds: () => getIgnoreCreds,
+  getLoginUrl: () => getLoginUrl,
+  getLoginWithExpiryUrl: () => getLoginWithExpiryUrl,
   getPassword: () => getPassword,
   getTenant: () => getTenant,
   getToken: () => getToken,
@@ -31,87 +202,27 @@ __export(index_exports, {
   setBaseUrl: () => setBaseUrl
 });
 module.exports = __toCommonJS(index_exports);
+init_utils();
+init_auth();
 
-// src/utils/baseUrl.js
-var okapiProtocol = bru.getEnvVar("okapiProtocol");
-var okapiUrl = bru.getEnvVar("okapiUrl");
-var okapiPort = bru.getEnvVar("okapiPort");
-var getBaseUrl = () => {
-  return bru.getEnvVar("baseUrl");
-};
-var setBaseUrl = () => {
-  const baseUrl = `${okapiProtocol}://${okapiUrl}${okapiPort ? ":" + okapiPort : ""}`;
-  bru.setEnvVar("baseUrl", baseUrl);
-};
-
-// src/auth/auth-utils.js
-var getTenant = () => {
-  return bru.getEnvVar("x-okapi-tenant-value");
-};
-var getToken = () => {
-  return bru.getVar("x-okapi-token");
-};
-var getIgnoreCreds = () => {
-  return bru.getEnvVar("ignoreCreds");
-};
-var getUserName = () => {
-  return bru.getEnvVar("username");
-};
-var getPassword = () => {
-  return bru.getEnvVar("password");
-};
-var getCreds = () => {
-  const username = getUserName();
-  const password = getPassword();
-  return {
-    username,
-    password
-  };
-};
-
-// src/auth/login.js
-var axios = require("axios");
-var getLoginWithExpiryUrl = () => {
-  const baseUrl = getBaseUrl();
-  return `${baseUrl}/bl-users/login-with-expiry`;
-};
-var getLoginUrl = () => {
-  const baseUrl = getBaseUrl();
-  return `${baseUrl}/authn/login`;
-};
-var loginFunc = async (urlOverride = void 0, withExpiry = true) => {
-  const ignoreCreds = getIgnoreCreds();
-  console.log("URL OVERRIDE: %o", urlOverride);
-  const preExistingHeaders = req.getHeaders();
-  const preExistingTenant = preExistingHeaders[Object.keys(preExistingHeaders).find((key) => key.toLowerCase() === "X-Okapi-Tenant".toLowerCase())];
-  if (!preExistingTenant) {
-    req.setHeader("x-okapi-tenant", getTenant());
-  }
-  if (!ignoreCreds || ignoreCreds === false) {
-    const url = urlOverride ?? (withExpiry ? getLoginWithExpiryUrl() : getLoginUrl());
-    const creds = getCreds();
-    const tenant = getTenant();
-    console.log(`Sending login request to ${url} with creds ${JSON.stringify(creds)} for tenant: ${tenant}`);
-    await axios.post(
-      url,
-      creds,
-      {
-        headers: {
-          "Content-type": "application/json",
-          "x-okapi-tenant": tenant
-        }
-      }
-    ).then((internalResp) => {
-      req.setHeader("Cookie", internalResp.headers["set-cookie"]);
-      const token = internalResp.headers["x-okapi-token"];
-      bru.setVar("x-okapi-token-value", token);
-    }).catch((err) => {
-      console.error("WHAT HAPPENED HERE: %o", err);
-    });
+// src/folioRequest.js
+var { doALogin: doALogin2 } = (init_auth(), __toCommonJS(auth_exports));
+var axios2 = require("axios");
+var { getBaseRequestConfig: getBaseRequestConfig2 } = (init_utils(), __toCommonJS(utils_exports));
+var getFolioAxios = async ({
+  urlOverride = void 0,
+  withExpiry = true,
+  suppressConsole = true
+} = {}) => {
+  return doALogin2({ urlOverride, withExpiry, suppressConsole }).then((loginResp) => {
+    const config = getBaseRequestConfig2();
+    config.headers.Cookie = loginResp.headers["set-cookie"];
     if (!withExpiry) {
-      req.setHeader("x-okapi-token", getToken());
+      config.headers["x-okapi-token"] = loginResp.headers["x-okapi-token"];
     }
-  }
+    !suppressConsole && console.log("folioRequest ready with config: %o", config);
+    return axios2.create(config);
+  }).catch((err) => {
+    console.error("Failed to login to folio: %o", err);
+  });
 };
-var login = (urlOverride) => loginFunc(urlOverride, false);
-var loginWithExpiry = (urlOverride) => loginFunc(urlOverride);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k-int/bruno-shared-scripts",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "exports": "./es/index.js",
   "main": "src/index.js",
   "type": "module",

package/src/auth/login.js

@@ -1,5 +1,5 @@
 //import axios from 'axios';
-import { getBaseUrl } from "../utils";
+import { getBaseRequestConfig, getBaseUrl } from "../utils";
 import { getCreds, getIgnoreCreds, getTenant, getToken } from './auth-utils';
 
 const axios = require('axios'); // This comes from bruno context...
@@ -15,15 +15,21 @@ const getLoginUrl = () => {
   return `${baseUrl}/authn/login`;
 }
 
-const loginFunc = async (urlOverride = undefined, withExpiry = true) => {
+const doALogin = async ({
+  urlOverride = undefined,
+  withExpiry = true,
+  suppressConsole = true
+} = {}) => {
+  !suppressConsole && console.log(`doALogin(${urlOverride}, ${withExpiry})`);
+
   const ignoreCreds = getIgnoreCreds();
-  console.log("URL OVERRIDE: %o", urlOverride)
+  //console.log("URL OVERRIDE: %o", urlOverride)
 
   // Ensure that x-okapi-tenant is set if NOT set by request
   const preExistingHeaders = req.getHeaders();
   const preExistingTenant = preExistingHeaders[
     Object.keys(preExistingHeaders).find((key) => key.toLowerCase() === 'X-Okapi-Tenant'.toLowerCase())
-  ] // Make sure this is case insensitive
+    ] // Make sure this is case insensitive
 
   if (!preExistingTenant) {
     req.setHeader('x-okapi-tenant', getTenant()) // Keep an eye on this in PM we needed some funky stuff for "disabled" headers
@@ -34,42 +40,50 @@ const loginFunc = async (urlOverride = undefined, withExpiry = true) => {
     const url = urlOverride ?? (withExpiry ? getLoginWithExpiryUrl() : getLoginUrl());
     const creds = getCreds();
     const tenant = getTenant();
-    console.log(`Sending login request to ${url} with creds ${JSON.stringify(creds)} for tenant: ${tenant}`);
+    const config = getBaseRequestConfig();
+    !suppressConsole && console.log(`Sending login request to ${url} with creds ${JSON.stringify(creds)} for tenant: ${tenant}`);
 
-    await axios.post(
+    return await axios.post(
       url,
       creds,
-      {
-        headers: {
-          "Content-type": "application/json",
-          "x-okapi-tenant": tenant
-        },
-      }
-    ).then((internalResp) => {
-      //console.log("HEADERS: %o", internalResp.headers)
+      config
+    )
+  }
+}
 
+const loginFunc = async ({
+  urlOverride = undefined,
+  withExpiry = true,
+  suppressConsole = true
+} = {}) => {
+  !suppressConsole && console.log(`loginFunc(${urlOverride}, ${withExpiry})`);
+  await doALogin({ urlOverride, withExpiry, suppressConsole })
+    .then((loginResp) => {
+      !suppressConsole && console.log("Setting request headers...")
       // We can't seem to set the cookie jar programatically, so directly set cookies on request instead
-      req.setHeader('Cookie', internalResp.headers["set-cookie"])
-  
-      const token = internalResp.headers["x-okapi-token"]
+      req.setHeader('Cookie', loginResp.headers["set-cookie"])
+
+      const token = loginResp.headers["x-okapi-token"]
       bru.setVar("x-okapi-token-value", token)
+
+      if (!withExpiry) {
+        // This is only populated on login, not login with expiry
+        req.setHeader('x-okapi-token', getToken())
+      }
     })
     .catch(err => {
-      console.error("WHAT HAPPENED HERE: %o", err);
+      console.error("Failed to login to folio: %o", err)
     });
-    
-    if (!withExpiry) {
-      // This is only populated on login, not login with expiry
-      req.setHeader('x-okapi-token', getToken())
-    }
-  }
-};
+}
 
-const login = (urlOverride) => loginFunc(urlOverride, false);
-const loginWithExpiry = (urlOverride) => loginFunc(urlOverride);
+const login = (urlOverride) => loginFunc({ urlOverride, withExpiry: false });
+const loginWithExpiry = (urlOverride) => loginFunc({ urlOverride });
 
 export {
+  doALogin,
   getTenant,
+  getLoginWithExpiryUrl,
+  getLoginUrl,
   login,
   loginWithExpiry,
 }

package/src/folioRequest.js

@@ -0,0 +1,26 @@
+const { doALogin } = require('./auth');
+
+const axios = require('axios');
+const { getBaseRequestConfig } = require('./utils');
+
+export const getFolioAxios = async ({
+  urlOverride = undefined,
+  withExpiry = true,
+  suppressConsole = true
+} = {}) => {
+  return doALogin({ urlOverride, withExpiry, suppressConsole }).then(loginResp => {
+
+    const config = getBaseRequestConfig()
+    config.headers.Cookie = loginResp.headers["set-cookie"]
+
+    if (!withExpiry) {
+      // This is only populated on login, not login with expiry
+      config.headers['x-okapi-token'] = loginResp.headers["x-okapi-token"]
+    }
+
+    !suppressConsole && console.log("folioRequest ready with config: %o", config);
+    return axios.create(config);
+  }).catch(err => {
+    console.error("Failed to login to folio: %o", err)
+  })
+}

package/src/index.js

@@ -1,2 +1,3 @@
 export * from './utils';
 export * from './auth';
+export * from './folioRequest';

package/src/utils/config.js

@@ -0,0 +1,11 @@
+import { getTenant } from '../auth';
+
+export const getBaseRequestConfig = () => {
+  const tenant = getTenant();
+  return {
+    headers: {
+      "Content-type": "application/json",
+      "x-okapi-tenant": tenant
+    },
+  }
+}

package/src/utils/index.js

@@ -1 +1,2 @@
-export * from './baseUrl.js';
+export * from './baseUrl.js';
+export * from './config.js';