zcatalyst-cli 1.7.1 → 1.9.1

package/docs/option-filter.toml

@@ -0,0 +1,45 @@
+[OPT-FILTER-1]
+context = '''The ${arg[0]} option cannot contain duplicate targets.'''
+aid = '''Please remove the duplicate target from the option input. \n${arg[1]}'''
+link = ''
+
+[OPT-FILTER-2]
+context = '''Invalid target ${arg[0]} provided with the option ${arg[1]}.'''
+aid = '''Please provide a valid target, The valid targets are: \n${arg[2]}'''
+link = ''
+
+[OPT-FILTER-3]
+context = '''The target ${arg[0]} is specified with and without a filter for the ${arg[1]} option.'''
+aid = '''Please use the targets either with a filter or without a filter and not both together. \n${arg[2]}'''
+link = '' 
+
+[OPT-FILTER-4]
+context = '''Cannot specify both the ${arg[0]} option and the ${arg[1]} option in the same command.'''
+aid = '''Use only one of the above options at a time to select you targets.'''
+link = ''
+
+[OPT-FILTER-5]
+context = '''The target Client cannot be debugged.'''
+aid = '''Please remove the target Client from the --debug option and execute the command.'''
+link = ''
+
+[OPT-FILTER-6]
+context = '''The input for the ${arg[0]} option is in an invalid format: ${arg[1]}'''
+aid = '''Please use only these valid formats to specify the targets: \n${arg[2]}\n${arg[3]}'''
+link = ''
+
+[OPT-FILTER-7]
+context = '''The input of the ${arg[0]} option for target ${arg[1]} is in an invalid format: ${arg[2]}'''
+aid = '''Please use only the ${arg[3]} format, to specify your ${arg[1]} targets with the ${arg[0]} option.
+example: --debug advancedio:aio_fn:8001'''
+link = ''
+
+[OPT-FILTER-8]
+context = '''Could not understand the targets.'''
+aid = '''Please ensure that ${arg[0]}'''
+link = ''
+
+[OPT-FILTER-9]
+context = '''The API Gateway cannot be served seperately in local.'''
+aid = '''Please include atleast one other component like functions or client along with the APIG to serve the APIG in local.'''
+link = ''

package/docs/port-resolver.toml

@@ -0,0 +1,9 @@
+[PORT-RESOLVER-1]
+context = '''The port ${arg[0]} requested for the ${arg[1]} of ${arg[2]}(${arg[3]}) is not available.'''
+aid = '''Please provide a different port with the ${arg[4]} option.'''
+
+
+[PORT-RESOLVER-2]
+context = '''No ports in the range ${arg[0]} to ${arg[1]} is free.'''
+aid = '''Please specify a port out of the above range with the ${arg[2]} option.'''
+link = 'https://www.zoho.com/catalyst/help/cli-serve.html#Options'

package/docs/pull/index.toml

@@ -0,0 +1,4 @@
+[PULL-1]
+context = '''The value ${arg[0]} supplied with the command is not a valid Catalyst feature.'''
+aid = '''The valid features are: \n${arg[1]}'''
+link = 'https://www.zoho.com/catalyst/help/cli-pull.html#Pull_Directly'

package/docs/serve/index.toml

@@ -0,0 +1,4 @@
+[SERVE-1]
+context = '''No valid components to serve!'''
+aid = '''Please rectify the above errors, if any and try once again.'''
+link = 'https://www.zoho.com/catalyst/help/cli-serve.html'

package/docs/shell/index.toml

@@ -0,0 +1,4 @@
+[SHELL-IDX-1]
+context = '''No valid functions to Serve!'''
+aid = '''Please rectify the above errors, if any and try once again.'''
+link = 'https://www.zoho.com/catalyst/help/cli-functions.html#Shell'

package/docs/util_modules/project.toml

@@ -0,0 +1,9 @@
+[PROJ-1]
+context = '''The "${arg[0]}" file is missing in the project root directory.'''
+aid = '''Please initialize the project using the ${arg[1]} command.'''
+link = 'https://www.zoho.com/catalyst/help/cli-init.html'
+
+[PROJ-2]
+context = '''Unable to get the ${arg[0]}'''
+aid = '''Please initialize the project using the ${arg[1]} command'''
+link = 'https://www.zoho.com/catalyst/help/cli-init.html'

