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

package/dist/services/ContensisCliService.js

@@ -574,12 +574,17 @@ class ContensisCli {
       if (key) {
         log.success(messages.keys.created(currentEnv, name));
         console.log(
-          `  - ${key.name}${key.description ? ` (${key.description})` : ""} [${key.dateModified.toString().substring(0, 10)} ${key.modifiedBy}]`
+          `  - ${import_chalk.default.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(`    ${import_chalk.default.bold.grey`id`}: ${key.id}`);
+        console.log(
+          `    ${import_chalk.default.bold.grey`sharedSecret`}: ${key.sharedSecret}`
+        );
+        console.log("");
+        log.help(messages.keys.tip());
       }
-      console.log("");
       if (err) {
         log.error(messages.keys.failedCreate(currentEnv, name), err);
       }
@@ -605,6 +610,8 @@ class ContensisCli {
       const [rolesErr, roles] = await (0, import_await_to_js.default)(contensis.roles.GetRoles());
       if (Array.isArray(roles)) {
         log.success(messages.roles.list(currentEnv));
+        if (!roles.length)
+          log.help(messages.roles.noneExist());
         this.HandleFormattingAndOutput(roles, () => {
           var _a, _b, _c, _d, _e;
           for (const {
@@ -616,9 +623,11 @@ class ContensisCli {
             permissions
           } of roles) {
             const color = enabled ? (s) => s : log.infoText;
-            console.log(color(`  - ${name} ${log.infoText(id)}`));
+            console.log(color(`  - ${import_chalk.default.bold(name)} ${log.infoText(id)}`));
             if (description)
               console.log(log.infoText(`    ${description}`));
+            if (enabled === false)
+              console.log(`      ${import_chalk.default.bold.grey("enabled")}: false`);
             if ((_a = assignments.groups) == null ? void 0 : _a.length)
               console.log(
                 `      ${import_chalk.default.bold.grey("groups")}: ${assignments.groups.join(
@@ -688,6 +697,27 @@ class ContensisCli {
       }
     }
   };
+  CreateRole = async (role) => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [err, created] = await contensis.roles.CreateRole(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, role) => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();
@@ -699,11 +729,48 @@ class ContensisCli {
           (r) => r.id === roleNameOrId || r.name.toLowerCase() === roleNameOrId.toLowerCase()
         );
         if (existingRole) {
-          const rolesService = contensis.roles.sourceRepo.roles;
-          await rolesService.UpdateRole(existingRole.id, role);
+          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 {
+          log.error(messages.roles.failedGet(currentEnv, roleNameOrId));
+        }
+      }
+      if (rolesErr) {
+        log.error(messages.roles.noList(currentEnv));
+        log.error((0, import_json.jsonFormatter)(rolesErr));
+      }
+    }
+  };
+  RemoveRole = async (roleNameOrId) => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [rolesErr, roles] = await (0, import_await_to_js.default)(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);
+          if (deleteErr)
+            log.error(messages.roles.failedRemove(currentEnv, roleNameOrId));
+          else
+            log.success(messages.roles.removed(currentEnv, roleNameOrId));
+        } else {
+          log.error(messages.roles.failedGet(currentEnv, roleNameOrId));
         }
-        this.HandleFormattingAndOutput(role, log.object);
       }
       if (rolesErr) {
         log.error(messages.roles.noList(currentEnv));
@@ -1246,36 +1313,74 @@ Components:`));
       log.help(messages.connect.tip());
     }
   };
-  PrintWebhookSubscriptions = async (subscriptionIds, name) => {
+  PrintWebhookSubscriptions = async (subscriptionIdsOrNames) => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();
     if (contensis) {
       const [webhooksErr, webhooks] = await contensis.subscriptions.webhooks.GetSubscriptions();
-      const filteredResults = typeof name === "string" ? webhooks == null ? void 0 : webhooks.filter(
-        (w) => {
-          var _a;
-          return (_a = w.name) == null ? void 0 : _a.toLowerCase().includes(name.toLowerCase());
-        }
-      ) : Array.isArray(subscriptionIds) ? webhooks == null ? void 0 : webhooks.filter((w) => subscriptionIds == null ? void 0 : subscriptionIds.some((id) => id === w.id)) : webhooks;
-      if (Array.isArray(filteredResults)) {
-        this.HandleFormattingAndOutput(filteredResults, () => {
-          log.success(messages.webhooks.list(currentEnv));
-          for (const {
-            id,
-            description,
-            method,
-            name: name2,
-            version,
-            url: url2
-          } of filteredResults) {
-            console.log(
-              `  - ${name2}${description ? ` (${description})` : ""} [${version.modified.toString().substring(0, 10)} ${version.modifiedBy}]`
-            );
-            console.log(`      ${id}`);
-            console.log(`      [${method}] ${url2}`);
+      const filteredResults = (subscriptionIdsOrNames == null ? void 0 : subscriptionIdsOrNames.length) ? webhooks == null ? void 0 : webhooks.filter(
+        (w) => (subscriptionIdsOrNames == null ? void 0 : subscriptionIdsOrNames.some(
+          (idname) => {
+            var _a;
+            return (_a = w.name) == null ? void 0 : _a.toLowerCase().includes(idname.toLowerCase());
           }
-          console.log("");
-        });
+        )) || (subscriptionIdsOrNames == null ? void 0 : subscriptionIdsOrNames.some(
+          (id) => id.toLowerCase() === w.id.toLowerCase()
+        ))
+      ) : webhooks;
+      if (Array.isArray(filteredResults)) {
+        log.success(messages.webhooks.list(currentEnv));
+        if (!(webhooks == null ? void 0 : webhooks.length))
+          log.warning(messages.webhooks.noneExist());
+        else {
+          this.HandleFormattingAndOutput(filteredResults, () => {
+            for (const {
+              id,
+              description,
+              method,
+              name,
+              version,
+              url: url2,
+              enabled,
+              topics,
+              templates,
+              headers
+            } of filteredResults) {
+              console.log(
+                log.infoText(
+                  `  ${import_chalk.default.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}]`} ${url2}`);
+              if (headers && Object.keys(headers).length) {
+                console.log(`    ${log.infoText`headers`}:`);
+                for (const [key, { value, secret }] of Object.entries(headers))
+                  console.log(
+                    `      ${import_chalk.default.bold.gray(key)}: ${secret ? "\u{1F910}" : value}`
+                  );
+              }
+              if (topics == null ? void 0 : topics.length)
+                if ((topics == null ? void 0 : 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) {
         log.error(messages.webhooks.noList(currentEnv));