@squiz/dxp-cli-next 5.2.0 → 5.3.0-develop.2

package/lib/auth/login.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_color_1 = require("cli-color");
+const cli_color_1 = __importDefault(require("cli-color"));
 const commander_1 = require("commander");
 const ApiService_1 = require("../ApiService");
 const ApplicationStore_1 = require("../ApplicationStore");
@@ -30,16 +30,29 @@ const loginCommand = new commander_1.Command('login')
     .addOption(new commander_1.Option('--tenant <tenantID>'))
     .configureOutput({
     outputError(str, write) {
-        write((0, cli_color_1.red)(str));
+        write(cli_color_1.default.red(str));
     },
 })
     .action((options) => __awaiter(void 0, void 0, void 0, function* () {
-    const credentials = yield getLoginCredentials(options.username, options.password);
-    if (credentials == false) {
-        console.log(''); // needed to not screw up line endings in terminal
-        return;
+    try {
+        const credentials = yield getLoginCredentials(options.username, options.password);
+        if (credentials == false) {
+            console.log(''); // needed to not screw up line endings in terminal
+            return;
+        }
+        return yield handleLoginRequest(credentials, options);
+    }
+    catch (error) {
+        if (!!process.env.DEBUG && error.stack) {
+            loginCommand.error(error.stack);
+        }
+        if (error.message) {
+            loginCommand.error(cli_color_1.default.red(error.message));
+        }
+        else {
+            loginCommand.error(cli_color_1.default.red('An unknown error occurred'));
+        }
     }
-    return handleLoginRequest(credentials, options);
 }));
 exports.default = loginCommand;
 function getLoginCredentials(optionalUsername, optionalPassword) {
@@ -108,10 +121,8 @@ function handleLoginRequest(login, options) {
                     region: options.region,
                 }));
                 return;
-            case 400:
-                loginCommand.error(loginResponse.data.message);
             default:
-                loginCommand.error('An error occurred during login');
+                throw new Error(`An error occurred during login ${loginResponse.data.message ? `"${loginResponse.data.message}"` : ''} (code: ${loginResponse.status})`.trim());
         }
     });
 }

package/lib/cmp/deploy.js

@@ -42,19 +42,22 @@ const deployCommand = new commander_1.Command()
         return yield (0, component_cli_lib_1.uploadComponentFolder)(apiService.client, componentServiceUrl, source);
     }
     catch (error) {
-        // console.error(error);
+        if (!!process.env.DEBUG && error.stack) {
+            deployCommand.error(error.stack);
+        }
         if (error instanceof ApiService_1.InvalidLoginSessionError) {
             deployCommand.error(cli_color_1.default.red('Login session expired. Please login again.'));
+            return;
         }
         if (error instanceof ApiService_1.InvalidTenantError) {
             deployCommand.error(cli_color_1.default.red('Cannot deploy to specified tenant'));
+            return;
         }
         if (error.message) {
             deployCommand.error(cli_color_1.default.red(error.message));
         }
         else {
-            console.error(error);
-            deployCommand.error('An unknown error occurred');
+            deployCommand.error(cli_color_1.default.red('An unknown error occurred'));
         }
     }
 }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "5.2.0",
+  "version": "5.3.0-develop.2",
   "repository": {
     "url": "https://gitlab.squiz.net/developer-experience/dxp-cli-next"
   },
@@ -39,7 +39,7 @@
     "codecov"
   ],
   "dependencies": {
-    "@squiz/component-cli-lib": "1.3.3",
+    "@squiz/component-cli-lib": "1.6.1-alpha.3",
     "axios": "1.1.3",
     "cli-color": "2.0.3",
     "commander": "9.4.0",