@rockcarver/frodo-lib 2.0.0-3 → 2.0.0-4

package/esm/ops/ConnectionProfileOps.mjs

@@ -32,7 +32,8 @@ export default class ConnectionProfileOps {
   findConnectionProfiles(connectionProfiles, host) {
     return findConnectionProfiles({
       connectionProfiles,
-      host
+      host,
+      state: this.state
     });
   }
 
@@ -129,13 +130,20 @@ export function getConnectionProfilesPath({
  */
 function findConnectionProfiles({
   connectionProfiles,
-  host
+  host,
+  state
 }) {
   const profiles = [];
   for (const tenant in connectionProfiles) {
-    debugMessage(`ConnectionProfileOps.findConnectionProfiles: tenant=${tenant}`);
+    debugMessage({
+      message: `ConnectionProfileOps.findConnectionProfiles: tenant=${tenant}`,
+      state
+    });
     if (tenant.includes(host)) {
-      debugMessage(`ConnectionProfileOps.findConnectionProfiles: '${host}' identifies '${tenant}', including in result set`);
+      debugMessage({
+        message: `ConnectionProfileOps.findConnectionProfiles: '${host}' identifies '${tenant}', including in result set`,
+        state
+      });
       const foundProfile = {
         ...connectionProfiles[tenant]
       };
@@ -176,7 +184,10 @@ function migrateFromLegacyProfile() {
 export async function initConnectionProfiles({
   state
 }) {
-  const dataProtection = new DataProtection(state.getMasterKeyPath());
+  const dataProtection = new DataProtection({
+    pathToMasterKey: state.getMasterKeyPath(),
+    state
+  });
   // create connections.json file if it doesn't exist
   const filename = getConnectionProfilesPath({
     state
@@ -230,25 +241,45 @@ export async function getConnectionProfileByHost({
   state
 }) {
   try {
-    const dataProtection = new DataProtection(state.getMasterKeyPath());
+    const dataProtection = new DataProtection({
+      pathToMasterKey: state.getMasterKeyPath(),
+      state
+    });
     const filename = getConnectionProfilesPath({
       state
     });
     const connectionsData = JSON.parse(fs.readFileSync(filename, 'utf8'));
     const profiles = findConnectionProfiles({
       connectionProfiles: connectionsData,
-      host
+      host,
+      state
     });
     if (profiles.length == 0) {
-      printMessage(`Profile for ${host} not found. Please specify credentials on command line`, 'error');
+      printMessage({
+        message: `Profile for ${host} not found. Please specify credentials on command line`,
+        type: 'error',
+        state
+      });
       return null;
     }
     if (profiles.length > 1) {
-      printMessage(`Multiple matching profiles found.`, 'error');
+      printMessage({
+        message: `Multiple matching profiles found.`,
+        type: 'error',
+        state
+      });
       profiles.forEach(p => {
-        printMessage(`- ${p.tenant}`, 'error');
+        printMessage({
+          message: `- ${p.tenant}`,
+          type: 'error',
+          state
+        });
+      });
+      printMessage({
+        message: `Please specify a unique sub-string`,
+        type: 'error',
+        state
       });
-      printMessage(`Please specify a unique sub-string`, 'error');
       return null;
     }
     return {
@@ -264,7 +295,11 @@ export async function getConnectionProfileByHost({
       svcacctJwk: profiles[0].encodedSvcacctJwk ? await dataProtection.decrypt(profiles[0].encodedSvcacctJwk) : null
     };
   } catch (e) {
-    printMessage(`Can not read saved connection info, please specify credentials on command line: ${e}`, 'error');
+    printMessage({
+      message: `Can not read saved connection info, please specify credentials on command line: ${e}`,
+      type: 'error',
+      state
+    });
     return null;
   }
 }
@@ -291,12 +326,21 @@ export async function saveConnectionProfile({
   host,
   state
 }) {
-  debugMessage(`ConnectionProfileOps.saveConnectionProfile: start`);
-  const dataProtection = new DataProtection(state.getMasterKeyPath());
+  debugMessage({
+    message: `ConnectionProfileOps.saveConnectionProfile: start`,
+    state
+  });
+  const dataProtection = new DataProtection({
+    pathToMasterKey: state.getMasterKeyPath(),
+    state
+  });
   const filename = getConnectionProfilesPath({
     state
   });
-  debugMessage(`Saving connection profile in ${filename}`);
+  debugMessage({
+    message: `Saving connection profile in ${filename}`,
+    state
+  });
   let profiles = {};
   let profile = {
     tenant: ''
@@ -309,30 +353,50 @@ export async function saveConnectionProfile({
     // find tenant
     const found = findConnectionProfiles({
       connectionProfiles: profiles,
-      host
+      host,
+      state
     });
 
     // replace tenant in session with real tenant url if necessary
     if (found.length === 1) {
       profile = found[0];
       state.setHost(profile.tenant);
-      verboseMessage(`Existing profile: ${profile.tenant}`);
-      debugMessage(profile);
+      verboseMessage({
+        message: `Existing profile: ${profile.tenant}`,
+        state
+      });
+      debugMessage({
+        message: profile,
+        state
+      });
     }
 
     // connection profile not found, validate host is a real URL
     if (found.length === 0) {
       if (isValidUrl(host)) {
         state.setHost(host);
-        debugMessage(`New profile: ${host}`);
+        debugMessage({
+          message: `New profile: ${host}`,
+          state
+        });
       } else {
-        printMessage(`No existing profile found matching '${host}'. Provide a valid URL as the host argument to create a new profile.`, 'error');
-        debugMessage(`ConnectionProfileOps.saveConnectionProfile: end [false]`);
+        printMessage({
+          message: `No existing profile found matching '${host}'. Provide a valid URL as the host argument to create a new profile.`,
+          type: 'error',
+          state
+        });
+        debugMessage({
+          message: `ConnectionProfileOps.saveConnectionProfile: end [false]`,
+          state
+        });
         return false;
       }
     }
   } catch (error) {
-    debugMessage(`New profiles file ${filename} with new profile ${host}`);
+    debugMessage({
+      message: `New profiles file ${filename} with new profile ${host}`,
+      state
+    });
   }
 
   // user account
@@ -358,18 +422,33 @@ export async function saveConnectionProfile({
       serviceAccountId: profile.svcacctId,
       state
     })).name;
-    debugMessage(`ConnectionProfileOps.saveConnectionProfile: added missing service account name`);
+    debugMessage({
+      message: `ConnectionProfileOps.saveConnectionProfile: added missing service account name`,
+      state
+    });
   }
 
   // advanced settings
   if (state.getAuthenticationService()) {
     profile.authenticationService = state.getAuthenticationService();
-    printMessage('Advanced setting: Authentication Service: ' + state.getAuthenticationService(), 'info');
+    printMessage({
+      message: 'Advanced setting: Authentication Service: ' + state.getAuthenticationService(),
+      type: 'info',
+      state
+    });
   }
   if (state.getAuthenticationHeaderOverrides() && Object.entries(state.getAuthenticationHeaderOverrides()).length) {
     profile.authenticationHeaderOverrides = state.getAuthenticationHeaderOverrides();
-    printMessage('Advanced setting: Authentication Header Overrides: ', 'info');
-    printMessage(state.getAuthenticationHeaderOverrides(), 'info');
+    printMessage({
+      message: 'Advanced setting: Authentication Header Overrides: ',
+      type: 'info',
+      state
+    });
+    printMessage({
+      message: state.getAuthenticationHeaderOverrides(),
+      type: 'info',
+      state
+    });
   }
 
   // remove the helper key 'tenant'
@@ -391,8 +470,14 @@ export async function saveConnectionProfile({
     includeMeta: false,
     state
   });
-  verboseMessage(`Saved connection profile ${state.getHost()} in ${filename}`);
-  debugMessage(`ConnectionProfileOps.saveConnectionProfile: end [true]`);
+  verboseMessage({
+    message: `Saved connection profile ${state.getHost()} in ${filename}`,
+    state
+  });
+  debugMessage({
+    message: `ConnectionProfileOps.saveConnectionProfile: end [true]`,
+    state
+  });
   return true;
 }
 
@@ -414,28 +499,54 @@ export function deleteConnectionProfile({
       connectionsData = JSON.parse(data);
       const profiles = findConnectionProfiles({
         connectionProfiles: connectionsData,
-        host
+        host,
+        state
       });
       if (profiles.length == 1) {
         delete connectionsData[profiles[0].tenant];
         fs.writeFileSync(filename, JSON.stringify(connectionsData, null, 2));
-        printMessage(`Deleted connection profile ${profiles[0].tenant}`);
+        printMessage({
+          message: `Deleted connection profile ${profiles[0].tenant}`,
+          state
+        });
       } else {
         if (profiles.length > 1) {
-          printMessage(`Multiple matching profiles found.`, 'error');
+          printMessage({
+            message: `Multiple matching profiles found.`,
+            type: 'error',
+            state
+          });
           profiles.forEach(p => {
-            printMessage(`- ${p.tenant}`, 'error');
+            printMessage({
+              message: `- ${p.tenant}`,
+              type: 'error',
+              state
+            });
+          });
+          printMessage({
+            message: `Please specify a unique sub-string`,
+            type: 'error',
+            state
           });
-          printMessage(`Please specify a unique sub-string`, 'error');
           return null;
         } else {
-          printMessage(`No connection profile ${host} found`);
+          printMessage({
+            message: `No connection profile ${host} found`,
+            state
+          });
         }
       }
     } else if (err.code === 'ENOENT') {
-      printMessage(`Connection profile file ${filename} not found`);
+      printMessage({
+        message: `Connection profile file ${filename} not found`,
+        state
+      });
     } else {
-      printMessage(`Error in deleting connection profile: ${err.code}`, 'error');
+      printMessage({
+        message: `Error in deleting connection profile: ${err.code}`,
+        type: 'error',
+        state
+      });
     }
   });
 }
@@ -447,9 +558,15 @@ export function deleteConnectionProfile({
 export async function addNewServiceAccount({
   state
 }) {
-  debugMessage(`ConnectionProfileOps.addNewServiceAccount: start`);
+  debugMessage({
+    message: `ConnectionProfileOps.addNewServiceAccount: start`,
+    state
+  });
   const name = `Frodo-SA-${new Date().getTime()}`;
-  debugMessage(`ConnectionProfileOps.addNewServiceAccount: name=${name}...`);
+  debugMessage({
+    message: `ConnectionProfileOps.addNewServiceAccount: name=${name}...`,
+    state
+  });
   const description = `${state.getUsername()}'s Frodo Service Account`;
   const scope = ['fr:am:*', 'fr:idm:*', 'fr:idc:esv:*'];
   const jwkPrivate = await createJwkRsa();
@@ -463,10 +580,16 @@ export async function addNewServiceAccount({
     jwks,
     state
   });
-  debugMessage(`ConnectionProfileOps.addNewServiceAccount: id=${sa._id}`);
+  debugMessage({
+    message: `ConnectionProfileOps.addNewServiceAccount: id=${sa._id}`,
+    state
+  });
   state.setServiceAccountId(sa._id);
   state.setServiceAccountJwk(jwkPrivate);
-  debugMessage(`ConnectionProfileOps.addNewServiceAccount: end`);
+  debugMessage({
+    message: `ConnectionProfileOps.addNewServiceAccount: end`,
+    state
+  });
   return sa;
 }
 //# sourceMappingURL=ConnectionProfileOps.js.map

package/esm/ops/EmailTemplateOps.mjs

@@ -4,6 +4,11 @@ export default class EmailTemplateOps {
     this.state = state;
   }
 
+  /**
+   * Email template type key used to build the IDM id: 'emailTemplate/<id>'
+   */
+  EMAIL_TEMPLATE_TYPE = EMAIL_TEMPLATE_TYPE;
+
   /**
    * Get all email templates
    * @returns {Promise} a promise that resolves to an array of email template objects

package/esm/ops/IdpOps.mjs

@@ -168,7 +168,10 @@ export async function putProviderByTypeAndId({
   providerData,
   state
 }) {
-  debugMessage(`IdpOps.putProviderByTypeAndId: start`);
+  debugMessage({
+    message: `IdpOps.putProviderByTypeAndId: start`,
+    state
+  });
   try {
     const response = await _putProviderByTypeAndId({
       type: providerType,
@@ -176,7 +179,10 @@ export async function putProviderByTypeAndId({
       providerData,
       state
     });
-    debugMessage(`IdpOps.putProviderByTypeAndId: end`);
+    debugMessage({
+      message: `IdpOps.putProviderByTypeAndId: end`,
+      state
+    });
     return response;
   } catch (importError) {
     var _importError$response, _importError$response2, _importError$response3;
@@ -187,18 +193,31 @@ export async function putProviderByTypeAndId({
       validAttributes.push('_id', '_type');
       for (const attribute of Object.keys(providerData)) {
         if (!validAttributes.includes(attribute)) {
-          if (state.getVerbose()) printMessage(`\nRemoving invalid attribute: ${attribute}`, 'warn', false);
+          if (state.getVerbose()) printMessage({
+            message: `\nRemoving invalid attribute: ${attribute}`,
+            type: 'warn',
+            newline: false,
+            state
+          });
           delete providerData[attribute];
         }
       }
-      if (state.getVerbose()) printMessage('\n', 'warn', false);
+      if (state.getVerbose()) printMessage({
+        message: '\n',
+        type: 'warn',
+        newline: false,
+        state
+      });
       const response = await _putProviderByTypeAndId({
         type: providerType,
         id: providerId,
         providerData,
         state
       });
-      debugMessage(`IdpOps.putProviderByTypeAndId: end (after retry)`);
+      debugMessage({
+        message: `IdpOps.putProviderByTypeAndId: end (after retry)`,
+        state
+      });
       return response;
     } else {
       // re-throw unhandleable error
@@ -243,7 +262,10 @@ export async function exportSocialProvider({
   providerId,
   state
 }) {
-  debugMessage(`IdpOps.exportSocialProvider: start`);
+  debugMessage({
+    message: `IdpOps.exportSocialProvider: start`,
+    state
+  });
   const idpData = await getSocialProvider({
     providerId,
     state
@@ -260,7 +282,10 @@ export async function exportSocialProvider({
     scriptData.script = convertBase64TextToArray(scriptData.script);
     exportData.script[idpData.transform] = scriptData;
   }
-  debugMessage(`IdpOps.exportSocialProvider: end`);
+  debugMessage({
+    message: `IdpOps.exportSocialProvider: end`,
+    state
+  });
   return exportData;
 }
 
@@ -277,9 +302,16 @@ export async function exportSocialProviders({
   const allIdpsData = await getSocialIdentityProviders({
     state
   });
-  createProgressIndicator(allIdpsData.length, 'Exporting providers');
+  createProgressIndicator({
+    total: allIdpsData.length,
+    message: 'Exporting providers',
+    state
+  });
   for (const idpData of allIdpsData) {
-    updateProgressIndicator(`Exporting provider ${idpData._id}`);
+    updateProgressIndicator({
+      message: `Exporting provider ${idpData._id}`,
+      state
+    });
     exportData.idp[idpData._id] = idpData;
     if (idpData.transform) {
       const scriptData = await getScript({
@@ -290,7 +322,10 @@ export async function exportSocialProviders({
       exportData.script[idpData.transform] = scriptData;
     }
   }
-  stopProgressIndicator(`${allIdpsData.length} providers exported.`);
+  stopProgressIndicator({
+    message: `${allIdpsData.length} providers exported.`,
+    state
+  });
   return exportData;
 }
 
@@ -389,8 +424,16 @@ export async function importSocialProviders({
       });
     } catch (error) {
       var _error$response;
-      printMessage(((_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data) || error, 'error');
-      printMessage(`\nError importing provider ${idpId}`, 'error');
+      printMessage({
+        message: ((_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data) || error,
+        type: 'error',
+        state
+      });
+      printMessage({
+        message: `\nError importing provider ${idpId}`,
+        type: 'error',
+        state
+      });
       outcome = false;
     }
   }