@rockcarver/frodo-lib 1.0.0 → 2.0.0-1

package/esm/shared/State.mjs

@@ -3,7 +3,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../package.json'), 'utf8'));
-const _state = {
+const globalState = {
   authenticationHeaderOverrides: {},
   printHandler: message => {
     if (!message) return;
@@ -46,81 +46,373 @@ const _state = {
     }
   }
 };
-export const setHost = host => _state.host = host;
-export const getHost = () => _state.host || process.env.FRODO_HOST;
+export default class State {
+  state = {
+    ...globalState
+  };
+  constructor(initialState) {
+    this.state = {
+      ...this.state,
+      ...initialState
+    };
+    console.log(`state:`);
+    console.dir(this.state);
+  }
+  setHost(host) {
+    this.state.host = host;
+  }
+  getHost() {
+    return this.state.host || process.env.FRODO_HOST;
+  }
 
-/**
- * @deprecated since v0.17.0 use `setHost(host: string)` instead
- */
-export const setTenant = setHost;
-/**
- * @deprecated since v0.17.0 use `getHost` instead
- */
-export const getTenant = getHost;
-export const setUsername = username => _state.username = username;
-export const getUsername = () => _state.username || process.env.FRODO_USERNAME;
-export const setPassword = password => _state.password = password;
-export const getPassword = () => _state.password || process.env.FRODO_PASSWORD;
-export const setRealm = realm => _state.realm = realm;
-export const getRealm = () => _state.realm || process.env.FRODO_REALM;
-export const setDeploymentType = type => _state.deploymentType = type;
-export const getDeploymentType = () => _state.deploymentType;
-export const setAllowInsecureConnection = allowInsecureConnection => _state.allowInsecureConnection = allowInsecureConnection;
-export const getAllowInsecureConnection = () => _state['allowInsecureConnection'];
-export const setCookieName = name => _state.cookieName = name;
-export const getCookieName = () => _state.cookieName;
-export const setCookieValue = value => _state.cookieValue = value;
-export const getCookieValue = () => _state.cookieValue;
-export const setAuthenticationHeaderOverrides = overrides => _state.authenticationHeaderOverrides = overrides;
-export const getAuthenticationHeaderOverrides = () => _state.authenticationHeaderOverrides;
-export const setAuthenticationService = service => _state.authenticationService = service;
-export const getAuthenticationService = () => _state.authenticationService || process.env.FRODO_AUTHENTICATION_SERVICE;
-export const setServiceAccountId = uuid => _state.serviceAccountId = uuid;
-export const getServiceAccountId = () => _state.serviceAccountId || process.env.FRODO_SA_ID;
-export const setServiceAccountJwk = jwk => _state.serviceAccountJwk = {
-  ...jwk
-};
-export const getServiceAccountJwk = () => _state.serviceAccountJwk || (process.env.FRODO_SA_JWK ? JSON.parse(process.env.FRODO_SA_JWK) : undefined);
-export const setUseBearerTokenForAmApis = useBearerTokenForAmApis => _state.useBearerTokenForAmApis = useBearerTokenForAmApis;
-export const getUseBearerTokenForAmApis = () => _state.useBearerTokenForAmApis;
-export const setBearerToken = token => _state.bearerToken = token;
-export const getBearerToken = () => _state.bearerToken;
-export const setLogApiKey = key => _state.logApiKey = key;
-export const getLogApiKey = () => _state.logApiKey || process.env.FRODO_LOG_KEY;
-export const setLogApiSecret = secret => _state.logApiSecret = secret;
-export const getLogApiSecret = () => _state.logApiSecret || process.env.FRODO_LOG_SECRET;
-export const setAmVersion = version => _state.amVersion = version;
-export const getAmVersion = () => _state.amVersion;
-export const setFrodoVersion = version => _state.frodoVersion = version;
-export const getFrodoVersion = () => _state.frodoVersion || `v${pkg.version} [${process.version}]`;
-export const setConnectionProfilesPath = path => _state.connectionProfilesPath = path;
-export const getConnectionProfilesPath = () => _state.connectionProfilesPath;
-export const setMasterKeyPath = path => _state.masterKeyPath = path;
-export const getMasterKeyPath = () => _state.masterKeyPath;
-export const setOutputFile = file => _state.outputFile = file;
-export const getOutputFile = () => _state.outputFile;
-export const setDirectory = directory => _state.directory = directory;
-export const getDirectory = () => _state.directory;
-export const setPrintHandler = handler => _state.printHandler = handler;
-export const getPrintHandler = () => _state.printHandler;
-export const setVerboseHandler = handler => _state.verboseHandler = handler;
-export const getVerboseHandler = () => _state.verboseHandler;
-export const setVerbose = verbose => _state.verbose = verbose;
-export const getVerbose = () => _state.verbose;
-export const setDebugHandler = handler => _state.debugHandler = handler;
-export const getDebugHandler = () => _state.debugHandler;
-export const setDebug = debug => _state.debug = debug;
-export const getDebug = () => _state.debug || process.env.FRODO_DEBUG !== undefined;
-export const setCurlirizeHandler = handler => _state.curlirizeHandler = handler;
-export const getCurlirizeHandler = () => _state.curlirizeHandler;
-export const setCurlirize = curlirize => _state.curlirize = curlirize;
-export const getCurlirize = () => _state.curlirize;
-export const setCreateProgressHandler = handler => _state.createProgressHandler = handler;
-export const getCreateProgressHandler = () => _state.createProgressHandler;
-export const setUpdateProgressHandler = handler => _state.updateProgressHandler = handler;
-export const getUpdateProgressHandler = () => _state.updateProgressHandler;
-export const setStopProgressHandler = handler => _state.stopProgressHandler = handler;
-export const getStopProgressHandler = () => _state.stopProgressHandler;
+  /**
+   * @deprecated since v0.17.0 use `setHost(host: string)` instead
+   */
+  setTenant(tenant) {
+    this.setHost(tenant);
+  }
+  /**
+   * @deprecated since v0.17.0 use `getHost` instead
+   */
+  getTenant() {
+    return this.getHost();
+  }
+  setUsername(username) {
+    this.state.username = username;
+  }
+  getUsername() {
+    return this.state.username || process.env.FRODO_USERNAME;
+  }
+  setPassword(password) {
+    this.state.password = password;
+  }
+  getPassword() {
+    return this.state.password || process.env.FRODO_PASSWORD;
+  }
+  setRealm(realm) {
+    this.state.realm = realm;
+  }
+  getRealm() {
+    return this.state.realm || process.env.FRODO_REALM;
+  }
+  setDeploymentType(type) {
+    this.state.deploymentType = type;
+  }
+  getDeploymentType() {
+    return this.state.deploymentType;
+  }
+  setAllowInsecureConnection(allowInsecureConnection) {
+    this.state.allowInsecureConnection = allowInsecureConnection;
+  }
+  getAllowInsecureConnection() {
+    return this.state.allowInsecureConnection;
+  }
+  setCookieName(name) {
+    this.state.cookieName = name;
+  }
+  getCookieName() {
+    return this.state.cookieName;
+  }
+  setCookieValue(value) {
+    this.state.cookieValue = value;
+  }
+  getCookieValue() {
+    return this.state.cookieValue;
+  }
+  setFeatures(features) {
+    this.state.features = features;
+  }
+  getFeatures() {
+    return this.state.features;
+  }
+  setAuthenticationHeaderOverrides(overrides) {
+    this.state.authenticationHeaderOverrides = overrides;
+  }
+  getAuthenticationHeaderOverrides() {
+    return this.state.authenticationHeaderOverrides;
+  }
+  setAuthenticationService(service) {
+    this.state.authenticationService = service;
+  }
+  getAuthenticationService() {
+    return this.state.authenticationService || process.env.FRODO_AUTHENTICATION_SERVICE;
+  }
+  setServiceAccountId(uuid) {
+    this.state.serviceAccountId = uuid;
+  }
+  getServiceAccountId() {
+    return this.state.serviceAccountId || process.env.FRODO_SA_ID;
+  }
+  setServiceAccountJwk(jwk) {
+    this.state.serviceAccountJwk = {
+      ...jwk
+    };
+  }
+  getServiceAccountJwk() {
+    return this.state.serviceAccountJwk || (process.env.FRODO_SA_JWK ? JSON.parse(process.env.FRODO_SA_JWK) : undefined);
+  }
+  setUseBearerTokenForAmApis(useBearerTokenForAmApis) {
+    this.state.useBearerTokenForAmApis = useBearerTokenForAmApis;
+  }
+  getUseBearerTokenForAmApis() {
+    return this.state.useBearerTokenForAmApis;
+  }
+  setBearerToken(token) {
+    this.state.bearerToken = token;
+  }
+  getBearerToken() {
+    return this.state.bearerToken;
+  }
+  setLogApiKey(key) {
+    this.state.logApiKey = key;
+  }
+  getLogApiKey() {
+    return this.state.logApiKey || process.env.FRODO_LOG_KEY;
+  }
+  setLogApiSecret(secret) {
+    this.state.logApiSecret = secret;
+  }
+  getLogApiSecret() {
+    return this.state.logApiSecret || process.env.FRODO_LOG_SECRET;
+  }
+  setAmVersion(version) {
+    this.state.amVersion = version;
+  }
+  getAmVersion() {
+    return this.state.amVersion;
+  }
+  setFrodoVersion(version) {
+    this.state.frodoVersion = version;
+  }
+  getFrodoVersion() {
+    return this.state.frodoVersion || `v${pkg.version} [${process.version}]`;
+  }
+  setConnectionProfilesPath(path) {
+    this.state.connectionProfilesPath = path;
+  }
+  getConnectionProfilesPath() {
+    return this.state.connectionProfilesPath;
+  }
+  setMasterKeyPath(path) {
+    this.state.masterKeyPath = path;
+  }
+  getMasterKeyPath() {
+    return this.state.masterKeyPath;
+  }
+  setOutputFile(file) {
+    this.state.outputFile = file;
+  }
+  getOutputFile() {
+    return this.state.outputFile;
+  }
+  setDirectory(directory) {
+    this.state.directory = directory;
+  }
+  getDirectory() {
+    return this.state.directory;
+  }
+  setCurlirizeHandler(handler) {
+    this.state.curlirizeHandler = handler;
+  }
+  getCurlirizeHandler() {
+    return this.state.curlirizeHandler;
+  }
+  setCurlirize(curlirize) {
+    this.state.curlirize = curlirize;
+  }
+  getCurlirize() {
+    return this.state.curlirize;
+  }
+  setCreateProgressHandler(handler) {
+    this.state.createProgressHandler = handler;
+  }
+  getCreateProgressHandler() {
+    return this.state.createProgressHandler;
+  }
+  setUpdateProgressHandler(handler) {
+    this.state.updateProgressHandler = handler;
+  }
+  getUpdateProgressHandler() {
+    return this.state.updateProgressHandler;
+  }
+  setStopProgressHandler(handler) {
+    this.state.stopProgressHandler = handler;
+  }
+  getStopProgressHandler() {
+    return this.state.stopProgressHandler;
+  }
+
+  // global state
+
+  setPrintHandler(handler) {
+    globalState.printHandler = handler;
+  }
+  getPrintHandler() {
+    return globalState.printHandler;
+  }
+  setVerboseHandler(handler) {
+    globalState.verboseHandler = handler;
+  }
+  getVerboseHandler() {
+    return globalState.verboseHandler;
+  }
+  setVerbose(verbose) {
+    globalState.verbose = verbose;
+  }
+  getVerbose() {
+    return globalState.verbose;
+  }
+  setDebugHandler(handler) {
+    globalState.debugHandler = handler;
+  }
+  getDebugHandler() {
+    return globalState.debugHandler;
+  }
+  setDebug(debug) {
+    globalState.debug = debug;
+  }
+  getDebug() {
+    return globalState.debug || process.env.FRODO_DEBUG !== undefined;
+  }
+}
+
+// export const setHost = (host: string) => (globalState.host = host);
+// export const getHost = () => globalState.host || process.env.FRODO_HOST;
+
+// /**
+//  * @deprecated since v0.17.0 use `setHost(host: string)` instead
+//  */
+// export const setTenant = setHost;
+// /**
+//  * @deprecated since v0.17.0 use `getHost` instead
+//  */
+// export const getTenant = getHost;
+
+// export const setUsername = (username: string) =>
+//   (globalState.username = username);
+// export const getUsername = () =>
+//   globalState.username || process.env.FRODO_USERNAME;
+
+// export const setPassword = (password: string) =>
+//   (globalState.password = password);
+// export const getPassword = () =>
+//   globalState.password || process.env.FRODO_PASSWORD;
+
+// export const setRealm = (realm: string) => (globalState.realm = realm);
+// export const getRealm = () => globalState.realm || process.env.FRODO_REALM;
+
+// export const setDeploymentType = (type: string) =>
+//   (globalState.deploymentType = type);
+// export const getDeploymentType = () => globalState.deploymentType;
+
+// export const setAllowInsecureConnection = (allowInsecureConnection: boolean) =>
+//   (globalState.allowInsecureConnection = allowInsecureConnection);
+// export const getAllowInsecureConnection = () =>
+//   globalState['allowInsecureConnection'];
+
+// export const setCookieName = (name: string) => (globalState.cookieName = name);
+// export const getCookieName = () => globalState.cookieName;
+// export const setCookieValue = (value: string) =>
+//   (globalState.cookieValue = value);
+// export const getCookieValue = () => globalState.cookieValue;
+
+// export const setAuthenticationHeaderOverrides = (
+//   overrides: Record<string, string>
+// ) => (globalState.authenticationHeaderOverrides = overrides);
+// export const getAuthenticationHeaderOverrides = () =>
+//   globalState.authenticationHeaderOverrides;
+// export const setAuthenticationService = (service: string) =>
+//   (globalState.authenticationService = service);
+// export const getAuthenticationService = () =>
+//   globalState.authenticationService || process.env.FRODO_AUTHENTICATION_SERVICE;
+
+// export const setServiceAccountId = (uuid: string) =>
+//   (globalState.serviceAccountId = uuid);
+// export const getServiceAccountId = (): string =>
+//   globalState.serviceAccountId || process.env.FRODO_SA_ID;
+// export const setServiceAccountJwk = (jwk: JwkRsa) =>
+//   (globalState.serviceAccountJwk = { ...jwk });
+// export const getServiceAccountJwk = (): JwkRsa =>
+//   globalState.serviceAccountJwk ||
+//   (process.env.FRODO_SA_JWK ? JSON.parse(process.env.FRODO_SA_JWK) : undefined);
+
+// export const setUseBearerTokenForAmApis = (useBearerTokenForAmApis: boolean) =>
+//   (globalState.useBearerTokenForAmApis = useBearerTokenForAmApis);
+// export const getUseBearerTokenForAmApis = () =>
+//   globalState.useBearerTokenForAmApis;
+// export const setBearerToken = (token: string) =>
+//   (globalState.bearerToken = token);
+// export const getBearerToken = () => globalState.bearerToken;
+
+// export const setLogApiKey = (key: string) => (globalState.logApiKey = key);
+// export const getLogApiKey = () =>
+//   globalState.logApiKey || process.env.FRODO_LOG_KEY;
+// export const setLogApiSecret = (secret: string) =>
+//   (globalState.logApiSecret = secret);
+// export const getLogApiSecret = () =>
+//   globalState.logApiSecret || process.env.FRODO_LOG_SECRET;
+
+// export const setAmVersion = (version: string) =>
+//   (globalState.amVersion = version);
+// export const getAmVersion = () => globalState.amVersion;
+
+// export const setFrodoVersion = (version: string) =>
+//   (globalState.frodoVersion = version);
+// export const getFrodoVersion = () =>
+//   globalState.frodoVersion || `v${pkg.version} [${process.version}]`;
+
+// export const setConnectionProfilesPath = (path: string) =>
+//   (globalState.connectionProfilesPath = path);
+// export const getConnectionProfilesPath = () =>
+//   globalState.connectionProfilesPath;
+
+// export const setMasterKeyPath = (path: string) =>
+//   (globalState.masterKeyPath = path);
+// export const getMasterKeyPath = () => globalState.masterKeyPath;
+
+// export const setOutputFile = (file: string) => (globalState.outputFile = file);
+// export const getOutputFile = () => globalState.outputFile;
+
+// export const setDirectory = (directory: string) =>
+//   (globalState.directory = directory);
+// export const getDirectory = () => globalState.directory;
+
+// export const setPrintHandler = (
+//   handler: (message: string | object, type?: string, newline?: boolean) => void
+// ) => (globalState.printHandler = handler);
+// export const getPrintHandler = () => globalState.printHandler;
+
+// export const setVerboseHandler = (
+//   handler: (message: string | object) => void
+// ) => (globalState.verboseHandler = handler);
+// export const getVerboseHandler = () => globalState.verboseHandler;
+// export const setVerbose = (verbose: boolean) => (globalState.verbose = verbose);
+export const getVerbose = () => globalState.verbose;
+
+// export const setDebugHandler = (handler: (message: string | object) => void) =>
+//   (globalState.debugHandler = handler);
+// export const getDebugHandler = () => globalState.debugHandler;
+// export const setDebug = (debug: boolean) => (globalState.debug = debug);
+export const getDebug = () => globalState.debug || process.env.FRODO_DEBUG !== undefined;
+
+// export const setCurlirizeHandler = (handler: (message: string) => void) =>
+//   (globalState.curlirizeHandler = handler);
+// export const getCurlirizeHandler = () => globalState.curlirizeHandler;
+// export const setCurlirize = (curlirize: boolean) =>
+//   (globalState.curlirize = curlirize);
+// export const getCurlirize = (): boolean => globalState.curlirize;
+
+// export const setCreateProgressHandler = (
+//   handler: (type: string, total?: number, message?: string) => void
+// ) => (globalState.createProgressHandler = handler);
+// export const getCreateProgressHandler = () => globalState.createProgressHandler;
+// export const setUpdateProgressHandler = (handler: (message: string) => void) =>
+//   (globalState.updateProgressHandler = handler);
+// export const getUpdateProgressHandler = () => globalState.updateProgressHandler;
+// export const setStopProgressHandler = (
+//   handler: (message: string, status?: string) => void
+// ) => (globalState.stopProgressHandler = handler);
+// export const getStopProgressHandler = () => globalState.stopProgressHandler;
 
 /**
  * @deprecated since version v0.17.0. Import state:
@@ -131,74 +423,96 @@ export const getStopProgressHandler = () => _state.stopProgressHandler;
  *
  * ```const username = state.getUsername();```
  */
-export default {
-  session: {
-    setHost,
-    getHost,
-    setTenant,
-    getTenant,
-    setUsername,
-    getUsername,
-    setPassword,
-    getPassword,
-    setRealm,
-    getRealm,
-    setDeploymentType,
-    getDeploymentType,
-    setAllowInsecureConnection,
-    getAllowInsecureConnection,
-    setCookieName,
-    getCookieName,
-    setCookieValue,
-    getCookieValue,
-    setAuthenticationHeaderOverrides,
-    getAuthenticationHeaderOverrides,
-    setAuthenticationService,
-    getAuthenticationService,
-    setServiceAccountId,
-    getServiceAccountId,
-    setServiceAccountJwk,
-    getServiceAccountJwk,
-    setUseBearerTokenForAmApis,
-    getUseBearerTokenForAmApis,
-    setBearerToken,
-    getBearerToken,
-    setLogApiKey,
-    getLogApiKey,
-    setLogApiSecret,
-    getLogApiSecret,
-    setAmVersion,
-    getAmVersion,
-    setFrodoVersion,
-    getFrodoVersion,
-    setConnectionProfilesPath,
-    getConnectionProfilesPath,
-    setMasterKeyPath,
-    getMasterKeyPath,
-    setOutputFile,
-    getOutputFile,
-    setDirectory,
-    getDirectory,
-    setPrintHandler,
-    getPrintHandler,
-    setVerboseHandler,
-    getVerboseHandler,
-    setVerbose,
-    getVerbose,
-    setDebugHandler,
-    getDebugHandler,
-    setDebug,
-    getDebug,
-    setCurlirizeHandler,
-    getCurlirizeHandler,
-    setCurlirize,
-    getCurlirize,
-    setCreateProgressHandler,
-    getCreateProgressHandler,
-    setUpdateProgressHandler,
-    getUpdateProgressHandler,
-    setStopProgressHandler,
-    getStopProgressHandler
-  }
-};
+// export default {
+//   session: {
+//     setHost,
+//     getHost,
+
+//     setTenant,
+//     getTenant,
+
+//     setUsername,
+//     getUsername,
+
+//     setPassword,
+//     getPassword,
+
+//     setRealm,
+//     getRealm,
+
+//     setDeploymentType,
+//     getDeploymentType,
+
+//     setAllowInsecureConnection,
+//     getAllowInsecureConnection,
+
+//     setCookieName,
+//     getCookieName,
+//     setCookieValue,
+//     getCookieValue,
+
+//     setAuthenticationHeaderOverrides,
+//     getAuthenticationHeaderOverrides,
+//     setAuthenticationService,
+//     getAuthenticationService,
+
+//     setServiceAccountId,
+//     getServiceAccountId,
+//     setServiceAccountJwk,
+//     getServiceAccountJwk,
+
+//     setUseBearerTokenForAmApis,
+//     getUseBearerTokenForAmApis,
+//     setBearerToken,
+//     getBearerToken,
+
+//     setLogApiKey,
+//     getLogApiKey,
+//     setLogApiSecret,
+//     getLogApiSecret,
+
+//     setAmVersion,
+//     getAmVersion,
+
+//     setFrodoVersion,
+//     getFrodoVersion,
+
+//     setConnectionProfilesPath,
+//     getConnectionProfilesPath,
+
+//     setMasterKeyPath,
+//     getMasterKeyPath,
+
+//     setOutputFile,
+//     getOutputFile,
+
+//     setDirectory,
+//     getDirectory,
+
+//     setPrintHandler,
+//     getPrintHandler,
+
+//     setVerboseHandler,
+//     getVerboseHandler,
+//     setVerbose,
+//     getVerbose,
+
+//     setDebugHandler,
+//     getDebugHandler,
+//     setDebug,
+//     getDebug,
+
+//     setCurlirizeHandler,
+//     getCurlirizeHandler,
+//     setCurlirize,
+//     getCurlirize,
+
+//     setCreateProgressHandler,
+//     getCreateProgressHandler,
+//     setUpdateProgressHandler,
+//     getUpdateProgressHandler,
+//     setStopProgressHandler,
+//     getStopProgressHandler,
+//   },
+// };
 //# sourceMappingURL=State.js.map

package/esm/shared/State.test.mjs

@@ -1,3 +1,11 @@
+/**
+ * Run tests
+ *
+ *        npm run test:only State
+ *
+ * Note: FRODO_DEBUG=1 is optional and enables debug logging for some output
+ * in case things don't function as expected
+ */
 import { state } from '../index';
 describe('State', () => {
   const host = 'https://openam-frodo-dev.forgeblocks.com/am';

package/esm/utils/AutoSetupPolly.mjs

@@ -25,7 +25,10 @@ switch (process.env.FRODO_POLLY_MODE) {
     {
       state.setHost(process.env.FRODO_HOST || 'https://openam-frodo-dev.forgeblocks.com/am');
       state.setRealm(process.env.FRODO_REALM || 'alpha');
-      if (!(await getTokens())) throw new Error(`Unable to record mock responses from '${state.getHost()}'`);
+      if (!(await getTokens({
+        forceLoginAsUser: false,
+        state
+      }))) throw new Error(`Unable to record mock responses from '${state.getHost()}'`);
       mode = MODES.RECORD;
       recordIfMissing = true;
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rockcarver/frodo-lib",
-  "version": "1.0.0",
+  "version": "2.0.0-1",
   "type": "commonjs",
   "main": "./cjs/index.js",
   "module": "./esm/index.mjs",