@rockcarver/frodo-cli 2.0.0 → 2.0.1

package/dist/app.cjs

@@ -123284,7 +123284,7 @@ function stringify(obj) {
 }
 var package_default = {
   name: "@rockcarver/frodo-lib",
-  version: "2.0.0",
+  version: "2.0.1",
   type: "commonjs",
   main: "./dist/index.js",
   module: "./dist/esm/index.js",
@@ -140494,71 +140494,91 @@ function defaultMatchRequestsBy(protocol = true) {
 }
 function filterRecording(recording) {
   if (_optionalChain([recording, 'access', _22 => _22.request, 'optionalAccess', _23 => _23.headers])) {
-    const headers2 = recording.request.headers;
-    headers2.map((header) => {
-      if (header.name.toUpperCase() === "AUTHORIZATION") {
-        if (isBase64Encoded(header.value)) {
-          header.value = encode3("username:password");
-        } else {
-          header.value = header.value.replace(
-            /Bearer .+/,
-            "Bearer <bearer token>"
-          );
-        }
-      }
-      if (header.name.toUpperCase() === "X-API-KEY") {
-        header.value = "<api key>";
-      }
-      if (header.name.toUpperCase() === "X-API-SECRET") {
-        header.value = "<api secret>";
-      }
-    });
-    recording.request.headers = headers2;
+    recording.request.headers.forEach(obfuscateHeader);
   }
   if (_optionalChain([recording, 'access', _24 => _24.request, 'optionalAccess', _25 => _25.postData, 'optionalAccess', _26 => _26.text])) {
-    let body2 = recording.request.postData.text;
-    body2 = body2.replace(/assertion=.+?&/, "assertion=<assertion jwt token>&");
-    recording.request.postData.text = body2;
+    obfuscateData(recording.request.postData);
   }
-  if (_optionalChain([recording, 'access', _27 => _27.response, 'optionalAccess', _28 => _28.content, 'optionalAccess', _29 => _29.text])) {
-    let body2 = recording.response.content.text;
-    if (recording.response.content.mimeType === "application/json;charset=UTF-8") {
-      try {
-        const json = JSON.parse(body2, (key, value) => {
-          if (key === "access_token") return "<access token>";
-          if (key === "id_token") return "<id token>";
-          if (key === "accessKey") return "<access key>";
-          return value;
-        });
-        if (json.result) {
-          for (const obj of json.result) {
-            if (obj.script) {
-              try {
-                let script = decode(obj.script);
-                script = script.replace(
-                  /(var .*?(?:Sid|sid|Secret|secret|PhoneNumberFrom) = (?:"|'))(.*?)((?:"|'))/g,
-                  "$1<secret>$3"
-                );
-                obj.script = encode3(script);
-              } catch (error2) {
-              }
-            }
+  if (_optionalChain([recording, 'access', _27 => _27.response, 'optionalAccess', _28 => _28.cookies])) {
+    for (const cookie of recording.response.cookies) {
+      cookie.value = "<cookie>";
+    }
+  }
+  if (_optionalChain([recording, 'access', _29 => _29.response, 'optionalAccess', _30 => _30.headers])) {
+    recording.response.headers.forEach(obfuscateHeader);
+  }
+  if (_optionalChain([recording, 'access', _31 => _31.response, 'optionalAccess', _32 => _32.content, 'optionalAccess', _33 => _33.text])) {
+    obfuscateData(recording.response.content);
+  }
+}
+function obfuscateHeader(header) {
+  if (header.name.toUpperCase() === "AUTHORIZATION") {
+    if (isBase64Encoded(header.value)) {
+      header.value = encode3("username:password");
+    } else {
+      header.value = header.value.replace(/Bearer .+/, "Bearer <bearer token>");
+    }
+  }
+  if (header.name.toUpperCase() === "X-API-KEY") {
+    header.value = "<api key>";
+  }
+  if (header.name.toUpperCase() === "X-API-SECRET") {
+    header.value = "<api secret>";
+  }
+  if (header.name.toUpperCase() === "COOKIE") {
+    header.value = header.value.replace(/=[^;]*/g, "=<cookie>");
+  }
+  if (header.name.toUpperCase() === "SET-COOKIE") {
+    header.value = header.value.replace(/=[^;]*/, "=<cookie>");
+  }
+}
+function obfuscateData(data2) {
+  if (data2.mimeType.startsWith("application/json")) {
+    data2.text = obfuscateJsonString(data2.text);
+  } else if (data2.mimeType.startsWith("text/xml")) {
+    data2.text = obfuscateXmlString(data2.text);
+  } else if (data2.mimeType.startsWith("application/x-www-form-urlencoded")) {
+    data2.text = data2.text.replace(
+      /assertion=.+?&/,
+      "assertion=<assertion jwt token>&"
+    );
+  }
+}
+function obfuscateJsonString(json) {
+  try {
+    const jsonObj = JSON.parse(json, (key, value) => {
+      if (key === "access_token") return "<access token>";
+      if (key === "id_token") return "<id token>";
+      if (key === "tokenId") return "<token id>";
+      if (key === "accessKey") return "<access key>";
+      return value;
+    });
+    if (jsonObj.result) {
+      for (const obj of jsonObj.result) {
+        if (obj.script) {
+          try {
+            let script = decode(obj.script);
+            script = script.replace(
+              /(var .*?(?:Sid|sid|Secret|secret|PhoneNumberFrom) = (?:"|'))(.*?)((?:"|'))/g,
+              "$1<secret>$3"
+            );
+            obj.script = encode3(script);
+          } catch (error2) {
           }
         }
-        body2 = JSON.stringify(json);
-      } catch (error2) {
       }
     }
-    if (recording.response.content.mimeType === "text/xml;charset=utf-8") {
-      try {
-        body2 = body2.replace(
-          /<ds:X509Certificate>.+?<\/ds:X509Certificate>/gs,
-          `<ds:X509Certificate>${encode3("<certificate>")}</ds:X509Certificate>`
-        );
-      } catch (error2) {
-      }
-    }
-    recording.response.content.text = body2;
+    return JSON.stringify(jsonObj);
+  } catch (error2) {
+  }
+}
+function obfuscateXmlString(xml) {
+  try {
+    return xml.replace(
+      /<ds:X509Certificate>.+?<\/ds:X509Certificate>/gs,
+      `<ds:X509Certificate>${encode3("<certificate>")}</ds:X509Certificate>`
+    );
+  } catch (error2) {
   }
 }
 var FRODO_MOCK_HOSTS = process.env.FRODO_MOCK_HOSTS ? process.env.FRODO_MOCK_HOSTS.split(",") : [
@@ -140723,6 +140743,21 @@ function setupPollyForFrodoLib({
         req.configure({ matchRequestsBy: authenticationMatchRequestsBy() });
       });
       polly.server.any("/am/json/*").recordingName(`${getFrodoCommand({ state: state2 })}/am`);
+      polly.server.any([
+        "/am/json/*/authenticate",
+        "/am/json/*/sessions/?_action=getSessionInfo"
+      ]).on("request", (req) => {
+        req.configure({
+          matchRequestsBy: authenticationMatchRequestsBy()
+        });
+      });
+      polly.server.any("/am/json/*/sessions/?_action=getSessionInfo").on("beforeReplay", (_, recording) => {
+        const body2 = JSON.parse(recording.response.content.text);
+        const date = /* @__PURE__ */ new Date();
+        date.setDate(date.getDate() + 1);
+        body2.maxIdleExpirationTime = date.toISOString();
+        recording.response.content.text = JSON.stringify(body2);
+      });
       polly.server.any("/am/saml2/*").recordingName(`${getFrodoCommand({ state: state2 })}/saml2`);
       polly.server.any(["/openidm/managed/svcacct", "/openidm/managed/svcacct/*"]).recordingName(`${getFrodoCommand({ state: state2 })}/openidm/managed/svcacct`).on("request", (req) => {
         req.configure({
@@ -140828,7 +140863,7 @@ function curlirize(request, state2) {
     if (err) {
       if (axios_default.isAxiosError(err)) {
         printMessage({
-          message: `${_optionalChain([err, 'access', _30 => _30.response, 'optionalAccess', _31 => _31.status])}${_optionalChain([err, 'access', _32 => _32.response, 'optionalAccess', _33 => _33.data, 'access', _34 => _34["reason"]]) ? " " + _optionalChain([err, 'access', _35 => _35.response, 'optionalAccess', _36 => _36.data, 'access', _37 => _37["reason"]]) : ""}${_optionalChain([err, 'access', _38 => _38.response, 'optionalAccess', _39 => _39.data, 'access', _40 => _40["message"]]) ? " - " + _optionalChain([err, 'access', _41 => _41.response, 'optionalAccess', _42 => _42.data, 'access', _43 => _43["message"]]) : ""}`,
+          message: `${_optionalChain([err, 'access', _34 => _34.response, 'optionalAccess', _35 => _35.status])}${_optionalChain([err, 'access', _36 => _36.response, 'optionalAccess', _37 => _37.data, 'access', _38 => _38["reason"]]) ? " " + _optionalChain([err, 'access', _39 => _39.response, 'optionalAccess', _40 => _40.data, 'access', _41 => _41["reason"]]) : ""}${_optionalChain([err, 'access', _42 => _42.response, 'optionalAccess', _43 => _43.data, 'access', _44 => _44["message"]]) ? " - " + _optionalChain([err, 'access', _45 => _45.response, 'optionalAccess', _46 => _46.data, 'access', _47 => _47["message"]]) : ""}`,
           type: "error",
           state: state2
         });
@@ -142420,7 +142455,7 @@ async function readOAuth2Provider({
   try {
     return getOAuth2Provider({ state: state2 });
   } catch (error2) {
-    if (error2.httpStatus === 404 || _optionalChain([error2, 'access', _44 => _44.response, 'optionalAccess', _45 => _45.status]) === 404) {
+    if (error2.httpStatus === 404 || _optionalChain([error2, 'access', _48 => _48.response, 'optionalAccess', _49 => _49.status]) === 404) {
       return null;
     } else {
       throw new FrodoError(`Error reading oauth2 provider`, error2);
@@ -142862,7 +142897,7 @@ async function updateScript({
     }
     result2 = await putScript({ scriptId, scriptData, state: state2 });
   } catch (error2) {
-    if (_optionalChain([error2, 'access', _46 => _46.response, 'optionalAccess', _47 => _47.status]) === 409) {
+    if (_optionalChain([error2, 'access', _50 => _50.response, 'optionalAccess', _51 => _51.status]) === 409) {
       verboseMessage({
         message: `createOrUpdateScript WARNING: script with name ${scriptData.name} already exists, using renaming policy... <name> => <name - imported (n)>`,
         state: state2
@@ -143246,7 +143281,7 @@ async function updateOAuth2Client({
     debugMessage({ message: `OAuth2ClientOps.putOAuth2Client: end`, state: state2 });
     return response2;
   } catch (error2) {
-    if (_optionalChain([error2, 'access', _48 => _48.response, 'optionalAccess', _49 => _49.status]) === 400 && _optionalChain([error2, 'access', _50 => _50.response, 'optionalAccess', _51 => _51.data, 'optionalAccess', _52 => _52.message]) === "Invalid attribute specified.") {
+    if (_optionalChain([error2, 'access', _52 => _52.response, 'optionalAccess', _53 => _53.status]) === 400 && _optionalChain([error2, 'access', _54 => _54.response, 'optionalAccess', _55 => _55.data, 'optionalAccess', _56 => _56.message]) === "Invalid attribute specified.") {
       try {
         const { validAttributes } = error2.response.data.detail;
         validAttributes.push("_id");
@@ -143978,7 +144013,7 @@ async function updateOAuth2TrustedJwtIssuer({
     });
     return response2;
   } catch (error2) {
-    if (_optionalChain([error2, 'access', _53 => _53.response, 'optionalAccess', _54 => _54.status]) === 400 && _optionalChain([error2, 'access', _55 => _55.response, 'optionalAccess', _56 => _56.data, 'optionalAccess', _57 => _57.message]) === "Invalid attribute specified.") {
+    if (_optionalChain([error2, 'access', _57 => _57.response, 'optionalAccess', _58 => _58.status]) === 400 && _optionalChain([error2, 'access', _59 => _59.response, 'optionalAccess', _60 => _60.data, 'optionalAccess', _61 => _61.message]) === "Invalid attribute specified.") {
       try {
         const { validAttributes } = error2.response.data.detail;
         validAttributes.push("_id");
@@ -147847,7 +147882,7 @@ async function importAgent({
 }) {
   try {
     debugMessage({ message: `AgentOps.importAgent: start`, state: state2 });
-    const agentType = _optionalChain([importData, 'access', _58 => _58.agents, 'access', _59 => _59[agentId], 'optionalAccess', _60 => _60._type, 'access', _61 => _61._id]);
+    const agentType = _optionalChain([importData, 'access', _62 => _62.agents, 'access', _63 => _63[agentId], 'optionalAccess', _64 => _64._type, 'access', _65 => _65._id]);
     const result2 = await putAgentByTypeAndId({
       agentType,
       agentId,
@@ -147870,7 +147905,7 @@ async function importIdentityGatewayAgent({
       message: `AgentOps.importIdentityGatewayAgent: start`,
       state: state2
     });
-    const agentType = _optionalChain([importData, 'access', _62 => _62.agents, 'access', _63 => _63[agentId], 'optionalAccess', _64 => _64._type, 'access', _65 => _65._id]);
+    const agentType = _optionalChain([importData, 'access', _66 => _66.agents, 'access', _67 => _67[agentId], 'optionalAccess', _68 => _68._type, 'access', _69 => _69._id]);
     if (agentType !== "IdentityGatewayAgent")
       throw new FrodoError(
         `Wrong agent type! Expected 'IdentityGatewayAgent' but got '${agentType}'.`
@@ -147900,7 +147935,7 @@ async function importJavaAgent({
 }) {
   try {
     debugMessage({ message: `AgentOps.importJavaAgent: start`, state: state2 });
-    const agentType = _optionalChain([importData, 'access', _66 => _66.agents, 'access', _67 => _67[agentId], 'optionalAccess', _68 => _68._type, 'access', _69 => _69._id]);
+    const agentType = _optionalChain([importData, 'access', _70 => _70.agents, 'access', _71 => _71[agentId], 'optionalAccess', _72 => _72._type, 'access', _73 => _73._id]);
     if (agentType !== "J2EEAgent")
       throw new FrodoError(
         `Wrong agent type! Expected 'J2EEAgent' but got '${agentType}'.`
@@ -147924,7 +147959,7 @@ async function importWebAgent({
 }) {
   try {
     debugMessage({ message: `AgentOps.importWebAgent: start`, state: state2 });
-    const agentType = _optionalChain([importData, 'access', _70 => _70.agents, 'access', _71 => _71[agentId], 'optionalAccess', _72 => _72._type, 'access', _73 => _73._id]);
+    const agentType = _optionalChain([importData, 'access', _74 => _74.agents, 'access', _75 => _75[agentId], 'optionalAccess', _76 => _76._type, 'access', _77 => _77._id]);
     if (agentType !== "WebAgent")
       throw new FrodoError(
         `Wrong agent type! Expected 'WebAgent' but got '${agentType}'.`
@@ -149240,7 +149275,7 @@ async function createCircleOfTrust2({
     const response2 = await createCircleOfTrust({ cotData, state: state2 });
     return response2;
   } catch (createError) {
-    if (_optionalChain([createError, 'access', _74 => _74.response, 'optionalAccess', _75 => _75.data, 'optionalAccess', _76 => _76.code]) === 500 && _optionalChain([createError, 'access', _77 => _77.response, 'optionalAccess', _78 => _78.data, 'optionalAccess', _79 => _79.message]) === "Unable to update entity provider's circle of trust") {
+    if (_optionalChain([createError, 'access', _78 => _78.response, 'optionalAccess', _79 => _79.data, 'optionalAccess', _80 => _80.code]) === 500 && _optionalChain([createError, 'access', _81 => _81.response, 'optionalAccess', _82 => _82.data, 'optionalAccess', _83 => _83.message]) === "Unable to update entity provider's circle of trust") {
       try {
         const response2 = await updateCircleOfTrust({ cotId, cotData, state: state2 });
         return response2;
@@ -149267,7 +149302,7 @@ async function updateCircleOfTrust2({
     const response2 = await updateCircleOfTrust({ cotId, cotData, state: state2 });
     return response2 || cotData;
   } catch (error2) {
-    if (_optionalChain([error2, 'access', _80 => _80.response, 'optionalAccess', _81 => _81.data, 'optionalAccess', _82 => _82.code]) === 500 && (_optionalChain([error2, 'access', _83 => _83.response, 'optionalAccess', _84 => _84.data, 'optionalAccess', _85 => _85.message]) === "Unable to update entity provider's circle of trust" || _optionalChain([error2, 'access', _86 => _86.response, 'optionalAccess', _87 => _87.data, 'optionalAccess', _88 => _88.message]) === "An error occurred while updating the COT memberships")) {
+    if (_optionalChain([error2, 'access', _84 => _84.response, 'optionalAccess', _85 => _85.data, 'optionalAccess', _86 => _86.code]) === 500 && (_optionalChain([error2, 'access', _87 => _87.response, 'optionalAccess', _88 => _88.data, 'optionalAccess', _89 => _89.message]) === "Unable to update entity provider's circle of trust" || _optionalChain([error2, 'access', _90 => _90.response, 'optionalAccess', _91 => _91.data, 'optionalAccess', _92 => _92.message]) === "An error occurred while updating the COT memberships")) {
       try {
         const response2 = await updateCircleOfTrust({ cotId, cotData, state: state2 });
         return response2 || cotData;
@@ -149663,7 +149698,7 @@ ${providers.map((it) => it.split("|")[0]).join("\n")}.`,
         }
       } catch (error2) {
         debugMessage({
-          message: `Error ${_optionalChain([error2, 'access', _89 => _89.response, 'optionalAccess', _90 => _90.status])} creating/updating circle of trust: ${_optionalChain([error2, 'access', _91 => _91.response, 'optionalAccess', _92 => _92.data, 'optionalAccess', _93 => _93.message])}`,
+          message: `Error ${_optionalChain([error2, 'access', _93 => _93.response, 'optionalAccess', _94 => _94.status])} creating/updating circle of trust: ${_optionalChain([error2, 'access', _95 => _95.response, 'optionalAccess', _96 => _96.data, 'optionalAccess', _97 => _97.message])}`,
           state: state2
         });
         errors.push(error2);
@@ -150411,7 +150446,7 @@ async function exportConfigEntities({
               !(error2.httpStatus === 404 && error2.httpMessage === "No configuration exists for id org.apache.felix.fileinstall/openidm")
             ) {
               printMessage({
-                message: _optionalChain([readConfigEntityError, 'access', _94 => _94.response, 'optionalAccess', _95 => _95.data]),
+                message: _optionalChain([readConfigEntityError, 'access', _98 => _98.response, 'optionalAccess', _99 => _99.data]),
                 type: "error",
                 state: state2
               });
@@ -151146,7 +151181,7 @@ async function importFirstMapping({
   const imported = [];
   const mappingIds = Object.keys(importData.mapping);
   let mappingId;
-  if (_optionalChain([importData, 'access', _96 => _96.sync, 'optionalAccess', _97 => _97.mappings, 'optionalAccess', _98 => _98.length]) > 0) {
+  if (_optionalChain([importData, 'access', _100 => _100.sync, 'optionalAccess', _101 => _101.mappings, 'optionalAccess', _102 => _102.length]) > 0) {
     mappingId = importData.sync.mappings[0]._id;
   } else if (mappingIds.length > 0) {
     mappingId = mappingIds[0];
@@ -152930,7 +152965,7 @@ async function getFeatures2({
     const { result: result2 } = await getFeatures({ state: state2 });
     state2.setFeatures(JSON.parse(JSON.stringify(result2)));
   } catch (error2) {
-    debugMessage({ message: _optionalChain([error2, 'access', _99 => _99.response, 'optionalAccess', _100 => _100.data]), state: state2 });
+    debugMessage({ message: _optionalChain([error2, 'access', _103 => _103.response, 'optionalAccess', _104 => _104.data]), state: state2 });
     state2.setFeatures([]);
   }
   return state2.getFeatures();
@@ -154452,7 +154487,7 @@ async function determineDeploymentType(state2) {
           state: state2
         });
       } catch (e) {
-        if (_optionalChain([e, 'access', _101 => _101.response, 'optionalAccess', _102 => _102.status]) === 302 && _optionalChain([e, 'access', _103 => _103.response, 'access', _104 => _104.headers, 'optionalAccess', _105 => _105.location, 'optionalAccess', _106 => _106.indexOf, 'call', _107 => _107("code=")]) > -1) {
+        if (_optionalChain([e, 'access', _105 => _105.response, 'optionalAccess', _106 => _106.status]) === 302 && _optionalChain([e, 'access', _107 => _107.response, 'access', _108 => _108.headers, 'optionalAccess', _109 => _109.location, 'optionalAccess', _110 => _110.indexOf, 'call', _111 => _111("code=")]) > -1) {
           verboseMessage({
             message: `ForgeRock Identity Cloud`["brightCyan"] + ` detected.`,
             state: state2
@@ -154468,7 +154503,7 @@ async function determineDeploymentType(state2) {
               state: state2
             });
           } catch (ex) {
-            if (_optionalChain([ex, 'access', _108 => _108.response, 'optionalAccess', _109 => _109.status]) === 302 && _optionalChain([ex, 'access', _110 => _110.response, 'access', _111 => _111.headers, 'optionalAccess', _112 => _112.location, 'optionalAccess', _113 => _113.indexOf, 'call', _114 => _114("code=")]) > -1) {
+            if (_optionalChain([ex, 'access', _112 => _112.response, 'optionalAccess', _113 => _113.status]) === 302 && _optionalChain([ex, 'access', _114 => _114.response, 'access', _115 => _115.headers, 'optionalAccess', _116 => _116.location, 'optionalAccess', _117 => _117.indexOf, 'call', _118 => _118("code=")]) > -1) {
               adminClientId = forgeopsClientId;
               verboseMessage({
                 message: `ForgeOps deployment`["brightCyan"] + ` detected.`,
@@ -154616,7 +154651,7 @@ async function getAuthCode(redirectURL, codeChallenge, codeChallengeMethod, stat
         throw error2;
       }
     }
-    const redirectLocationURL = _optionalChain([response2, 'access', _115 => _115.headers, 'optionalAccess', _116 => _116.location]);
+    const redirectLocationURL = _optionalChain([response2, 'access', _119 => _119.headers, 'optionalAccess', _120 => _120.location]);
     const queryObject = _url2.default.parse(redirectLocationURL, true).query;
     if ("code" in queryObject) {
       return queryObject.code;
@@ -154751,7 +154786,7 @@ async function getFreshSaBearerToken({
     });
   } catch (error2) {
     const err = error2;
-    if (err.isHttpError && err.httpErrorText === "invalid_scope" && _optionalChain([err, 'access', _117 => _117.httpDescription, 'optionalAccess', _118 => _118.startsWith, 'call', _119 => _119("Unsupported scope for service account: ")])) {
+    if (err.isHttpError && err.httpErrorText === "invalid_scope" && _optionalChain([err, 'access', _121 => _121.httpDescription, 'optionalAccess', _122 => _122.startsWith, 'call', _123 => _123("Unsupported scope for service account: ")])) {
       const invalidScopes = err.httpDescription.substring(39).split(",");
       const finalScopes = scope.split(" ").filter((el) => {
         return !invalidScopes.includes(el);
@@ -154868,9 +154903,9 @@ function scheduleAutoRefresh(forceLoginAsUser, autoRefresh, state2) {
     clearTimeout(timer);
   }
   if (autoRefresh) {
-    const expires = state2.getDeploymentType() === Constants_default.CLASSIC_DEPLOYMENT_TYPE_KEY ? _optionalChain([state2, 'access', _120 => _120.getUserSessionTokenMeta, 'call', _121 => _121(), 'optionalAccess', _122 => _122.expires]) : state2.getUseBearerTokenForAmApis() ? _optionalChain([state2, 'access', _123 => _123.getBearerTokenMeta, 'call', _124 => _124(), 'optionalAccess', _125 => _125.expires]) : Math.min(
-      _optionalChain([state2, 'access', _126 => _126.getBearerTokenMeta, 'call', _127 => _127(), 'optionalAccess', _128 => _128.expires]),
-      _optionalChain([state2, 'access', _129 => _129.getUserSessionTokenMeta, 'call', _130 => _130(), 'optionalAccess', _131 => _131.expires])
+    const expires = state2.getDeploymentType() === Constants_default.CLASSIC_DEPLOYMENT_TYPE_KEY ? _optionalChain([state2, 'access', _124 => _124.getUserSessionTokenMeta, 'call', _125 => _125(), 'optionalAccess', _126 => _126.expires]) : state2.getUseBearerTokenForAmApis() ? _optionalChain([state2, 'access', _127 => _127.getBearerTokenMeta, 'call', _128 => _128(), 'optionalAccess', _129 => _129.expires]) : Math.min(
+      _optionalChain([state2, 'access', _130 => _130.getBearerTokenMeta, 'call', _131 => _131(), 'optionalAccess', _132 => _132.expires]),
+      _optionalChain([state2, 'access', _133 => _133.getUserSessionTokenMeta, 'call', _134 => _134(), 'optionalAccess', _135 => _135.expires])
     );
     let timeout4 = expires - Date.now() - 1e3 * 25;
     if (timeout4 < 1e3 * 30) {
@@ -154992,10 +155027,10 @@ async function getTokens({
       throw new FrodoError(`Incomplete or no credentials`);
     }
     if (state2.getCookieValue() || state2.getUseBearerTokenForAmApis() && state2.getBearerToken()) {
-      if (_optionalChain([state2, 'access', _132 => _132.getBearerTokenMeta, 'call', _133 => _133(), 'optionalAccess', _134 => _134.from_cache])) {
+      if (_optionalChain([state2, 'access', _136 => _136.getBearerTokenMeta, 'call', _137 => _137(), 'optionalAccess', _138 => _138.from_cache])) {
         verboseMessage({ message: `Using cached bearer token.`, state: state2 });
       }
-      if (!state2.getUseBearerTokenForAmApis() && _optionalChain([state2, 'access', _135 => _135.getUserSessionTokenMeta, 'call', _136 => _136(), 'optionalAccess', _137 => _137.from_cache])) {
+      if (!state2.getUseBearerTokenForAmApis() && _optionalChain([state2, 'access', _139 => _139.getUserSessionTokenMeta, 'call', _140 => _140(), 'optionalAccess', _141 => _141.from_cache])) {
         verboseMessage({ message: `Using cached session token.`, state: state2 });
       }
       scheduleAutoRefresh(forceLoginAsUser, autoRefresh, state2);
@@ -155402,7 +155437,7 @@ async function updateAdminFederationProvider({
     });
     return response2;
   } catch (importError) {
-    if (_optionalChain([importError, 'access', _138 => _138.response, 'optionalAccess', _139 => _139.status]) === 400 && _optionalChain([importError, 'access', _140 => _140.response, 'optionalAccess', _141 => _141.data, 'optionalAccess', _142 => _142.message]) === "Invalid attribute specified.") {
+    if (_optionalChain([importError, 'access', _142 => _142.response, 'optionalAccess', _143 => _143.status]) === 400 && _optionalChain([importError, 'access', _144 => _144.response, 'optionalAccess', _145 => _145.data, 'optionalAccess', _146 => _146.message]) === "Invalid attribute specified.") {
       const { validAttributes } = importError.response.data.detail;
       validAttributes.push("_id", "_type");
       for (const attribute of Object.keys(providerData)) {
@@ -157578,7 +157613,7 @@ async function checkForUpdates({
       state: state2
     });
   }
-  const updateCount = _optionalChain([updates, 'access', _143 => _143.secrets, 'optionalAccess', _144 => _144.length]) + _optionalChain([updates, 'access', _145 => _145.variables, 'optionalAccess', _146 => _146.length]) || 0;
+  const updateCount = _optionalChain([updates, 'access', _147 => _147.secrets, 'optionalAccess', _148 => _148.length]) + _optionalChain([updates, 'access', _149 => _149.variables, 'optionalAccess', _150 => _150.length]) || 0;
   if (updateCount > 0) {
     stopProgressIndicator({
       id: indicatorId,
@@ -157671,7 +157706,7 @@ async function applyUpdates({
   } catch (error2) {
     stopProgressIndicator({
       id: indicatorId,
-      message: `Error: ${_optionalChain([error2, 'access', _147 => _147.response, 'optionalAccess', _148 => _148.data, 'optionalAccess', _149 => _149.code]) || error2} - ${_optionalChain([error2, 'access', _150 => _150.response, 'optionalAccess', _151 => _151.data, 'optionalAccess', _152 => _152.message])}`,
+      message: `Error: ${_optionalChain([error2, 'access', _151 => _151.response, 'optionalAccess', _152 => _152.data, 'optionalAccess', _153 => _153.code]) || error2} - ${_optionalChain([error2, 'access', _154 => _154.response, 'optionalAccess', _155 => _155.data, 'optionalAccess', _156 => _156.message])}`,
       status: "fail",
       state: state2
     });
@@ -158190,7 +158225,7 @@ async function updateSocialIdentityProvider({
     });
     return response2;
   } catch (error2) {
-    if (_optionalChain([error2, 'access', _153 => _153.response, 'optionalAccess', _154 => _154.status]) === 400 && _optionalChain([error2, 'access', _155 => _155.response, 'optionalAccess', _156 => _156.data, 'optionalAccess', _157 => _157.message]) === "Invalid attribute specified.") {
+    if (_optionalChain([error2, 'access', _157 => _157.response, 'optionalAccess', _158 => _158.status]) === 400 && _optionalChain([error2, 'access', _159 => _159.response, 'optionalAccess', _160 => _160.data, 'optionalAccess', _161 => _161.message]) === "Invalid attribute specified.") {
       const { validAttributes } = error2.response.data.detail;
       validAttributes.push("_id", "_type");
       for (const attribute of Object.keys(providerData)) {
@@ -160208,7 +160243,7 @@ async function getSaml2NodeDependencies(nodeObject, allProviders, allCirclesOfTr
         }
         saml2EntityPromises.push(providerResponse);
       } catch (error2) {
-        error2.message = `Error reading saml2 dependencies: ${_optionalChain([error2, 'access', _158 => _158.response, 'optionalAccess', _159 => _159.data, 'optionalAccess', _160 => _160.message]) || error2.message}`;
+        error2.message = `Error reading saml2 dependencies: ${_optionalChain([error2, 'access', _162 => _162.response, 'optionalAccess', _163 => _163.data, 'optionalAccess', _164 => _164.message]) || error2.message}`;
         errors.push(error2);
       }
     }
@@ -160237,7 +160272,7 @@ async function getSaml2NodeDependencies(nodeObject, allProviders, allCirclesOfTr
       circlesOfTrust
     };
   } catch (error2) {
-    error2.message = `Error reading saml2 dependencies: ${_optionalChain([error2, 'access', _161 => _161.response, 'optionalAccess', _162 => _162.data, 'optionalAccess', _163 => _163.message]) || error2.message}`;
+    error2.message = `Error reading saml2 dependencies: ${_optionalChain([error2, 'access', _165 => _165.response, 'optionalAccess', _166 => _166.data, 'optionalAccess', _167 => _167.message]) || error2.message}`;
     errors.push(error2);
   }
   if (errors.length) {
@@ -160348,7 +160383,7 @@ async function exportJourney({
             });
             emailTemplatePromises.push(emailTemplate);
           } catch (error2) {
-            error2.message = `Error reading email template ${nodeObject.emailTemplateName}: ${_optionalChain([error2, 'access', _164 => _164.response, 'optionalAccess', _165 => _165.data, 'optionalAccess', _166 => _166.message]) || error2.message}`;
+            error2.message = `Error reading email template ${nodeObject.emailTemplateName}: ${_optionalChain([error2, 'access', _168 => _168.response, 'optionalAccess', _169 => _169.data, 'optionalAccess', _170 => _170.message]) || error2.message}`;
             errors.push(error2);
           }
         }
@@ -160644,7 +160679,7 @@ async function exportJourney({
         for (const themeObject of themePromiseResults) {
           if (themeObject && // has the theme been specified by id or name in a page node?
           (themes.includes(themeObject._id) || themes.includes(themeObject.name) || // has this journey been linked to a theme?
-          _optionalChain([themeObject, 'access', _167 => _167.linkedTrees, 'optionalAccess', _168 => _168.includes, 'call', _169 => _169(treeObject._id)]))) {
+          _optionalChain([themeObject, 'access', _171 => _171.linkedTrees, 'optionalAccess', _172 => _172.includes, 'call', _173 => _173(treeObject._id)]))) {
             if (verbose)
               printMessage({
                 message: `
@@ -160927,7 +160962,7 @@ async function importJourney({
             state: state2
           });
         } catch (error2) {
-          if (_optionalChain([error2, 'access', _170 => _170.response, 'optionalAccess', _171 => _171.status]) === 500 && _optionalChain([error2, 'access', _172 => _172.response, 'optionalAccess', _173 => _173.data, 'optionalAccess', _174 => _174.message]) === "Unable to update SMS config: Data validation failed for the attribute, Redirect after form post URL") {
+          if (_optionalChain([error2, 'access', _174 => _174.response, 'optionalAccess', _175 => _175.status]) === 500 && _optionalChain([error2, 'access', _176 => _176.response, 'optionalAccess', _177 => _177.data, 'optionalAccess', _178 => _178.message]) === "Unable to update SMS config: Data validation failed for the attribute, Redirect after form post URL") {
             providerData["redirectAfterFormPostURI"] = "";
             try {
               await putProviderByTypeAndId2({
@@ -161038,7 +161073,7 @@ async function importJourney({
         try {
           await createCircleOfTrust({ cotData, state: state2 });
         } catch (error2) {
-          if (_optionalChain([error2, 'access', _175 => _175.response, 'optionalAccess', _176 => _176.status]) === 409 || _optionalChain([error2, 'access', _177 => _177.response, 'optionalAccess', _178 => _178.status]) === 500) {
+          if (_optionalChain([error2, 'access', _179 => _179.response, 'optionalAccess', _180 => _180.status]) === 409 || _optionalChain([error2, 'access', _181 => _181.response, 'optionalAccess', _182 => _182.status]) === 500) {
             try {
               await updateCircleOfTrust({ cotId, cotData, state: state2 });
             } catch (updateCotErr) {
@@ -161125,14 +161160,14 @@ async function importJourney({
             state: state2
           });
         } catch (nodeImportError) {
-          if (_optionalChain([nodeImportError, 'access', _179 => _179.response, 'optionalAccess', _180 => _180.status]) === 400 && _optionalChain([nodeImportError, 'access', _181 => _181.response, 'optionalAccess', _182 => _182.data, 'optionalAccess', _183 => _183.message]) === "Data validation failed for the attribute, Script") {
+          if (_optionalChain([nodeImportError, 'access', _183 => _183.response, 'optionalAccess', _184 => _184.status]) === 400 && _optionalChain([nodeImportError, 'access', _185 => _185.response, 'optionalAccess', _186 => _186.data, 'optionalAccess', _187 => _187.message]) === "Data validation failed for the attribute, Script") {
             errors.push(
               new FrodoError(
                 `Missing script ${innerNodeData["script"]} referenced by inner node ${innerNodeId}${innerNodeId === newUuid ? "" : ` [${newUuid}]`} (${innerNodeData["_type"]["_id"]}) in journey ${treeId}`,
                 nodeImportError
               )
             );
-          } else if (_optionalChain([nodeImportError, 'access', _184 => _184.response, 'optionalAccess', _185 => _185.status]) === 400 && _optionalChain([nodeImportError, 'access', _186 => _186.response, 'optionalAccess', _187 => _187.data, 'optionalAccess', _188 => _188.message]) === "Invalid attribute specified.") {
+          } else if (_optionalChain([nodeImportError, 'access', _188 => _188.response, 'optionalAccess', _189 => _189.status]) === 400 && _optionalChain([nodeImportError, 'access', _190 => _190.response, 'optionalAccess', _191 => _191.data, 'optionalAccess', _192 => _192.message]) === "Invalid attribute specified.") {
             const { validAttributes } = nodeImportError.response.data.detail;
             validAttributes.push("_id");
             for (const attribute of Object.keys(innerNodeData)) {
@@ -161235,14 +161270,14 @@ async function importJourney({
         try {
           await putNode({ nodeId: newUuid, nodeType, nodeData, state: state2 });
         } catch (nodeImportError) {
-          if (_optionalChain([nodeImportError, 'access', _189 => _189.response, 'optionalAccess', _190 => _190.status]) === 400 && _optionalChain([nodeImportError, 'access', _191 => _191.response, 'optionalAccess', _192 => _192.data, 'optionalAccess', _193 => _193.message]) === "Data validation failed for the attribute, Script") {
+          if (_optionalChain([nodeImportError, 'access', _193 => _193.response, 'optionalAccess', _194 => _194.status]) === 400 && _optionalChain([nodeImportError, 'access', _195 => _195.response, 'optionalAccess', _196 => _196.data, 'optionalAccess', _197 => _197.message]) === "Data validation failed for the attribute, Script") {
             errors.push(
               new FrodoError(
                 `Missing script ${nodeData["script"]} referenced by node ${nodeId}${nodeId === newUuid ? "" : ` [${newUuid}]`} (${nodeData["_type"]["_id"]}) in journey ${treeId}`,
                 nodeImportError
               )
             );
-          } else if (_optionalChain([nodeImportError, 'access', _194 => _194.response, 'optionalAccess', _195 => _195.status]) === 400 && _optionalChain([nodeImportError, 'access', _196 => _196.response, 'optionalAccess', _197 => _197.data, 'optionalAccess', _198 => _198.message]) === "Invalid attribute specified.") {
+          } else if (_optionalChain([nodeImportError, 'access', _198 => _198.response, 'optionalAccess', _199 => _199.status]) === 400 && _optionalChain([nodeImportError, 'access', _200 => _200.response, 'optionalAccess', _201 => _201.data, 'optionalAccess', _202 => _202.message]) === "Invalid attribute specified.") {
             const { validAttributes } = nodeImportError.response.data.detail;
             validAttributes.push("_id");
             for (const attribute of Object.keys(nodeData)) {
@@ -161329,7 +161364,7 @@ async function importJourney({
           state: state2
         });
     } catch (importError) {
-      if (_optionalChain([importError, 'access', _199 => _199.response, 'optionalAccess', _200 => _200.status]) === 400 && _optionalChain([importError, 'access', _201 => _201.response, 'optionalAccess', _202 => _202.data, 'optionalAccess', _203 => _203.message]) === "Invalid attribute specified.") {
+      if (_optionalChain([importError, 'access', _203 => _203.response, 'optionalAccess', _204 => _204.status]) === 400 && _optionalChain([importError, 'access', _205 => _205.response, 'optionalAccess', _206 => _206.data, 'optionalAccess', _207 => _207.message]) === "Invalid attribute specified.") {
         const { validAttributes } = importError.response.data.detail;
         validAttributes.push("_id");
         for (const attribute of Object.keys(importData.tree)) {
@@ -161538,7 +161573,7 @@ var fileByIdTreeExportResolver = async function(treeId, state2) {
       message: `fileByIdTreeExportResolver: resolved '${treeId}' to ${file}`,
       state: state2
     });
-    if (_optionalChain([jsonData, 'access', _204 => _204.tree, 'optionalAccess', _205 => _205._id]) === treeId) {
+    if (_optionalChain([jsonData, 'access', _208 => _208.tree, 'optionalAccess', _209 => _209._id]) === treeId) {
       treeExport = jsonData;
     } else if (jsonData.trees && jsonData.trees[treeId]) {
       treeExport = jsonData.trees[treeId];
@@ -161557,7 +161592,7 @@ function createFileParamTreeExportResolver(file, state2) {
     let treeExport = createSingleTreeExportTemplate({ state: state2 });
     try {
       const jsonData = JSON.parse(_fs3.default.readFileSync(file, "utf8"));
-      if (_optionalChain([jsonData, 'access', _206 => _206.tree, 'optionalAccess', _207 => _207._id]) === treeId) {
+      if (_optionalChain([jsonData, 'access', _210 => _210.tree, 'optionalAccess', _211 => _211._id]) === treeId) {
         treeExport = jsonData;
       } else if (jsonData.trees && jsonData.trees[treeId]) {
         treeExport = jsonData.trees[treeId];
@@ -161782,7 +161817,7 @@ async function deleteJourney({
                   });
                 return response2;
               }).catch((error2) => {
-                if (_optionalChain([error2, 'optionalAccess', _208 => _208.response, 'optionalAccess', _209 => _209.data, 'optionalAccess', _210 => _210.code]) === 500 && error2.response.data.message === "Unable to read SMS config: Node did not exist") {
+                if (_optionalChain([error2, 'optionalAccess', _212 => _212.response, 'optionalAccess', _213 => _213.data, 'optionalAccess', _214 => _214.code]) === 500 && error2.response.data.message === "Unable to read SMS config: Node did not exist") {
                   status.nodes[containerNode._id] = { status: "success" };
                   if (verbose)
                     printMessage({
@@ -162774,7 +162809,7 @@ async function importPolicySet({
           response2 = await createPolicySet({ policySetData, state: state2 });
           imported.push(id7);
         } catch (error2) {
-          if (_optionalChain([error2, 'access', _211 => _211.response, 'optionalAccess', _212 => _212.status]) === 409) {
+          if (_optionalChain([error2, 'access', _215 => _215.response, 'optionalAccess', _216 => _216.status]) === 409) {
             response2 = await updatePolicySet({ policySetData, state: state2 });
             imported.push(id7);
           } else throw error2;
@@ -162833,7 +162868,7 @@ async function importFirstPolicySet({
         response2 = await createPolicySet({ policySetData, state: state2 });
         imported.push(id7);
       } catch (error2) {
-        if (_optionalChain([error2, 'access', _213 => _213.response, 'optionalAccess', _214 => _214.status]) === 409) {
+        if (_optionalChain([error2, 'access', _217 => _217.response, 'optionalAccess', _218 => _218.status]) === 409) {
           response2 = await updatePolicySet({ policySetData, state: state2 });
           imported.push(id7);
         } else throw error2;
@@ -162887,7 +162922,7 @@ async function importPolicySets({
       try {
         response2 = await createPolicySet({ policySetData, state: state2 });
       } catch (error2) {
-        if (_optionalChain([error2, 'access', _215 => _215.response, 'optionalAccess', _216 => _216.status]) === 409) {
+        if (_optionalChain([error2, 'access', _219 => _219.response, 'optionalAccess', _220 => _220.status]) === 409) {
           response2 = await updatePolicySet({ policySetData, state: state2 });
         } else throw error2;
       }
@@ -163105,7 +163140,7 @@ async function exportResourceType({
     debugMessage({ message: `ResourceTypeOps.exportResourceType: end`, state: state2 });
     return exportData;
   } catch (error2) {
-    if (_optionalChain([error2, 'access', _217 => _217.response, 'optionalAccess', _218 => _218.status]) === 404) {
+    if (_optionalChain([error2, 'access', _221 => _221.response, 'optionalAccess', _222 => _222.status]) === 404) {
       throw new FrodoError(
         `Resource type ${resourceTypeUuid} does not exist`,
         error2
@@ -163199,7 +163234,7 @@ async function importResourceType({
         try {
           response2 = await createResourceType({ resourceTypeData, state: state2 });
         } catch (createError) {
-          if (_optionalChain([createError, 'access', _219 => _219.response, 'optionalAccess', _220 => _220.status]) === 409)
+          if (_optionalChain([createError, 'access', _223 => _223.response, 'optionalAccess', _224 => _224.status]) === 409)
             response2 = await putResourceType({
               resourceTypeUuid: id7,
               resourceTypeData,
@@ -163242,7 +163277,7 @@ async function importResourceTypeByName({
         try {
           response2 = await createResourceType({ resourceTypeData, state: state2 });
         } catch (createError) {
-          if (_optionalChain([createError, 'access', _221 => _221.response, 'optionalAccess', _222 => _222.status]) === 409)
+          if (_optionalChain([createError, 'access', _225 => _225.response, 'optionalAccess', _226 => _226.status]) === 409)
             response2 = await putResourceType({
               resourceTypeUuid: id7,
               resourceTypeData,
@@ -163284,7 +163319,7 @@ async function importFirstResourceType({
       try {
         response2 = await createResourceType({ resourceTypeData, state: state2 });
       } catch (createError) {
-        if (_optionalChain([createError, 'access', _223 => _223.response, 'optionalAccess', _224 => _224.status]) === 409)
+        if (_optionalChain([createError, 'access', _227 => _227.response, 'optionalAccess', _228 => _228.status]) === 409)
           response2 = await putResourceType({
             resourceTypeUuid: id7,
             resourceTypeData,
@@ -163319,7 +163354,7 @@ async function importResourceTypes({
       try {
         response2.push(await createResourceType({ resourceTypeData, state: state2 }));
       } catch (createError) {
-        if (_optionalChain([createError, 'access', _225 => _225.response, 'optionalAccess', _226 => _226.status]) === 409)
+        if (_optionalChain([createError, 'access', _229 => _229.response, 'optionalAccess', _230 => _230.status]) === 409)
           response2.push(
             await putResourceType({
               resourceTypeUuid: id7,
@@ -164408,8 +164443,8 @@ async function getFullServices({
             nextDescendents
           };
         } catch (error2) {
-          if (!(_optionalChain([error2, 'access', _227 => _227.response, 'optionalAccess', _228 => _228.status]) === 403 && _optionalChain([error2, 'access', _229 => _229.response, 'optionalAccess', _230 => _230.data, 'optionalAccess', _231 => _231.message]) === "This operation is not available in ForgeRock Identity Cloud.")) {
-            const message = _optionalChain([error2, 'access', _232 => _232.response, 'optionalAccess', _233 => _233.data, 'optionalAccess', _234 => _234.message]);
+          if (!(_optionalChain([error2, 'access', _231 => _231.response, 'optionalAccess', _232 => _232.status]) === 403 && _optionalChain([error2, 'access', _233 => _233.response, 'optionalAccess', _234 => _234.data, 'optionalAccess', _235 => _235.message]) === "This operation is not available in ForgeRock Identity Cloud.")) {
+            const message = _optionalChain([error2, 'access', _236 => _236.response, 'optionalAccess', _237 => _237.data, 'optionalAccess', _238 => _238.message]);
             printMessage({
               message: `Unable to retrieve data for ${listItem._id} with error: ${message}`,
               type: "error",
@@ -164440,6 +164475,7 @@ async function putFullService({
       message: `ServiceOps.putFullService: start, serviceId=${serviceId}, globalConfig=${globalConfig}`,
       state: state2
     });
+    const fullServiceDataCopy = cloneDeep(fullServiceData);
     const nextDescendents = fullServiceData.nextDescendents;
     delete fullServiceData.nextDescendents;
     delete fullServiceData._rev;
@@ -164449,7 +164485,7 @@ async function putFullService({
         debugMessage({ message: `ServiceOps.putFullService: clean`, state: state2 });
         await deleteFullService({ serviceId, globalConfig, state: state2 });
       } catch (error2) {
-        if (!(_optionalChain([error2, 'access', _235 => _235.response, 'optionalAccess', _236 => _236.status]) === 404 && _optionalChain([error2, 'access', _237 => _237.response, 'optionalAccess', _238 => _238.data, 'optionalAccess', _239 => _239.message]) === "Not Found")) {
+        if (!(_optionalChain([error2, 'access', _239 => _239.response, 'optionalAccess', _240 => _240.status]) === 404 && _optionalChain([error2, 'access', _241 => _241.response, 'optionalAccess', _242 => _242.data, 'optionalAccess', _243 => _243.message]) === "Not Found")) {
           throw new FrodoError(
             `Error deleting service '${serviceId}' before import`,
             error2
@@ -164458,7 +164494,10 @@ async function putFullService({
       }
     }
     delete fullServiceData.location;
-    const result2 = await putService({
+    if (serviceId === "email" && fullServiceData.transportType) {
+      delete fullServiceData.transportType;
+    }
+    let result2 = await putService({
       serviceId,
       serviceData: fullServiceData,
       globalConfig,
@@ -164498,6 +164537,15 @@ async function putFullService({
         return result22;
       })
     );
+    if (serviceId === "email" && fullServiceDataCopy.transportType) {
+      fullServiceData.transportType = fullServiceDataCopy.transportType;
+      result2 = await putService({
+        serviceId,
+        serviceData: fullServiceData,
+        globalConfig,
+        state: state2
+      });
+    }
     result2.nextDescendents = nextDescendentResult;
     debugMessage({
       message: `ServiceOps.putFullService: end (w/ descendents)`,
@@ -164614,8 +164662,8 @@ async function deleteFullServices({
             state: state2
           });
         } catch (error2) {
-          if (!(_optionalChain([error2, 'access', _240 => _240.response, 'optionalAccess', _241 => _241.status]) === 403 && _optionalChain([error2, 'access', _242 => _242.response, 'optionalAccess', _243 => _243.data, 'optionalAccess', _244 => _244.message]) === "This operation is not available in ForgeRock Identity Cloud.")) {
-            const message = _optionalChain([error2, 'access', _245 => _245.response, 'optionalAccess', _246 => _246.data, 'optionalAccess', _247 => _247.message]);
+          if (!(_optionalChain([error2, 'access', _244 => _244.response, 'optionalAccess', _245 => _245.status]) === 403 && _optionalChain([error2, 'access', _246 => _246.response, 'optionalAccess', _247 => _247.data, 'optionalAccess', _248 => _248.message]) === "This operation is not available in ForgeRock Identity Cloud.")) {
+            const message = _optionalChain([error2, 'access', _249 => _249.response, 'optionalAccess', _250 => _250.data, 'optionalAccess', _251 => _251.message]);
             printMessage({
               message: `Delete service '${serviceListItem._id}': ${message}`,
               state: state2,
@@ -164863,22 +164911,22 @@ async function exportFullConfiguration({
       stateObj,
       errors,
       isPlatformDeployment
-    )), 'optionalAccess', async _248 => _248.emailTemplate]),
+    )), 'optionalAccess', async _252 => _252.emailTemplate]),
     idm: await _asyncOptionalChain([(await exportWithErrorHandling(
       exportConfigEntities,
       stateObj,
       errors,
       isPlatformDeployment
-    )), 'optionalAccess', async _249 => _249.idm]),
-    mapping: _optionalChain([mappings, 'optionalAccess', _250 => _250.mapping]),
+    )), 'optionalAccess', async _253 => _253.idm]),
+    mapping: _optionalChain([mappings, 'optionalAccess', _254 => _254.mapping]),
     secrets: await _asyncOptionalChain([(await exportWithErrorHandling(
       exportSecrets,
       { options: { includeActiveValues, target }, state: state2 },
       errors,
       isCloudDeployment
-    )), 'optionalAccess', async _251 => _251.secrets]),
-    service: await _asyncOptionalChain([(await exportWithErrorHandling(exportServices, globalStateObj, errors)), 'optionalAccess', async _252 => _252.service]),
-    sync: _optionalChain([mappings, 'optionalAccess', _253 => _253.sync]),
+    )), 'optionalAccess', async _255 => _255.secrets]),
+    service: await _asyncOptionalChain([(await exportWithErrorHandling(exportServices, globalStateObj, errors)), 'optionalAccess', async _256 => _256.service]),
+    sync: _optionalChain([mappings, 'optionalAccess', _257 => _257.sync]),
     variables: await _asyncOptionalChain([(await exportWithErrorHandling(
       exportVariables,
       {
@@ -164887,7 +164935,7 @@ async function exportFullConfiguration({
       },
       errors,
       isCloudDeployment
-    )), 'optionalAccess', async _254 => _254.variables])
+    )), 'optionalAccess', async _258 => _258.variables])
   };
   const realmConfig = {};
   const currentRealm = state2.getRealm();
@@ -164897,19 +164945,19 @@ async function exportFullConfiguration({
       exportSaml2Providers,
       stateObj,
       errors
-    )), 'optionalAccess', async _255 => _255.saml]);
+    )), 'optionalAccess', async _259 => _259.saml]);
     const cotExport = await exportWithErrorHandling(
       exportCirclesOfTrust,
       stateObj,
       errors
     );
     if (saml) {
-      saml.cot = _optionalChain([cotExport, 'optionalAccess', _256 => _256.saml, 'access', _257 => _257.cot]);
+      saml.cot = _optionalChain([cotExport, 'optionalAccess', _260 => _260.saml, 'access', _261 => _261.cot]);
     } else {
-      saml = _optionalChain([cotExport, 'optionalAccess', _258 => _258.saml]);
+      saml = _optionalChain([cotExport, 'optionalAccess', _262 => _262.saml]);
     }
     realmConfig[realm2] = {
-      agents: await _asyncOptionalChain([(await exportWithErrorHandling(exportAgents, realmStateObj, errors)), 'optionalAccess', async _259 => _259.agents]),
+      agents: await _asyncOptionalChain([(await exportWithErrorHandling(exportAgents, realmStateObj, errors)), 'optionalAccess', async _263 => _263.agents]),
       application: await _asyncOptionalChain([(await exportWithErrorHandling(
         exportOAuth2Clients,
         {
@@ -164917,17 +164965,17 @@ async function exportFullConfiguration({
           state: state2
         },
         errors
-      )), 'optionalAccess', async _260 => _260.application]),
+      )), 'optionalAccess', async _264 => _264.application]),
       authentication: await _asyncOptionalChain([(await exportWithErrorHandling(
         exportAuthenticationSettings,
         realmStateObj,
         errors
-      )), 'optionalAccess', async _261 => _261.authentication]),
+      )), 'optionalAccess', async _265 => _265.authentication]),
       idp: await _asyncOptionalChain([(await exportWithErrorHandling(
         exportSocialIdentityProviders,
         stateObj,
         errors
-      )), 'optionalAccess', async _262 => _262.idp]),
+      )), 'optionalAccess', async _266 => _266.idp]),
       managedApplication: await _asyncOptionalChain([(await exportWithErrorHandling(
         exportApplications,
         {
@@ -164936,7 +164984,7 @@ async function exportFullConfiguration({
         },
         errors,
         isPlatformDeployment
-      )), 'optionalAccess', async _263 => _263.managedApplication]),
+      )), 'optionalAccess', async _267 => _267.managedApplication]),
       policy: await _asyncOptionalChain([(await exportWithErrorHandling(
         exportPolicies,
         {
@@ -164944,7 +164992,7 @@ async function exportFullConfiguration({
           state: state2
         },
         errors
-      )), 'optionalAccess', async _264 => _264.policy]),
+      )), 'optionalAccess', async _268 => _268.policy]),
       policyset: await _asyncOptionalChain([(await exportWithErrorHandling(
         exportPolicySets,
         {
@@ -164952,8 +165000,8 @@ async function exportFullConfiguration({
           state: state2
         },
         errors
-      )), 'optionalAccess', async _265 => _265.policyset]),
-      resourcetype: await _asyncOptionalChain([(await exportWithErrorHandling(exportResourceTypes, stateObj, errors)), 'optionalAccess', async _266 => _266.resourcetype]),
+      )), 'optionalAccess', async _269 => _269.policyset]),
+      resourcetype: await _asyncOptionalChain([(await exportWithErrorHandling(exportResourceTypes, stateObj, errors)), 'optionalAccess', async _270 => _270.resourcetype]),
       saml,
       script: await _asyncOptionalChain([(await exportWithErrorHandling(
         exportScripts,
@@ -164966,8 +165014,8 @@ async function exportFullConfiguration({
           state: state2
         },
         errors
-      )), 'optionalAccess', async _267 => _267.script]),
-      service: await _asyncOptionalChain([(await exportWithErrorHandling(exportServices, realmStateObj, errors)), 'optionalAccess', async _268 => _268.service]),
+      )), 'optionalAccess', async _271 => _271.script]),
+      service: await _asyncOptionalChain([(await exportWithErrorHandling(exportServices, realmStateObj, errors)), 'optionalAccess', async _272 => _272.service]),
       theme: await _asyncOptionalChain([(await exportWithErrorHandling(
         exportThemes,
         {
@@ -164975,7 +165023,7 @@ async function exportFullConfiguration({
         },
         errors,
         isPlatformDeployment
-      )), 'optionalAccess', async _269 => _269.theme]),
+      )), 'optionalAccess', async _273 => _273.theme]),
       trees: await _asyncOptionalChain([(await exportWithErrorHandling(
         exportJourneys,
         {
@@ -164983,7 +165031,7 @@ async function exportFullConfiguration({
           state: state2
         },
         errors
-      )), 'optionalAccess', async _270 => _270.trees])
+      )), 'optionalAccess', async _274 => _274.trees])
     };
   }
   state2.setRealm(currentRealm);
@@ -167971,7 +168019,7 @@ In AM, create a trusted issuer in the ${state.getRealm()} realm with the followi
       ]);
       issuer.push([
         "Allowed Subjects              "["brightCyan"],
-        _optionalChain([artefacts, 'access', _271 => _271.issuer, 'access', _272 => _272.allowedSubjects, 'optionalAccess', _273 => _273.value, 'access', _274 => _274.length]) ? _optionalChain([artefacts, 'access', _275 => _275.issuer, 'access', _276 => _276.allowedSubjects, 'optionalAccess', _277 => _277.value, 'access', _278 => _278.join, 'call', _279 => _279(", ")]) : `Any ${state.getRealm()} realm user`
+        _optionalChain([artefacts, 'access', _275 => _275.issuer, 'access', _276 => _276.allowedSubjects, 'optionalAccess', _277 => _277.value, 'access', _278 => _278.length]) ? _optionalChain([artefacts, 'access', _279 => _279.issuer, 'access', _280 => _280.allowedSubjects, 'optionalAccess', _281 => _281.value, 'access', _282 => _282.join, 'call', _283 => _283(", ")]) : `Any ${state.getRealm()} realm user`
       ]);
       issuer.push([
         "JWKS (Public Key)"["brightCyan"],
@@ -168099,7 +168147,7 @@ async function executeRfc7523AuthZGrantFlow2(clientId, iss, jwk, sub, scope, jso
     stopProgressIndicator2(
       spinnerId,
       `Error executing rfc7523 authz grant flow: ${stringify9(
-        _optionalChain([error2, 'access', _280 => _280.response, 'optionalAccess', _281 => _281.data]) || error2.message
+        _optionalChain([error2, 'access', _284 => _284.response, 'optionalAccess', _285 => _285.data]) || error2.message
       )}`,
       "fail"
     );
@@ -176906,7 +176954,7 @@ async function tailLogs(source, levels, txid, cookie, nf) {
       filteredLogs = logsObject.result.filter(
         (el) => !noiseFilter.includes(
           el.payload.logger
-        ) && !noiseFilter.includes(el.type) && (levels[0] === "ALL" || levels.includes(resolvePayloadLevel2(el))) && (typeof txid === "undefined" || txid === null || _optionalChain([el, 'access', _282 => _282.payload, 'access', _283 => _283.transactionId, 'optionalAccess', _284 => _284.includes, 'call', _285 => _285(
+        ) && !noiseFilter.includes(el.type) && (levels[0] === "ALL" || levels.includes(resolvePayloadLevel2(el))) && (typeof txid === "undefined" || txid === null || _optionalChain([el, 'access', _286 => _286.payload, 'access', _287 => _287.transactionId, 'optionalAccess', _288 => _288.includes, 'call', _289 => _289(
           txid
         )]))
       );
@@ -176930,7 +176978,7 @@ async function fetchLogs(source, startTs, endTs, levels, txid, ffString, cookie,
       filteredLogs = logsObject.result.filter(
         (el) => !noiseFilter.includes(
           el.payload.logger
-        ) && !noiseFilter.includes(el.type) && (levels[0] === "ALL" || levels.includes(resolvePayloadLevel2(el))) && (typeof txid === "undefined" || txid === null || _optionalChain([el, 'access', _286 => _286.payload, 'access', _287 => _287.transactionId, 'optionalAccess', _288 => _288.includes, 'call', _289 => _289(
+        ) && !noiseFilter.includes(el.type) && (levels[0] === "ALL" || levels.includes(resolvePayloadLevel2(el))) && (typeof txid === "undefined" || txid === null || _optionalChain([el, 'access', _290 => _290.payload, 'access', _291 => _291.transactionId, 'optionalAccess', _292 => _292.includes, 'call', _293 => _293(
           txid
         )]))
       );
@@ -177084,9 +177132,9 @@ function setup79() {
                 `Created log API key ${creds.api_key_id} and secret.`
               );
             } catch (error2) {
-              printMessage2(_optionalChain([error2, 'access', _290 => _290.response, 'optionalAccess', _291 => _291.data]), "error");
+              printMessage2(_optionalChain([error2, 'access', _294 => _294.response, 'optionalAccess', _295 => _295.data]), "error");
               printMessage2(
-                `Error creating log API key and secret: ${_optionalChain([error2, 'access', _292 => _292.response, 'optionalAccess', _293 => _293.data, 'optionalAccess', _294 => _294.message])}`,
+                `Error creating log API key and secret: ${_optionalChain([error2, 'access', _296 => _296.response, 'optionalAccess', _297 => _297.data, 'optionalAccess', _298 => _298.message])}`,
                 "error"
               );
               process.exitCode = 1;
@@ -177792,7 +177840,7 @@ function setup86() {
           printMessage2(updatesTable.toString(), "data");
         }
         if (!options2.checkOnly) {
-          if (_optionalChain([updates, 'access', _295 => _295.secrets, 'optionalAccess', _296 => _296.length]) || _optionalChain([updates, 'access', _297 => _297.variables, 'optionalAccess', _298 => _298.length]) || options2.force) {
+          if (_optionalChain([updates, 'access', _299 => _299.secrets, 'optionalAccess', _300 => _300.length]) || _optionalChain([updates, 'access', _301 => _301.variables, 'optionalAccess', _302 => _302.length]) || options2.force) {
             const ok = options2.yes || await (0, import_yesno.default)({
               question: `
 Changes may take up to 10 minutes to propagate, during which time you will not be able to make further updates.
@@ -181135,7 +181183,7 @@ function getNodeClassificationMd(nodeType) {
 function getOneLineDescription5(nodeObj, nodeRef) {
   const description = `[${nodeObj._id["brightCyan"]}] (${getNodeClassification2(
     nodeObj._type._id
-  ).join(", ")}) ${nodeObj._type._id}${nodeRef ? " - " + _optionalChain([nodeRef, 'optionalAccess', _299 => _299.displayName]) : ""}`;
+  ).join(", ")}) ${nodeObj._type._id}${nodeRef ? " - " + _optionalChain([nodeRef, 'optionalAccess', _303 => _303.displayName]) : ""}`;
   return description;
 }
 function getTableHeaderMd5() {
@@ -181870,7 +181918,7 @@ async function listJourneys(long = false, analyze = false) {
           table.push([
             `${journeyStub._id}`,
             journeyStub.enabled === false ? "disabled"["brightRed"] : "enabled"["brightGreen"],
-            _optionalChain([journeyStub, 'access', _300 => _300.uiConfig, 'optionalAccess', _301 => _301.categories]) ? wordwrap(
+            _optionalChain([journeyStub, 'access', _304 => _304.uiConfig, 'optionalAccess', _305 => _305.categories]) ? wordwrap(
               JSON.parse(journeyStub.uiConfig.categories).join(", "),
               60
             ) : ""
@@ -181912,7 +181960,7 @@ async function listJourneys(long = false, analyze = false) {
               `${journeyExport.tree._id}`,
               journeyExport.tree.enabled === false ? "disabled"["brightRed"] : "enabled"["brightGreen"],
               getJourneyClassification2(journeyExport).join(", "),
-              _optionalChain([journeyExport, 'access', _302 => _302.tree, 'access', _303 => _303.uiConfig, 'optionalAccess', _304 => _304.categories]) ? wordwrap(
+              _optionalChain([journeyExport, 'access', _306 => _306.tree, 'access', _307 => _307.uiConfig, 'optionalAccess', _308 => _308.categories]) ? wordwrap(
                 JSON.parse(journeyExport.tree.uiConfig.categories).join(
                   ", "
                 ),
@@ -182315,7 +182363,7 @@ async function describeJourney(journeyData, resolveTreeExport = onlineTreeExport
         nodeTypeMap[nodeData._type._id] = 1;
       }
     }
-    if (!state.getAmVersion() && _optionalChain([journeyData, 'access', _305 => _305.meta, 'optionalAccess', _306 => _306.originAmVersion])) {
+    if (!state.getAmVersion() && _optionalChain([journeyData, 'access', _309 => _309.meta, 'optionalAccess', _310 => _310.originAmVersion])) {
       state.setAmVersion(journeyData.meta.originAmVersion);
     }
     printMessage2(`${getOneLineDescription8(journeyData.tree)}`, "data");
@@ -182339,7 +182387,7 @@ ${getJourneyClassification2(journeyData).join(", ")}`,
         "data"
       );
     }
-    if (_optionalChain([journeyData, 'access', _307 => _307.tree, 'access', _308 => _308.uiConfig, 'optionalAccess', _309 => _309.categories]) && journeyData.tree.uiConfig.categories != "[]") {
+    if (_optionalChain([journeyData, 'access', _311 => _311.tree, 'access', _312 => _312.uiConfig, 'optionalAccess', _313 => _313.categories]) && journeyData.tree.uiConfig.categories != "[]") {
       printMessage2("\nCategories/Tags", "data");
       printMessage2(
         `${JSON.parse(journeyData.tree.uiConfig.categories).join(", ")}`,
@@ -182381,7 +182429,7 @@ Nodes (${Object.entries(allNodes).length}):`, "data");
         );
       }
     }
-    if (_optionalChain([journeyData, 'access', _310 => _310.themes, 'optionalAccess', _311 => _311.length])) {
+    if (_optionalChain([journeyData, 'access', _314 => _314.themes, 'optionalAccess', _315 => _315.length])) {
       printMessage2(`
 Themes (${journeyData.themes.length}):`, "data");
       for (const themeData of journeyData.themes) {
@@ -182475,14 +182523,14 @@ async function describeJourneyMd(journeyData, resolveTreeExport = onlineTreeExpo
         nodeTypeMap[nodeData._type._id] = 1;
       }
     }
-    if (!state.getAmVersion() && _optionalChain([journeyData, 'access', _312 => _312.meta, 'optionalAccess', _313 => _313.originAmVersion])) {
+    if (!state.getAmVersion() && _optionalChain([journeyData, 'access', _316 => _316.meta, 'optionalAccess', _317 => _317.originAmVersion])) {
       state.setAmVersion(journeyData.meta.originAmVersion);
     }
     printMessage2(
       `# ${getOneLineDescriptionMd(journeyData.tree)} - ${journeyData.tree.enabled === false ? ":o: `disabled`" : ":white_check_mark: `enabled`"}, ${getJourneyClassificationMd(journeyData).join(", ")}`,
       "data"
     );
-    if (_optionalChain([journeyData, 'access', _314 => _314.tree, 'access', _315 => _315.uiConfig, 'optionalAccess', _316 => _316.categories]) && journeyData.tree.uiConfig.categories != "[]") {
+    if (_optionalChain([journeyData, 'access', _318 => _318.tree, 'access', _319 => _319.uiConfig, 'optionalAccess', _320 => _320.categories]) && journeyData.tree.uiConfig.categories != "[]") {
       printMessage2(
         `\`${JSON.parse(journeyData.tree.uiConfig.categories).join("`, `")}\``,
         "data"
@@ -182526,7 +182574,7 @@ ${journeyData.tree.description}`, "data");
         );
       }
     }
-    if (_optionalChain([journeyData, 'access', _317 => _317.themes, 'optionalAccess', _318 => _318.length])) {
+    if (_optionalChain([journeyData, 'access', _321 => _321.themes, 'optionalAccess', _322 => _322.length])) {
       printMessage2(`## Themes (${journeyData.themes.length})`, "data");
       printMessage2(getTableHeaderMd7(), "data");
       for (const themeData of journeyData.themes) {
@@ -182796,9 +182844,9 @@ function setup121() {
             journeyData = fileData.trees[options2.journeyId];
           } else if (typeof options2.journeyId === "undefined" && fileData.trees) {
             [journeyData] = Object.values(fileData.trees);
-          } else if (typeof options2.journeyId !== "undefined" && options2.journeyId === _optionalChain([fileData, 'access', _319 => _319.tree, 'optionalAccess', _320 => _320._id])) {
+          } else if (typeof options2.journeyId !== "undefined" && options2.journeyId === _optionalChain([fileData, 'access', _323 => _323.tree, 'optionalAccess', _324 => _324._id])) {
             journeyData = fileData;
-          } else if (typeof options2.journeyId === "undefined" && _optionalChain([fileData, 'access', _321 => _321.tree, 'optionalAccess', _322 => _322._id])) {
+          } else if (typeof options2.journeyId === "undefined" && _optionalChain([fileData, 'access', _325 => _325.tree, 'optionalAccess', _326 => _326._id])) {
             journeyData = fileData;
           } else {
             throw new Error(
@@ -184529,7 +184577,7 @@ async function listRealms(long = false) {
   } catch (error2) {
     printMessage2(error2, "error");
     printMessage2(`Error listing realms: ${error2.message}`, "error");
-    printMessage2(_optionalChain([error2, 'access', _323 => _323.response, 'optionalAccess', _324 => _324.data]), "error");
+    printMessage2(_optionalChain([error2, 'access', _327 => _327.response, 'optionalAccess', _328 => _328.data]), "error");
   }
 }
 async function describeRealm(realm2) {
@@ -185689,7 +185737,7 @@ async function importServiceFromFile(serviceId, file, options2 = {
     );
     const data2 = _fs3.default.readFileSync(filePath, "utf8");
     const importData = JSON.parse(data2);
-    if (_optionalChain([importData, 'optionalAccess', _325 => _325.service, 'access', _326 => _326[serviceId]])) {
+    if (_optionalChain([importData, 'optionalAccess', _329 => _329.service, 'access', _330 => _330[serviceId]])) {
       await importService2(serviceId, importData, options2);
       stopProgressIndicator2(
         indicatorId,
@@ -186477,7 +186525,7 @@ var compareVersions = (v12, v2) => {
 // package.json
 var package_default2 = {
   name: "@rockcarver/frodo-cli",
-  version: "2.0.0",
+  version: "2.0.1",
   type: "module",
   description: "A command line interface to manage ForgeRock Identity Cloud tenants, ForgeOps deployments, and classic deployments.",
   keywords: [
@@ -186591,7 +186639,7 @@ var package_default2 = {
     ]
   },
   devDependencies: {
-    "@rockcarver/frodo-lib": "2.0.0",
+    "@rockcarver/frodo-lib": "2.0.1",
     "@types/colors": "^1.2.1",
     "@types/fs-extra": "^11.0.1",
     "@types/jest": "^29.2.3",