package/lib/apig-utils.js

@@ -40,17 +40,24 @@ const project_1 = require("./util_modules/project");
 exports.apigUtils = {
     validate: () => __awaiter(void 0, void 0, void 0, function* () {
         const ruleFile = project_1.resolveProjectPath(config_1.apigConfig.rules());
-        const sourceFileExists = yield fs_1.ASYNC.fileExists(ruleFile);
-        if (!sourceFileExists) {
-            throw new error_1.default(ansi_colors_1.bold('"' + ruleFile + '"') +
-                ' file was not found. Please create it or specify a different name in ' +
-                constants_1.FILENAME.config, { exit: 1 });
-        }
-        const ruleArrayContent = yield fs_1.ASYNC.readFile(ruleFile);
-        if (ruleArrayContent === undefined) {
-            throw new error_1.default('Unable to read api gateway rules', { exit: 1 });
+        const ruleArr = (yield fs_1.ASYNC.readJSONFile(ruleFile, {
+            checkpath: true,
+            throws: true
+        }).catch((err) => {
+            throw new error_1.default('Unable to read ' + ruleFile + ' file.', {
+                exit: 1,
+                errorId: 'APIG-UTILS-1',
+                arg: [ansi_colors_1.bold(ruleFile), ansi_colors_1.italic.red(err)],
+                original: err
+            });
+        }));
+        if (ruleArr === undefined) {
+            throw new error_1.default(ruleFile + ' file not found' + constants_1.FILENAME.config, {
+                exit: 1,
+                errorId: 'APIG-UTILS-2',
+                arg: [ansi_colors_1.bold.red(ruleFile), ansi_colors_1.bold(constants_1.FILENAME.config)]
+            });
         }
-        const ruleArr = JSON.parse(ruleArrayContent);
         let localRuleArr = [];
         let redirectPath;
         try {
@@ -72,27 +79,47 @@ exports.apigUtils = {
         localRuleArr = ruleArr.map((rule, index) => {
             var _a, _b;
             if (rule.name === undefined || rule.name === null) {
-                throw new error_1.default(`Name for API Gateway rule is mandatory. Kindly add a valid rule to proceed`, { exit: 1 });
+                throw new error_1.default('Name for an APIG rule is missing', {
+                    exit: 1,
+                    errorId: 'APIG-UTILS-3',
+                    arg: [ansi_colors_1.italic.red(JSON.stringify(rule, null, '  '))]
+                });
             }
             if (namesArr.includes(rule.name)) {
-                throw new error_1.default(rule.name +
-                    ' is found to be duplicate in APIG rule config json. Kindly change the name and try again', { exit: 1 });
+                throw new error_1.default('Duplicate APIG rule detected', {
+                    exit: 1,
+                    errorId: 'APIG-UTILS-4',
+                    arg: [ansi_colors_1.bold.red(rule.name)]
+                });
             }
             namesArr.push(rule.name);
             if (rule.source_endpoint === undefined || rule.source_endpoint === null) {
-                throw new error_1.default(`Kindly add source_endpoint for ${rule.name} and try again`, { exit: 1 });
+                throw new error_1.default('source_endpoint missing for rule ' + rule.name, {
+                    exit: 1,
+                    errorId: 'APIG-UTILS-5',
+                    arg: [ansi_colors_1.bold.red(rule.name), ansi_colors_1.bold('source_endpoint')]
+                });
             }
             if (rule.method === undefined || rule.method === null) {
-                throw new error_1.default(`Kindly add method for ${rule.name} and try again`, {
-                    exit: 1
+                throw new error_1.default('method missing for rule ' + rule.name, {
+                    exit: 1,
+                    errorId: 'APIG-UTILS-5',
+                    arg: [ansi_colors_1.bold.red(rule.name), ansi_colors_1.bold('method')]
                 });
             }
             if (sourceUrlByConfig[rule.source_endpoint] !== undefined &&
                 sourceUrlByConfig[rule.source_endpoint][rule.method] !== undefined) {
-                throw new error_1.default(rule.name +
-                    ' is found to have duplicate "source_endpoint" as ' +
-                    sourceUrlByConfig[rule.source_endpoint][rule.method] +
-                    ' in APIG rule config json. Kindly change source and try again', { exit: 1 });
+                const duplicateRuleName = sourceUrlByConfig[rule.source_endpoint][rule.method] || '';
+                throw new error_1.default(rule.name + 'has duplicate "source_endpoint" as ' + duplicateRuleName, {
+                    exit: 1,
+                    errorId: 'APIG-UTILS-6',
+                    arg: [
+                        ansi_colors_1.bold(rule.name),
+                        ansi_colors_1.bold('source_endpoint'),
+                        ansi_colors_1.italic.red(rule.source_endpoint),
+                        ansi_colors_1.bold(duplicateRuleName)
+                    ]
+                });
             }
             if (sourceUrlByConfig[rule.source_endpoint] === undefined) {
                 sourceUrlByConfig[rule.source_endpoint] = {};
@@ -100,13 +127,12 @@ exports.apigUtils = {
             sourceUrlByConfig[rule.source_endpoint][rule.method] = rule.name;
             if (rule.name === 'Login Redirect') {
                 const homepage = runtime_store_1.default.get('context.client.homepage');
-                if (redirectPath === undefined) {
-                    if (homepage === undefined) {
-                        throw new error_1.default('Login Redirect rule cannot be verified since client package is not valid', { exit: 1 });
-                    }
-                    else {
-                        redirectPath = '/app/' + homepage;
-                    }
+                const clientValidity = runtime_store_1.default.get('context.client.valid', false);
+                if (!clientValidity || (redirectPath === undefined && homepage === undefined)) {
+                    throw new error_1.default('Login Redirect rule cannot be verified since client package is not valid', { exit: 1, errorId: 'APIG-UTILS-7', arg: [ansi_colors_1.bold(rule.name)] });
+                }
+                else if (!redirectPath) {
+                    redirectPath = '/app/' + homepage;
                 }
                 redirectIdx = index;
                 runtime_store_1.default.set('context.client.login_redirect', rule.source_endpoint);
@@ -126,7 +152,11 @@ exports.apigUtils = {
             }
             if (rule.target === 'client' || ((_b = rule.target_endpoint) === null || _b === void 0 ? void 0 : _b.startsWith('/app/'))) {
                 if (rule.authentication !== undefined && rule.authentication !== null) {
-                    throw new error_1.default('client target cannot have authentication, for rule name : ' + rule.name, { exit: 1 });
+                    throw new error_1.default('client target cannot have authentication, for rule name : ' + rule.name, {
+                        exit: 1,
+                        errorId: 'APIG-UTILS-8',
+                        arg: [ansi_colors_1.bold(rule.name), ansi_colors_1.italic.red('"authentication"')]
+                    });
                 }
             }
             const { created_by, created_time, modified_by, modified_time, api_id } = rule, remaining = __rest(rule, ["created_by", "created_time", "modified_by", "modified_time", "api_id"]);
@@ -164,22 +194,37 @@ exports.apigUtils = {
                 if (part.startsWith('{')) {
                     const regexParts = part.slice(1, -1).split(':');
                     try {
-                        new RegExp(regexParts[1]);
+                        rule.name, new RegExp(regexParts[1]);
                     }
                     catch (regexError) {
-                        throw new error_1.default('source url provided for apig rule "' +
+                        throw new error_1.default('source_endpoint provided for apig rule "' +
                             rule.name +
                             '" is not valid', {
                             exit: 1,
-                            original: regexError
+                            original: regexError,
+                            errorId: 'APIG-UTILS-9',
+                            arg: [
+                                ansi_colors_1.bold('source_endpoint'),
+                                ansi_colors_1.bold(rule.name),
+                                ansi_colors_1.italic(source_endpoint.replace(part, ansi_colors_1.red(part))),
+                                ansi_colors_1.bold('Error: ') + ansi_colors_1.italic.red(regexError)
+                            ]
                         });
                     }
                     if (regexParts[1].includes('^') || regexParts[1].includes('$')) {
-                        throw new error_1.default('source url provided for apig rule "' +
+                        throw new error_1.default('source_endpoint provided for apig rule "' +
                             rule.name +
                             '" is not valid. ' +
                             'Url should not contain ^ or $ symbols', {
-                            exit: 1
+                            exit: 1,
+                            errorId: 'APIG-UTILS-10',
+                            arg: [
+                                ansi_colors_1.bold('source_endpoint'),
+                                ansi_colors_1.bold(rule.name),
+                                ansi_colors_1.italic(source_endpoint.replace(part, ansi_colors_1.red(part))),
+                                ansi_colors_1.bold('Error: ') +
+                                    ansi_colors_1.italic.red('Regular Expression(s) in the source_endpoint should not contain ^ or $ symbols')
+                            ]
                         });
                     }
                     if (regexParts[1].includes('.*') && currentIdx !== allParts.length - 1) {
@@ -187,7 +232,16 @@ exports.apigUtils = {
                             rule.name +
                             '" is not valid. ' +
                             'Url should not contain wildcard character in the mid of path', {
-                            exit: 1
+                            exit: 1,
+                            errorId: 'APIG-UTILS-10',
+                            arg: [
+                                ansi_colors_1.bold('source_endpoint'),
+                                ansi_colors_1.bold(rule.name),
+                                ansi_colors_1.italic(source_endpoint.replace(part, ansi_colors_1.red(part))),
+                                ansi_colors_1.bold('Error: ') +
+                                    ansi_colors_1.italic.red('Regular Expression(s) in the source_endpoint with the wildcard character(.*)' +
+                                        ' is only allowed to be present at the last section of the endpoint')
+                            ]
                         });
                     }
                     let actualRegex = regexParts[1];
@@ -202,17 +256,26 @@ exports.apigUtils = {
             })
                 .join('/');
             if (!otherProps.system && otherProps.name === 'Login Redirect') {
-                throw new error_1.default('Login Redirect is a system reserved name. Kindly use some other name or define it as system value', { exit: 1 });
+                throw new error_1.default('Login Redirect is a system reserved name. Please define it as system value', { exit: 2 });
             }
             if (otherProps.target_endpoint === undefined) {
                 switch (otherProps.target) {
                     case 'client':
                     case 'advancedio':
-                        throw new error_1.default('"target_endpoint" is mandatory, for rule name : ' + otherProps.name, { exit: 1 });
+                        throw new error_1.default('"target_endpoint"(mandatory) is missing, for rule name : ' +
+                            otherProps.name, {
+                            exit: 1,
+                            errorId: 'APIG-UTILS-11',
+                            arg: [ansi_colors_1.bold(otherProps.name), ansi_colors_1.bold('target_endpoint')]
+                        });
                     case 'basicio':
                         if (otherProps.target_id === undefined) {
                             throw new error_1.default('If target is function "target_id" is mandatory, for rule name : ' +
-                                otherProps.name, { exit: 1 });
+                                otherProps.name, {
+                                exit: 1,
+                                errorId: 'APIG-UTILS-11',
+                                arg: [ansi_colors_1.bold(otherProps.name), ansi_colors_1.bold('target_id')]
+                            });
                         }
                         const generatedUrl = fn_utils_1.fnUtils.common.generateUrlForTarget({
                             name: otherProps.target_id,
@@ -221,16 +284,36 @@ exports.apigUtils = {
                             valid: true
                         });
                         if (generatedUrl === undefined) {
-                            throw new error_1.default('"type" provided for function is not a valid one. Please specify if basicio or advancedio, for rule name : ' +
-                                otherProps.name, { exit: 1 });
+                            throw new error_1.default('"target" provided for function is not a valid one. Please specify if basicio or advancedio, for rule name : ' +
+                                otherProps.name, { exit: 2 });
                         }
                         otherProps.target_endpoint =
                             '/' +
                                 generatedUrl.replace('https://', '').split('/').slice(1).join('/');
                         break;
                     default:
-                        throw new error_1.default('target_endpoint and target cannot both be undefined kindly define atleast one, for rule name : ' +
-                            otherProps.name, { exit: 1 });
+                        if (otherProps.target === undefined) {
+                            throw new error_1.default('target_endpoint and target both are undefined for rule name : ' +
+                                otherProps.name, {
+                                exit: 1,
+                                errorId: 'APIG-UTILS-12',
+                                arg: [
+                                    ansi_colors_1.bold(otherProps.name),
+                                    ansi_colors_1.bold('target_endpoint'),
+                                    ansi_colors_1.bold('target')
+                                ]
+                            });
+                        }
+                        throw new error_1.default('invalid target in APIG rule: ' + otherProps.name, {
+                            exit: 1,
+                            errorId: 'APIG-UTILS-13',
+                            arg: [
+                                ansi_colors_1.bold('target'),
+                                ansi_colors_1.italic.red(otherProps.target),
+                                ansi_colors_1.bold(otherProps.name),
+                                ansi_colors_1.bold(['* client', '* advancedio', '* basicio'].join('\n'))
+                            ]
+                        });
                 }
             }
             if (!otherProps.target_endpoint.startsWith('/baas/') &&
@@ -238,8 +321,15 @@ exports.apigUtils = {
                 !otherProps.target_endpoint.startsWith('/server/') &&
                 !otherProps.target_endpoint.startsWith('/oauthorize') &&
                 !otherProps.target_endpoint.startsWith('/__catalyst/')) {
-                throw new error_1.default('target_endpoint is not recognized. Please provide a catalyst url, for rule name : ' +
-                    otherProps.name, { exit: 1 });
+                throw new error_1.default('target_endpoint is not recognized for rule name : ' + otherProps.name, {
+                    exit: 1,
+                    errorId: 'APIG-UTILS-14',
+                    arg: [
+                        ansi_colors_1.bold('target_endpoint'),
+                        ansi_colors_1.italic.red(otherProps.target_endpoint),
+                        ansi_colors_1.bold(otherProps.name)
+                    ]
+                });
             }
             if (method === 'ANY') {
                 js_1.JS.set(localConfig, [sourceUrl, 'all'], otherProps);

package/lib/archiver.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -123,7 +123,9 @@ class Archiver {
                 }));
             }
             if (fromFileObj.length === 0) {
-                throw new error_1.default('Unable to extract zip, FileObj is null', { exit: 2 });
+                throw new error_1.default('Unable to extract zip, FileObj is null', {
+                    exit: 2
+                });
             }
             while (fromFileObj.length > 0) {
                 const limit = fromFileObj.length < 20 ? fromFileObj.length : 20;

package/lib/authentication/index.js

@@ -1,4 +1,23 @@
 'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -13,7 +32,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logout = exports.login = exports.revoke = exports.list = exports.create = void 0;
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
+const ansi_colors_1 = __importStar(require("ansi-colors"));
 const moment_1 = __importDefault(require("moment"));
 const config_store_1 = __importDefault(require("../config-store"));
 const dc_1 = require("../dc");
@@ -41,9 +60,11 @@ exports.create = create;
 function list() {
     const tokens = config_store_1.default.get(`${dc_1.getActiveDC()}.tokens`, null);
     if (tokens === null || Object.keys(tokens).length === 0) {
-        throw new error_1.default('No tokens found, please run ' +
-            ansi_colors_1.default.bold('catalyst token:generate') +
-            ' in order to create one', { exit: 1 });
+        throw new error_1.default('No tokens found', {
+            exit: 0,
+            errorId: 'IDX-1',
+            arg: [ansi_colors_1.bold('catalyst token:generate')]
+        });
     }
     const tableData = [];
     for (const tokenId in tokens) {
@@ -65,9 +86,16 @@ function revoke(id) {
         const tokens = config_store_1.default.get(`${dc_1.getActiveDC()}.tokens`, {});
         const tokenKey = Object.keys(tokens).find((key) => key === id);
         if (tokenKey === undefined) {
-            throw new error_1.default('Unable to retrive token, please run ' +
-                ansi_colors_1.default.bold('catalyst token:list') +
-                ' and provide one valid id from that list', { exit: 1 });
+            const allTokenKeys = Object.keys(tokens);
+            throw new error_1.default('Unable to retrive token', {
+                exit: 1,
+                errorId: 'IDX-2',
+                arg: [
+                    id,
+                    allTokenKeys.length > 0 ? '* ' + allTokenKeys.join('\n* ') : 'None',
+                    ansi_colors_1.bold('catalyst token:list')
+                ]
+            });
         }
         const credential = credential_1.default.init(tokens[tokenKey]);
         return new revoke_1.default(credential, 'tokens.' + id).init();
@@ -83,7 +111,10 @@ function login() {
             logger_1.message('No need to login. Already logged as: ' + ansi_colors_1.default.cyan.bold(user.Email));
             return;
         }
-        const ans = yield prompt_1.default.ask(prompt_1.default.question('collectUsage', 'Allow Catalyst to collect CLI error reporting information?', { type: 'confirm', defaultAns: true }), prompt_1.default.question('dc', 'Select the datacenter to which you have access: ', {
+        const ans = yield prompt_1.default.ask(prompt_1.default.question('collectUsage', 'Allow Catalyst to collect CLI error reporting information?', {
+            type: 'confirm',
+            defaultAns: true
+        }), prompt_1.default.question('dc', 'Select the datacenter to which you have access: ', {
             type: 'list',
             choices: Object.keys(constants_1.DC_TYPE).map((dc) => {
                 const dcObj = constants_1.DC_TYPE[dc];
@@ -114,7 +145,11 @@ function logout() {
         const activeDC = dc_1.getActiveDC();
         const tokenObj = config_store_1.default.get(`${activeDC}.credential`, null);
         if (tokenObj === null) {
-            throw new error_1.default('No need to logout, not logged in yet. Please run ' + ansi_colors_1.default.bold('catalyst login'), { exit: 1 });
+            throw new error_1.default('Not logged in', {
+                exit: 0,
+                errorId: 'IDX-3',
+                arg: [ansi_colors_1.bold('catalyst login')]
+            });
         }
         const user = config_store_1.default.get(`${activeDC}.user`, null);
         const ans = user === null

package/lib/authentication/login.js

@@ -28,6 +28,7 @@ const constants_1 = require("../util_modules/constants");
 const fs_1 = require("../util_modules/fs");
 const js_1 = require("../util_modules/js");
 const logger_1 = require("../util_modules/logger");
+const option_1 = require("../util_modules/option");
 class Login {
     constructor(localhost = true, user = true) {
         this.localhost = localhost;
@@ -67,7 +68,8 @@ class Login {
     }
     _getTokenFromAuthorizationCode(code, callbackUrl) {
         return __awaiter(this, void 0, void 0, function* () {
-            const authCodeResponse = yield new api_1.default().post('/oauth/v2/token', {
+            const authCodeResponse = yield new api_1.default()
+                .post('/oauth/v2/token', {
                 origin: constants_1.ORIGIN.auth,
                 qs: {
                     code,
@@ -80,6 +82,12 @@ class Login {
                     skipQuery: true
                 },
                 authNeeded: false
+            })
+                .catch((err) => {
+                throw new error_1.default('Error when getting the token from authorization code', {
+                    exit: 2,
+                    original: err
+                });
             });
             if (!js_1.JS.hasIn(authCodeResponse, 'body.access_token') ||
                 !js_1.JS.hasIn(authCodeResponse, 'body.refresh_token')) {
@@ -100,7 +108,8 @@ class Login {
     }
     _getTokenFromDeviceCode(code, retryCount = 0) {
         return __awaiter(this, void 0, void 0, function* () {
-            const deviceCodeResponse = yield new api_1.default().post('/oauth/v3/device/token', {
+            const deviceCodeResponse = yield new api_1.default()
+                .post('/oauth/v3/device/token', {
                 origin: constants_1.ORIGIN.auth,
                 qs: {
                     client_id: constants_1.AUTH.mobile.id,
@@ -113,6 +122,12 @@ class Login {
                     skipQuery: true
                 },
                 authNeeded: false
+            })
+                .catch((err) => {
+                throw new error_1.default('Error when getting access token from device code', {
+                    exit: 2,
+                    original: err
+                });
             });
             if (!js_1.JS.hasIn(deviceCodeResponse, 'body.access_token') ||
                 !js_1.JS.hasIn(deviceCodeResponse, 'body.refresh_token')) {
@@ -123,7 +138,19 @@ class Login {
                     JSON.stringify(deviceCodeResponse.body));
                 logger_1.debug('> polling <');
                 if (++retryCount > 30) {
-                    throw new error_1.default('Unable to get refresh_token from code. Kindly try again.', { exit: 1 });
+                    if (option_1.getCurrentCommand() === 'login') {
+                        throw new error_1.default('Unable to get refresh_token from code', {
+                            exit: 0,
+                            errorId: 'LOGIN-1'
+                        });
+                    }
+                    else {
+                        throw new error_1.default('Unable to get refresh_token from code', {
+                            exit: 1,
+                            errorId: 'LOGIN-2',
+                            arg: [ansi_colors_1.bold('catalyst token:generate')]
+                        });
+                    }
                 }
                 yield js_1.JS.sleep(2000);
                 return this._getTokenFromDeviceCode(code, retryCount);
@@ -152,9 +179,16 @@ class Login {
             if (!this.user) {
                 return undefined;
             }
-            const userInfoResponse = yield new api_1.default().get('/oauth/user/info', {
+            const userInfoResponse = yield new api_1.default()
+                .get('/oauth/user/info', {
                 origin: constants_1.ORIGIN.auth,
                 authNeeded: true
+            })
+                .catch((err) => {
+                throw new error_1.default('Error when trying to get the user details', {
+                    exit: 2,
+                    original: err
+                });
             });
             if (!js_1.JS.hasIn(userInfoResponse, 'body.Email') && !js_1.JS.hasIn(userInfoResponse, 'body.ZUID')) {
                 logger_1.debug('User Details Fetch Error:\n' +
@@ -175,7 +209,8 @@ class Login {
             this.salt = 'm';
             const throbber = throbber_1.default.getInstance();
             const throbberName = 'authentication';
-            const deviceCodeResponse = yield new api_1.default().post('/oauth/v3/device/code', {
+            const deviceCodeResponse = yield new api_1.default()
+                .post('/oauth/v3/device/code', {
                 origin: constants_1.ORIGIN.auth,
                 qs: {
                     client_id: constants_1.AUTH.mobile.id,
@@ -185,6 +220,12 @@ class Login {
                     prompt: 'consent'
                 },
                 authNeeded: false
+            })
+                .catch((err) => {
+                throw new error_1.default('Error when getting code from zoho', {
+                    exit: 2,
+                    original: err
+                });
             });
             if (!js_1.JS.hasIn(deviceCodeResponse, 'body.user_code') ||
                 !js_1.JS.hasIn(deviceCodeResponse, 'body.device_code')) {
@@ -193,8 +234,10 @@ class Login {
                     deviceCodeResponse.status +
                     ', Body: ' +
                     JSON.stringify(deviceCodeResponse.body));
-                throw new error_1.default('Unable to get code from zoho. Kindly check your credentials and try again. \n' +
-                    'If the problem persists contact support@zohocatalyst.com');
+                throw new error_1.default('Unable to get code from zoho', {
+                    exit: 1,
+                    errorId: 'LOGIN-3'
+                });
             }
             logger_1.info();
             logger_1.info('Visit this URL on any device: \n');
@@ -205,7 +248,7 @@ class Login {
                 ' and click verify to continue.');
             const deviceCode = js_1.JS.get(deviceCodeResponse, 'body.device_code');
             yield js_1.JS.sleep(10000);
-            throbber.add(throbberName, { text: 'checking if the code has been enterted' });
+            throbber.add(throbberName, { text: 'checking if the code has been entered' });
             try {
                 const result = yield this._getTokenFromDeviceCode(deviceCode);
                 js_1.JS.set(result, 'token', this.salt + '_' + result.refresh_token);