contensis-cli 1.0.0-beta.63 → 1.0.0-beta.65

package/src/services/ContensisCliService.ts

@@ -754,14 +754,19 @@ class ContensisCli {
 
         // print the key details to console
         console.log(
-          `  - ${key.name}${
-            key.description ? ` (${key.description})` : ''
-          } [${key.dateModified.toString().substring(0, 10)} ${key.modifiedBy}]`
+          `  - ${chalk.bold(key.name)} [${key.dateModified
+            .toString()
+            .substring(0, 10)} ${key.modifiedBy}]`
         );
-        console.log(`  - id: ${key.id}`);
-        console.log(`  - sharedSecret: ${key.sharedSecret}`);
+        if (key.description)
+          console.log(`    ${log.infoText(key.description)}`);
+        console.log(`    ${chalk.bold.grey`id`}: ${key.id}`);
+        console.log(
+          `    ${chalk.bold.grey`sharedSecret`}: ${key.sharedSecret}`
+        );
+        console.log('');
+        log.help(messages.keys.tip());
       }
-      console.log('');
 
       if (err) {
         log.error(messages.keys.failedCreate(currentEnv, name), err);
@@ -795,6 +800,9 @@ class ContensisCli {
 
       if (Array.isArray(roles)) {
         log.success(messages.roles.list(currentEnv));
+
+        if (!roles.length) log.help(messages.roles.noneExist());
+
         this.HandleFormattingAndOutput(roles, () => {
           // print the roles to console
           for (const {
@@ -807,9 +815,10 @@ class ContensisCli {
           } of roles) {
             const color = enabled ? (s: string) => s : log.infoText;
 
-            console.log(color(`  - ${name} ${log.infoText(id)}`));
+            console.log(color(`  - ${chalk.bold(name)} ${log.infoText(id)}`));
             if (description) console.log(log.infoText(`    ${description}`));
-
+            if (enabled === false)
+              console.log(`      ${chalk.bold.grey('enabled')}: false`);
             if (assignments.groups?.length)
               console.log(
                 `      ${chalk.bold.grey('groups')}: ${assignments.groups.join(
@@ -896,6 +905,33 @@ class ContensisCli {
     }
   };
 
+  CreateRole = async (role: Partial<Role>) => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+
+    if (contensis) {
+      const [err, created] = await contensis.roles.CreateRole(role as Role);
+
+      if (created) {
+        log.success(
+          messages.roles.created(currentEnv, role.id || role.name || '')
+        );
+
+        this.HandleFormattingAndOutput(created, log.object);
+
+        log.help(messages.roles.tip());
+        return role.id;
+      }
+
+      if (err) {
+        log.error(
+          messages.roles.failedCreate(currentEnv, role.id || role.name || ''),
+          err
+        );
+      }
+    }
+  };
+
   UpdateRole = async (roleNameOrId: string, role: Partial<Role>) => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();
@@ -913,13 +949,59 @@ class ContensisCli {
             r.name.toLowerCase() === roleNameOrId.toLowerCase()
         );
         if (existingRole) {
-          const rolesService = contensis.roles.sourceRepo.roles;
+          log.info(messages.roles.setPayload());
+          log.object(role);
+          log.raw(``);
+          const [updateErr, updated] = await contensis.roles.UpdateRole(
+            existingRole.id,
+            role
+          );
+          if (updateErr)
+            log.error(messages.roles.failedSet(currentEnv, roleNameOrId));
+          else {
+            log.success(messages.roles.set());
+
+            this.HandleFormattingAndOutput(updated, log.object);
+          }
+        } else {
+          // Role does not exist
+          log.error(messages.roles.failedGet(currentEnv, roleNameOrId));
+        }
+      }
+
+      if (rolesErr) {
+        log.error(messages.roles.noList(currentEnv));
+        log.error(jsonFormatter(rolesErr));
+      }
+    }
+  };
+
+  RemoveRole = async (roleNameOrId: string) => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+
+    if (contensis) {
+      // Retrieve roles list for env
+      const [rolesErr, roles] = await to(contensis.roles.GetRoles());
+
+      if (Array.isArray(roles)) {
+        log.success(messages.roles.list(currentEnv));
+
+        const existingRole = roles.find(
+          r =>
+            r.id === roleNameOrId ||
+            r.name.toLowerCase() === roleNameOrId.toLowerCase()
+        );
+        if (existingRole) {
+          const [deleteErr] = await contensis.roles.RemoveRole(existingRole.id);
 
-          await rolesService.UpdateRole(existingRole.id, role);
+          if (deleteErr)
+            log.error(messages.roles.failedRemove(currentEnv, roleNameOrId));
+          else log.success(messages.roles.removed(currentEnv, roleNameOrId));
         } else {
-          //Role not exist
+          // Role does not exist
+          log.error(messages.roles.failedGet(currentEnv, roleNameOrId));
         }
-        this.HandleFormattingAndOutput(role, log.object);
       }
 
       if (rolesErr) {
@@ -1589,10 +1671,7 @@ class ContensisCli {
     }
   };
 
-  PrintWebhookSubscriptions = async (
-    subscriptionIds?: string[],
-    name?: string
-  ) => {
+  PrintWebhookSubscriptions = async (subscriptionIdsOrNames?: string[]) => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();
     if (contensis) {
@@ -1600,39 +1679,83 @@ class ContensisCli {
       const [webhooksErr, webhooks] =
         await contensis.subscriptions.webhooks.GetSubscriptions();
 
-      const filteredResults =
-        typeof name === 'string'
-          ? webhooks?.filter(w =>
-              w.name?.toLowerCase().includes(name.toLowerCase())
-            )
-          : Array.isArray(subscriptionIds)
-          ? webhooks?.filter(w => subscriptionIds?.some(id => id === w.id))
-          : webhooks;
+      const filteredResults = subscriptionIdsOrNames?.length
+        ? webhooks?.filter(
+            w =>
+              subscriptionIdsOrNames?.some(idname =>
+                w.name?.toLowerCase().includes(idname.toLowerCase())
+              ) ||
+              subscriptionIdsOrNames?.some(
+                id => id.toLowerCase() === w.id.toLowerCase()
+              )
+          )
+        : webhooks;
 
       if (Array.isArray(filteredResults)) {
-        this.HandleFormattingAndOutput(filteredResults, () => {
-          // print the keys to console
-          log.success(messages.webhooks.list(currentEnv));
-          for (const {
-            id,
-            description,
-            method,
-            name,
-            version,
-            url,
-          } of filteredResults) {
-            console.log(
-              `  - ${name}${
-                description ? ` (${description})` : ''
-              } [${version.modified.toString().substring(0, 10)} ${
-                version.modifiedBy
-              }]`
-            );
-            console.log(`      ${id}`);
-            console.log(`      [${method}] ${url}`);
-          }
-          console.log('');
-        });
+        log.success(messages.webhooks.list(currentEnv));
+        if (!webhooks?.length) log.warning(messages.webhooks.noneExist());
+        else {
+          this.HandleFormattingAndOutput(filteredResults, () => {
+            // print the keys to console
+            for (const {
+              id,
+              description,
+              method,
+              name,
+              version,
+              url,
+              enabled,
+              topics,
+              templates,
+              headers,
+            } of filteredResults) {
+              console.log(
+                log.infoText(
+                  `  ${chalk.bold.white`- ${name}`} ${id} [${(
+                    version.modified || version.created
+                  )
+                    .toString()
+                    .substring(0, 10)} ${
+                    version.modifiedBy || version.createdBy
+                  }]`
+                )
+              );
+              if (description) console.log(log.infoText`    ${description}`);
+              console.log(`    ${log.infoText`[${method}]`} ${url}`);
+              if (headers && Object.keys(headers).length) {
+                console.log(`    ${log.infoText`headers`}:`);
+
+                for (const [key, { value, secret }] of Object.entries(headers))
+                  console.log(
+                    `      ${chalk.bold.gray(key)}: ${secret ? '🤐' : value}`
+                  );
+              }
+              if (topics?.length)
+                if (topics?.length === 1)
+                  console.log(
+                    `    ${log.infoText`topics`}: ${topics
+                      .map(t => JSON.stringify(t))
+                      .join(' ')
+                      .replaceAll('"', '')
+                      .replaceAll(',', ' ')
+                      .replaceAll('{', '')
+                      .replaceAll('}', '')}`
+                  );
+                else {
+                  console.log(`    ${log.infoText`topics`}:`);
+                  log.objectRecurse(topics, 1, '    ');
+                }
+              if (templates && Object.keys(templates).length)
+                console.log(
+                  `    ${log.infoText`templates`}: ${Object.keys(
+                    templates
+                  ).join(' ')}`
+                );
+              if (enabled === false)
+                console.log(`    ${log.infoText`enabled`}: ${enabled}`);
+            }
+          });
+        }
       }
 
       if (webhooksErr) {

package/src/shell.ts

@@ -135,6 +135,7 @@ class ContensisShell {
       availableCommands.push('login', 'list projects', 'set project');
     if (userId)
       availableCommands.push(
+        'create key',
         'create project',
         'create role',
         'diff models',
@@ -158,16 +159,19 @@ class ContensisShell {
         'list models',
         'list roles',
         'list webhooks',
-        'create key',
         'push block',
         'release block',
+        'remove components',
+        'remove contenttypes',
         'remove key',
         'remove entries',
-        'remove contenttypes',
-        'remove components',
+        'remove role',
         'set project name',
         'set project description',
+        'set role name',
+        'set role description',
         'set role assignments',
+        'set role enabled',
         'set role permissions'
       );
 

package/src/util/index.ts

@@ -27,6 +27,9 @@ export const tryStringify = (obj: any) => {
   }
 };
 
+export const isSysError = (error: any): error is Error =>
+  error?.message !== undefined && error.stack;
+
 export const isUuid = (str: string) => {
   // Regular expression to check if string is a valid UUID
   const regexExp =

package/src/util/logger.ts

@@ -2,8 +2,8 @@
 import chalk from 'chalk';
 import dateFormat from 'dateformat';
 import deepCleaner from 'deep-cleaner';
-import ProgressBar from 'progress';
-import { tryStringify } from '.';
+// import ProgressBar from 'progress';
+import { isSysError, tryStringify } from '.';
 
 type LogMethod = (content: string) => void;
 type LogErrorMethod = (content: string, err?: any, newline?: string) => void;
@@ -40,7 +40,11 @@ export class Logger {
   static error: LogErrorMethod = (content, err, newline = '\n') => {
     const message = `${Logger.getPrefix()} ${Logger.errorText(
       `${Logger.isUserTerminal ? '❌' : '[ERROR]'} ${content}${
-        err ? `\n\n${JSON.stringify(err, null, 2)}` : ''
+        err
+          ? `\n\n${
+              isSysError(err) ? err.toString() : JSON.stringify(err, null, 2)
+            }`
+          : ''
       }`
     )}${newline}`;
     if (progress.active) progress.current.interrupt(message);
@@ -178,14 +182,18 @@ export class Logger {
           else Logger.objectRecurse(item, depth + 1, `${indent}  `);
         } else Logger.raw(`${indent}${item}`);
       }
-    } else
+    } else {
+      let pos = 0;
       for (const [key, value] of Object.entries(content)) {
+        const thisIndent =
+          pos === 0 ? `${indent.substring(0, indent.length - 2)}- ` : indent;
         if (Array.isArray(value)) {
+          if (value.length) Logger.raw(`${thisIndent}${chalk.bold.grey(key)}:`);
           for (const item of value) {
             if (item && typeof item === 'object') {
               if (Array.isArray(item) && depth > 3)
                 Logger.raw(chalk.grey(`${indent}  [${item.join(', ')}]`));
-              else Logger.objectRecurse(item, depth + 1, `${indent}`);
+              else Logger.objectRecurse(item, depth + 1, `${indent}  `);
             } else {
               Logger.raw(`${indent}  ${item}`);
             }
@@ -196,9 +204,11 @@ export class Logger {
           Logger.objectRecurse(value, depth + 1, `${indent}  `);
           // console.table(value);
         } else if (typeof value !== 'undefined' && value !== null) {
-          Logger.raw(`${indent}${chalk.bold.grey(key)}: ${value}`);
+          Logger.raw(`${thisIndent}${chalk.bold.grey(key)}: ${value}`);
         }
+        pos++;
       }
+    }
   };
   static raw: LogMethod = (content: string) => {
     if (progress.active) progress.current.interrupt(content);
@@ -222,13 +232,14 @@ export const logError: LogErrorFunc = (
 };
 
 export const progress = {
+  current: { interrupt: (x: string) => {} },
   active: false,
-  done: () => new ProgressBar('', 0),
-  colours: { green: '\u001b[42m \u001b[0m', red: '\u001b[41m \u001b[0m' },
-  current: new ProgressBar(`:bar`, {
-    complete: '=',
-    incomplete: ' ',
-    width: 20,
-    total: 100,
-  }),
+  // done: () => new ProgressBar('', 0),
+  // colours: { green: '\u001b[42m \u001b[0m', red: '\u001b[41m \u001b[0m' },
+  // current: new ProgressBar(`:bar`, {
+  //   complete: '=',
+  //   incomplete: ' ',
+  //   width: 20,
+  //   total: 100,
+  // }),
 };

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.0.0-beta.63";
+export const LIB_VERSION = "1.0.0-beta.65";