contensis-cli 1.0.12-beta.8 → 1.1.0

package/dist/services/ContensisCliService.js

@@ -56,14 +56,14 @@ class ContensisCli {
     const exitCode = error ? 1 : 0;
     process.exit(exitCode);
   };
-  command;
   format;
   output;
   session;
+  auth;
+  command;
   contensis;
   contensisOpts;
   currentProject;
-  devinit;
   sourceAlias;
   targetEnv;
   urls;
@@ -72,9 +72,6 @@ class ContensisCli {
   verb;
   noun;
   thirdArg;
-  get invokedBy() {
-    return this.command.createdUserId;
-  }
   get cache() {
     return this.session.Get();
   }
@@ -123,7 +120,12 @@ class ContensisCli {
     if (outputOpts == null ? void 0 : outputOpts.clientId)
       env.lastUserId = outputOpts.clientId;
     if (outputOpts == null ? void 0 : outputOpts.sharedSecret)
-      env.passwordFallback = outputOpts.sharedSecret;
+      if (outputOpts.sharedSecret.startsWith("-"))
+        throw new Error(
+          `Shared secret option provided a value of ${outputOpts.sharedSecret}`
+        );
+      else
+        env.passwordFallback = outputOpts.sharedSecret;
     this.currentProject = (env == null ? void 0 : env.currentProject) || "null";
     this.sourceAlias = (outputOpts == null ? void 0 : outputOpts.sourceAlias) || currentEnvironment;
     if (currentEnvironment) {
@@ -131,8 +133,9 @@ class ContensisCli {
     }
     this.command = {
       commandText,
+      options: outputOpts,
       createdDate: new Date().toISOString(),
-      createdUserId: env == null ? void 0 : env.lastUserId
+      invokedBy: env == null ? void 0 : env.lastUserId
     };
     if (currentEnvironment) {
       env.history = [this.command];
@@ -324,7 +327,10 @@ class ContensisCli {
         password
       ).Init();
       if (credentialError && !credentials.current) {
-        log.error(credentialError);
+        log.error(
+          `Unable to find credentials for user ${userId} at ${currentEnv}`,
+          credentialError
+        );
         return;
       }
       if (credentials.remarks.secure !== true) {
@@ -371,7 +377,7 @@ class ContensisCli {
             ]));
           }
           if (inputPassword || cachedPassword || cachedSecret) {
-            const authService = new import_ContensisAuthService.default({
+            this.auth = new import_ContensisAuthService.default({
               username: userId,
               password: inputPassword || cachedPassword,
               projectId: (env == null ? void 0 : env.currentProject) || "website",
@@ -379,9 +385,7 @@ class ContensisCli {
               clientId: userId,
               clientSecret: sharedSecret || cachedSecret
             });
-            const [authError, bearerToken] = await (0, import_await_to_js.default)(
-              authService.BearerToken()
-            );
+            const [authError, bearerToken] = await (0, import_await_to_js.default)(this.auth.BearerToken());
             if (bearerToken) {
               env.authToken = bearerToken;
               env.lastUserId = userId;
@@ -1947,29 +1951,31 @@ Components:`));
     }
   };
   HandleFormattingAndOutput = (obj, logFn) => {
+    var _a, _b;
     const { format, log, messages, output } = this;
+    const fields = (_b = (_a = this.contensis) == null ? void 0 : _a.payload.query) == null ? void 0 : _b.fields;
     if (!format) {
       logFn(obj);
     } else if (format === "csv") {
       log.raw("");
-      log.raw(log.infoText((0, import_csv.csvFormatter)(obj)));
+      log.raw(log.infoText((0, import_csv.csvFormatter)((0, import_json.limitFields)(obj, fields))));
     } else if (format === "xml") {
       log.raw("");
-      log.raw(log.infoText((0, import_xml.xmlFormatter)(obj)));
+      log.raw(log.infoText((0, import_xml.xmlFormatter)((0, import_json.limitFields)(obj, fields))));
     } else if (format === "json") {
       log.raw("");
-      log.raw(log.infoText((0, import_json.jsonFormatter)(obj)));
+      log.raw(log.infoText((0, import_json.jsonFormatter)(obj, fields)));
     }
     log.raw("");
     if (output) {
       let writeString = "";
       const isText = !(0, import_util.tryParse)(obj) && typeof obj === "string";
       if (format === "csv") {
-        writeString = (0, import_csv.csvFormatter)(obj);
+        writeString = (0, import_csv.csvFormatter)((0, import_json.limitFields)(obj, fields));
       } else if (format === "xml") {
-        writeString = (0, import_xml.xmlFormatter)(obj);
+        writeString = (0, import_xml.xmlFormatter)((0, import_json.limitFields)(obj, fields));
       } else
-        writeString = isText ? obj : (0, import_json.jsonFormatter)(obj);
+        writeString = isText ? obj : (0, import_json.jsonFormatter)(obj, fields);
       if (writeString) {
         import_fs.default.writeFileSync(output, writeString);
         log.success(messages.app.fileOutput(isText ? "text" : format, output));