zcatalyst-cli 1.26.2 → 1.27.0

package/README.md

@@ -94,6 +94,7 @@ Command | Description
 **functions:setup** | Set up and configure the function directory in your project directory.
 **functions:add** | Add a function of the required stack to the function directory.
 **functions:shell** | Launch a node shell to test emulated functions of any stack or type, other than Advanced I/O functions.
+**functions:execute** | Execute Non-HTTP functions (Cron, Event, Integration, Job) locally. Accepts input via `--input <value>` (inline JSON, file path, or `-` for stdin), or interactively via inputs file.
 **functions:config** | Perform advanced configurations such as memory allocation on a function in your project.
 **functions:delete** | Delete a function from the remote console or the local directory.
 **appsail:add** | Link an already existing AppSail app to Catalyst Project.

package/lib/authentication/credential.d.ts

@@ -12,11 +12,12 @@ declare class Credential {
     private rToken;
     private client;
     maxExpiry: number;
-    private static crypt;
+    private static _crypt;
     private static isTempCred;
     static globalSelf: null | Credential;
     static oneTimeToken: null | string;
     private static credentialObject;
+    private static get crypt();
     constructor(tokenObj: ITokenObject);
     private _getClientForSalt;
     private _getTokenObjFromStore;

package/lib/authentication/credential.js

@@ -21,11 +21,18 @@ const js_js_1 = require("../util_modules/js.js");
 const index_1 = require("../util_modules/logger/index");
 const api_js_1 = __importDefault(require("../internal/api.js"));
 const crypt_1 = __importDefault(require("./crypt"));
+const key_manager_1 = __importDefault(require("./key-manager"));
 const util_1 = require("util");
 const dc_js_1 = require("../util_modules/dc.js");
 const option_js_1 = require("../util_modules/option.js");
 const path_1 = require("path");
 class Credential {
+    static get crypt() {
+        if (Credential._crypt === null) {
+            Credential._crypt = new crypt_1.default(key_manager_1.default.getEncryptionKey());
+        }
+        return Credential._crypt;
+    }
     constructor(tokenObj) {
         if (tokenObj.token === undefined ||
             js_js_1.JS.isEmpty(tokenObj.token) ||
@@ -66,9 +73,16 @@ class Credential {
         if (encryptedToken === null) {
             return null;
         }
-        const tokenObj = Credential.crypt.decrypt(encryptedToken);
+        const decrypted = Credential.crypt.decrypt(encryptedToken);
+        if (decrypted === null) {
+            return null;
+        }
+        const tokenObj = decrypted;
         const confCredential = new Credential(tokenObj);
         if (this.rToken === confCredential.rToken) {
+            if (Credential.crypt.isLegacyEncrypted(encryptedToken)) {
+                config_store_js_1.default.set((0, dc_js_1.getActiveDC)() + '.' + pth, Credential.crypt.encrypt(tokenObj));
+            }
             return tokenObj;
         }
         return null;
@@ -195,7 +209,10 @@ class Credential {
         let tokenObj;
         if (Credential.crypt.isEncrypted(token)) {
             const decryptToken = Credential.crypt.decrypt(token);
-            if (typeof decryptToken === 'string') {
+            if (decryptToken === null) {
+                tokenObj = {};
+            }
+            else if (typeof decryptToken === 'string') {
                 tokenObj = {
                     token: decryptToken
                 };
@@ -254,7 +271,7 @@ class Credential {
         });
     }
 }
-Credential.crypt = new crypt_1.default('ZC_TRAM');
+Credential._crypt = null;
 Credential.isTempCred = false;
 Credential.globalSelf = null;
 Credential.oneTimeToken = null;

package/lib/authentication/crypt.d.ts

@@ -1,12 +1,16 @@
 declare class Crypt {
     private encryptionKey;
-    private cryptAlgo;
-    constructor(password: string);
+    constructor(key: Buffer | string);
     decrypt(value: string): string | {
         [x: string]: unknown;
-    };
+    } | null;
     encrypt(value: unknown): string;
     isEncrypted(value: string): boolean;
+    isLegacyEncrypted(value: string): boolean;
+    private _hasMarkerAt;
+    private _decryptCurrent;
+    private _decryptLegacy;
+    private _deriveKey;
     private _serialize;
     private _deserialize;
 }

package/lib/authentication/crypt.js

@@ -1,39 +1,61 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const crypto_1 = require("crypto");
+const CRYPT_ALGO = 'aes-256-gcm';
+const IV_LENGTH = 12;
+const AUTH_TAG_LENGTH = 16;
+const DERIVED_KEY_LENGTH = 32;
+const PBKDF2_ITERATIONS = 100000;
+const PBKDF2_DIGEST = 'sha512';
+const MIN_PAYLOAD_LENGTH = IV_LENGTH + 1 + AUTH_TAG_LENGTH;
+const LEGACY_CRYPT_ALGO = 'aes-256-cbc';
+const LEGACY_IV_LENGTH = 16;
+const LEGACY_PBKDF2_ITERATIONS = 1000;
+const LEGACY_KEY = 'ZC_TRAM';
+const LEGACY_MIN_PAYLOAD_LENGTH = LEGACY_IV_LENGTH + 1;
 class Crypt {
-    constructor(password) {
-        this.encryptionKey = password;
-        this.cryptAlgo = 'aes-256-cbc';
+    constructor(key) {
+        this.encryptionKey = Buffer.isBuffer(key) ? key : Buffer.from(key);
     }
     decrypt(value) {
-        let data = Buffer.from(value, 'hex');
-        if (data.slice(16, 17).toString() !== ':') {
+        let data;
+        try {
+            data = Buffer.from(value, 'hex');
+        }
+        catch (err) {
             return value;
         }
-        const initializationVector = data.slice(0, 16);
-        const password = (0, crypto_1.pbkdf2Sync)(this.encryptionKey, initializationVector.toString(), 1000, 32, 'sha512');
-        const decipher = (0, crypto_1.createDecipheriv)(this.cryptAlgo, password, initializationVector);
-        data = Buffer.concat([decipher.update(data.slice(17)), decipher.final()]);
-        return this._deserialize(data.toString());
+        if (data.length >= MIN_PAYLOAD_LENGTH && this._hasMarkerAt(data, IV_LENGTH)) {
+            return this._decryptCurrent(data);
+        }
+        if (data.length >= LEGACY_MIN_PAYLOAD_LENGTH && this._hasMarkerAt(data, LEGACY_IV_LENGTH)) {
+            return this._decryptLegacy(data);
+        }
+        return value;
     }
     encrypt(value) {
         const data = this._serialize(value);
-        const initializationVector = (0, crypto_1.randomBytes)(16);
-        const password = (0, crypto_1.pbkdf2Sync)(this.encryptionKey, initializationVector.toString(), 1000, 32, 'sha512');
-        const cipher = (0, crypto_1.createCipheriv)(this.cryptAlgo, password, initializationVector);
+        const initializationVector = (0, crypto_1.randomBytes)(IV_LENGTH);
+        const derivedKey = this._deriveKey(initializationVector);
+        const cipher = (0, crypto_1.createCipheriv)(CRYPT_ALGO, derivedKey, initializationVector);
+        const encrypted = Buffer.concat([cipher.update(Buffer.from(data)), cipher.final()]);
+        const authTag = cipher.getAuthTag();
         const dataBuff = Buffer.concat([
             initializationVector,
             Buffer.from(':'),
-            cipher.update(Buffer.from(data)),
-            cipher.final()
+            authTag,
+            encrypted
         ]);
         return dataBuff.toString('hex');
     }
     isEncrypted(value) {
         try {
             const data = Buffer.from(value, 'hex');
-            if (data.slice(16, 17).toString() === ':') {
+            if (data.length >= MIN_PAYLOAD_LENGTH && this._hasMarkerAt(data, IV_LENGTH)) {
+                return true;
+            }
+            if (data.length >= LEGACY_MIN_PAYLOAD_LENGTH &&
+                this._hasMarkerAt(data, LEGACY_IV_LENGTH)) {
                 return true;
             }
         }
@@ -42,6 +64,55 @@ class Crypt {
         }
         return false;
     }
+    isLegacyEncrypted(value) {
+        try {
+            const data = Buffer.from(value, 'hex');
+            if (data.length >= MIN_PAYLOAD_LENGTH && this._hasMarkerAt(data, IV_LENGTH)) {
+                return false;
+            }
+            return (data.length >= LEGACY_MIN_PAYLOAD_LENGTH &&
+                this._hasMarkerAt(data, LEGACY_IV_LENGTH));
+        }
+        catch (err) {
+            return false;
+        }
+    }
+    _hasMarkerAt(data, offset) {
+        return data.slice(offset, offset + 1).toString() === ':';
+    }
+    _decryptCurrent(data) {
+        const initializationVector = data.slice(0, IV_LENGTH);
+        const authTag = data.slice(IV_LENGTH + 1, IV_LENGTH + 1 + AUTH_TAG_LENGTH);
+        const cipherText = data.slice(IV_LENGTH + 1 + AUTH_TAG_LENGTH);
+        const derivedKey = this._deriveKey(initializationVector);
+        try {
+            const decipher = (0, crypto_1.createDecipheriv)(CRYPT_ALGO, derivedKey, initializationVector);
+            decipher.setAuthTag(authTag);
+            const decrypted = Buffer.concat([decipher.update(cipherText), decipher.final()]);
+            return this._deserialize(decrypted.toString());
+        }
+        catch (err) {
+            return null;
+        }
+    }
+    _decryptLegacy(data) {
+        const initializationVector = data.slice(0, LEGACY_IV_LENGTH);
+        const password = (0, crypto_1.pbkdf2Sync)(LEGACY_KEY, initializationVector.toString(), LEGACY_PBKDF2_ITERATIONS, DERIVED_KEY_LENGTH, PBKDF2_DIGEST);
+        try {
+            const decipher = (0, crypto_1.createDecipheriv)(LEGACY_CRYPT_ALGO, password, initializationVector);
+            const decrypted = Buffer.concat([
+                decipher.update(data.slice(LEGACY_IV_LENGTH + 1)),
+                decipher.final()
+            ]);
+            return this._deserialize(decrypted.toString());
+        }
+        catch (err) {
+            return null;
+        }
+    }
+    _deriveKey(initializationVector) {
+        return (0, crypto_1.pbkdf2Sync)(this.encryptionKey, initializationVector, PBKDF2_ITERATIONS, DERIVED_KEY_LENGTH, PBKDF2_DIGEST);
+    }
     _serialize(value) {
         return JSON.stringify(value, null, '');
     }

package/lib/authentication/index.js

@@ -152,6 +152,7 @@ function login() {
         const localhost = (0, option_js_1.getOptionValue)('localhost', true);
         const result = yield new login_js_1.default(localhost).init();
         activeDC = result.dc;
+        (0, dc_js_1.updateActiveDC)(activeDC);
         config_store_js_1.default.set('usage', ans.collectUsage);
         config_store_js_1.default.set(`${activeDC}.user`, result.user);
         config_store_js_1.default.set(`${activeDC}.scopes`, result.scopes);

package/lib/authentication/key-manager.d.ts

@@ -0,0 +1,7 @@
+declare class KeyManager {
+    private static cachedKey;
+    private static get keyFilePath();
+    static getEncryptionKey(): Buffer;
+    private static _lockDownPermissions;
+}
+export default KeyManager;

package/lib/authentication/key-manager.js

@@ -0,0 +1,62 @@
+'use strict';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const crypto_1 = require("crypto");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const os_1 = require("os");
+const config_store_js_1 = __importDefault(require("../util_modules/config-store.js"));
+const KEY_FILE_NAME = '.zcatalyst-cli-key';
+const KEY_BYTE_LENGTH = 32;
+const FILE_MODE = 0o600;
+const DIR_MODE = 0o700;
+class KeyManager {
+    static get keyFilePath() {
+        const storeDir = config_store_js_1.default.path;
+        const baseDir = storeDir && storeDir.length > 0 ? storeDir : (0, os_1.homedir)();
+        return (0, path_1.join)(baseDir, KEY_FILE_NAME);
+    }
+    static getEncryptionKey() {
+        if (KeyManager.cachedKey) {
+            return KeyManager.cachedKey;
+        }
+        const filePath = KeyManager.keyFilePath;
+        if ((0, fs_1.existsSync)(filePath)) {
+            const key = (0, fs_1.readFileSync)(filePath);
+            KeyManager._lockDownPermissions(filePath);
+            KeyManager.cachedKey = key;
+            return key;
+        }
+        const dir = (0, path_1.dirname)(filePath);
+        if (!(0, fs_1.existsSync)(dir)) {
+            (0, fs_1.mkdirSync)(dir, { recursive: true, mode: DIR_MODE });
+        }
+        const key = (0, crypto_1.randomBytes)(KEY_BYTE_LENGTH);
+        try {
+            (0, fs_1.writeFileSync)(filePath, key, { mode: FILE_MODE, flag: 'wx' });
+        }
+        catch (err) {
+            if (err.code === 'EEXIST') {
+                const existingKey = (0, fs_1.readFileSync)(filePath);
+                KeyManager._lockDownPermissions(filePath);
+                KeyManager.cachedKey = existingKey;
+                return existingKey;
+            }
+            throw err;
+        }
+        KeyManager._lockDownPermissions(filePath);
+        KeyManager.cachedKey = key;
+        return key;
+    }
+    static _lockDownPermissions(filePath) {
+        try {
+            (0, fs_1.chmodSync)(filePath, FILE_MODE);
+        }
+        catch (err) {
+        }
+    }
+}
+KeyManager.cachedKey = null;
+exports.default = KeyManager;

package/lib/authentication/login.js

@@ -48,7 +48,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.missingScopes = void 0;
 const ansi_colors_1 = require("ansi-colors");
 const http_1 = require("http");
-const server_js_1 = require("../util_modules/server.js");
+const index_js_1 = require("../util_modules/server/index.js");
 const open_1 = __importDefault(require("open"));
 const path_1 = require("path");
 const portfinder_1 = require("portfinder");
@@ -57,9 +57,9 @@ const dc_js_1 = require("../util_modules/dc.js");
 const error_js_1 = __importDefault(require("./error.js"));
 const api_js_1 = __importDefault(require("../internal/api.js"));
 const credential_js_1 = __importDefault(require("./credential.js"));
-const index_js_1 = __importDefault(require("../prompt/index.js"));
-const index_js_2 = __importDefault(require("../throbber/index.js"));
-const index_js_3 = require("../util_modules/constants/index.js");
+const index_js_2 = __importDefault(require("../prompt/index.js"));
+const index_js_3 = __importDefault(require("../throbber/index.js"));
+const index_js_4 = require("../util_modules/constants/index.js");
 const auth_js_1 = __importDefault(require("./constants/auth.js"));
 const dc_type_js_1 = __importDefault(require("../util_modules/constants/lib/dc-type.js"));
 const scopes_js_1 = __importDefault(require("./constants/scopes.js"));
@@ -68,16 +68,16 @@ const js_js_1 = require("../util_modules/js.js");
 const index_1 = require("../util_modules/logger/index");
 const option_js_1 = require("../util_modules/option.js");
 const events_1 = __importDefault(require("events"));
-const index_js_4 = __importDefault(require("../error/index.js"));
+const index_js_5 = __importDefault(require("../error/index.js"));
 const crypto_1 = require("crypto");
 const env_js_1 = require("../util_modules/env.js");
 exports.missingScopes = {
-    [index_js_3.DC_TYPE.in.value]: getScopes(['dataverse']),
-    [index_js_3.DC_TYPE.eu.value]: getScopes(['dataverse']),
-    [index_js_3.DC_TYPE.au.value]: getScopes(['dataverse']),
-    [index_js_3.DC_TYPE.ca.value]: getScopes(['quick_ml', 'dataverse']),
-    [index_js_3.DC_TYPE.sa.value]: getScopes(['quick_ml', 'dataverse']),
-    [index_js_3.DC_TYPE.jp.value]: getScopes(['dataverse'])
+    [index_js_4.DC_TYPE.in.value]: getScopes(['dataverse']),
+    [index_js_4.DC_TYPE.eu.value]: getScopes(['dataverse']),
+    [index_js_4.DC_TYPE.au.value]: getScopes(['dataverse']),
+    [index_js_4.DC_TYPE.ca.value]: getScopes(['quick_ml', 'dataverse']),
+    [index_js_4.DC_TYPE.sa.value]: getScopes(['quick_ml', 'dataverse']),
+    [index_js_4.DC_TYPE.jp.value]: getScopes(['dataverse'])
 };
 function getScopes(keys) {
     return Object.keys(scopes_js_1.default).filter((scope) => keys.some((prefix) => scope.startsWith(prefix)));
@@ -106,7 +106,7 @@ class Login {
         return 'http://localhost:' + port;
     }
     _getLoginUrl(callbackUrl, state) {
-        return (index_js_3.ORIGIN.auth +
+        return (index_js_4.ORIGIN.auth +
             '/oauth/v2/auth?' +
             js_js_1.JS.map({
                 client_id: auth_js_1.default.web.id,
@@ -124,7 +124,7 @@ class Login {
         return __awaiter(this, void 0, void 0, function* () {
             const authCodeResponse = yield new api_js_1.default()
                 .post('/oauth/v2/token', {
-                origin: index_js_3.ORIGIN.auth,
+                origin: index_js_4.ORIGIN.auth,
                 qs: {
                     code,
                     client_id: auth_js_1.default.web.id,
@@ -164,7 +164,7 @@ class Login {
         return __awaiter(this, void 0, void 0, function* () {
             const deviceCodeResponse = yield new api_js_1.default()
                 .post('/oauth/v3/device/token', {
-                origin: index_js_3.ORIGIN.auth,
+                origin: index_js_4.ORIGIN.auth,
                 qs: {
                     client_id: auth_js_1.default.mobile.id,
                     client_secret: auth_js_1.default.mobile.secret,
@@ -240,7 +240,7 @@ class Login {
             }
             const userInfoResponse = yield new api_js_1.default()
                 .get('/oauth/user/info', {
-                origin: index_js_3.ORIGIN.auth,
+                origin: index_js_4.ORIGIN.auth,
                 authNeeded: true
             })
                 .catch((err) => {
@@ -266,11 +266,11 @@ class Login {
                 (0, index_1.debug)('Error while login with server : ' + err.message);
             }
             this.salt = 'm';
-            const throbber = index_js_2.default.getInstance();
+            const throbber = index_js_3.default.getInstance();
             const throbberName = 'authentication';
             const deviceCodeResponse = yield new api_js_1.default()
                 .post('/oauth/v3/device/code', {
-                origin: index_js_3.ORIGIN.auth,
+                origin: index_js_4.ORIGIN.auth,
                 qs: {
                     client_id: auth_js_1.default.mobile.id,
                     scope: js_js_1.JS.values(this._getScopes()).join(' '),
@@ -356,7 +356,7 @@ class Login {
                         const queryParamsObj = new url_1.URL(req.url, `http://${req.headers.host}`)
                             .searchParams;
                         if (queryParamsObj.get('state') !== nonce) {
-                            throw new index_js_4.default('Invalid state param received.', { exit: 2 });
+                            throw new index_js_5.default('Invalid state param received.', { exit: 2 });
                         }
                         const code = queryParamsObj !== undefined && queryParamsObj.get('code');
                         const _location = queryParamsObj !== undefined && queryParamsObj.get('location');
@@ -367,7 +367,7 @@ class Login {
                                 typeof location === 'string' &&
                                 location !== dcRef) {
                                 (0, index_1.warning)('Your credentials does not match the DC opted!!!');
-                                const ans = yield index_js_1.default.ask(index_js_1.default.question('DC', `Do you wish to continue with login by making ${location.toUpperCase()} DC as active ?`, {
+                                const ans = yield index_js_2.default.ask(index_js_2.default.question('DC', `Do you wish to continue with login by making ${location.toUpperCase()} DC as active ?`, {
                                     type: 'confirm',
                                     defaultAns: true
                                 }));
@@ -410,7 +410,7 @@ class Login {
                         }));
                     }
                 }));
-                const destroyer = new server_js_1.ConnectionDestroyer(server);
+                const destroyer = new index_js_1.ConnectionDestroyer(server);
                 server.listen(port, '127.0.0.1', () => {
                     (0, index_1.info)();
                     (0, index_1.info)('Visit this URL on this device to log in:');

package/lib/bin/catalyst.js

@@ -129,18 +129,4 @@ process.on('unhandledRejection', (reason, promise) => {
     (0, errorOut_1.default)((0, util_1.inspect)(reason || promise));
     process.exitCode = runtime_store_js_1.default.get('exitCode', 2);
 });
-let cmdPromise;
-if (process.stdin.isTTY) {
-    cmdPromise = index_js_1.Catalyst.processArgs(...process.argv);
-}
-else {
-    let stdin = '';
-    process.stdin.on('data', (chunk) => {
-        if (chunk !== null) {
-            stdin += chunk;
-        }
-    });
-    process.stdin.on('end', () => {
-        cmdPromise = index_js_1.Catalyst.processArgs(...process.argv, stdin.toString().trimEnd());
-    });
-}
+const cmdPromise = index_js_1.Catalyst.processArgs(...process.argv);

package/lib/client.d.ts

@@ -9,11 +9,13 @@ export declare class Client {
     processArgs(...args: Array<string>): Promise<Command>;
     getCommand(name: string): Command | null;
     getAllCommandNames(): Array<string>;
+    private static execOptionKeyToCliFlag;
     private convertOptions;
-    exec(command: string, projectRoot: string, cwd: string, { args, options, inputs }?: {
+    exec(command: string, projectRoot: string, cwd: string, { args, options, inputs, nonInteractive }?: {
         args?: Array<string>;
         options?: Record<string, string | boolean | Array<string>>;
         inputs?: Record<string, unknown>;
+        nonInteractive?: boolean;
     }): Promise<{
         exitCode: 0 | 1 | 2;
         error?: CatalystError;

package/lib/client.js

@@ -104,26 +104,37 @@ class Client {
             return cmd.name();
         });
     }
+    static execOptionKeyToCliFlag(key) {
+        if (key === 'nonInteractive') {
+            return 'non-interactive';
+        }
+        return key;
+    }
     convertOptions(options) {
         const optionsArr = [];
         Object.entries(options).forEach(([key, value]) => {
+            const flag = Client.execOptionKeyToCliFlag(key);
             if (typeof value === 'boolean') {
-                value && optionsArr.push('--' + key);
+                value && optionsArr.push('--' + flag);
                 return;
             }
-            optionsArr.push('--' + key);
+            optionsArr.push('--' + flag);
             optionsArr.push(typeof value === 'string' ? value : value.join(','));
         });
         return optionsArr;
     }
     exec(command_1, projectRoot_1, cwd_1) {
-        return __awaiter(this, arguments, void 0, function* (command, projectRoot, cwd, { args = [], options = {}, inputs } = {}) {
+        return __awaiter(this, arguments, void 0, function* (command, projectRoot, cwd, { args = [], options = {}, inputs = {}, nonInteractive } = {}) {
             runtime_store_1.default.set('context', {});
             utils_js_1.runtime.set('context', {});
             runtime_store_1.default.set('cwd', cwd);
             runtime_store_1.default.set('project.root', projectRoot);
-            runtime_store_1.default.set('prompt', inputs);
-            const programArgs = [...args, ...this.convertOptions(options)];
+            runtime_store_1.default.set('context.prompt', inputs);
+            const mergedOptions = Object.assign({}, options);
+            if (nonInteractive) {
+                mergedOptions.nonInteractive = true;
+            }
+            const programArgs = [...args, ...this.convertOptions(mergedOptions)];
             this._cli = new commander_1.Command();
             yield this.init(command);
             yield this.processArgs('node', 'catalyst', command, ...programArgs);

package/lib/command_needs/rc.js

@@ -50,13 +50,23 @@ exports.default = (...args_1) => __awaiter(void 0, [...args_1], void 0, function
     const orgApi = yield (0, endpoints_1.orgAPI)();
     if (orgOpt !== null) {
         const orgList = yield orgApi.getAllOrgs();
-        const found = orgList.find((org) => org.id + '' === orgOpt);
+        const found = orgList.find((org) => org.id + '' === orgOpt || org.name === orgOpt);
         if (!found) {
+            if ((0, env_1.isNonInteractiveMode)())
+                throw new index_js_1.default('Invalid "org" option supplied', {
+                    exit: 1,
+                    errorId: 'RC-7',
+                    arg: [
+                        (0, ansi_colors_1.red)(orgOpt),
+                        (0, ansi_colors_1.italic)('--org'),
+                        (0, ansi_colors_1.bold)(orgList.map((org) => '* ' + org.name + ' (' + org.id + ')').join('\n'))
+                    ]
+                });
             throw new index_js_1.default('Invalid "org" option supplied', {
-                exit: 2
+                exit: 1
             });
         }
-        runtime_store_1.default.set('project.env.id', orgOpt + '');
+        runtime_store_1.default.set('project.env.id', found.id + '');
     }
     let projectApi = yield (0, endpoints_1.projectAPI)();
     let envApi = yield (0, endpoints_1.envAPI)();

package/lib/commands/appsail/add.js

@@ -51,12 +51,22 @@ const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const index_1 = require("../../util_modules/logger/index");
 const scopes_1 = __importDefault(require("../../authentication/constants/scopes"));
+const prompt_fields_1 = require("../../init/features/appsail/prompt-fields");
+const prompt_fields_2 = require("../../init/util/prompt-fields");
 exports.default = new command_1.default('appsail:add')
     .description('Link an already existing AppSail to Catalyst Project')
     .needs('auth', [scopes_1.default.functions])
     .needs('config', { optional: true })
     .needs('rc')
     .ci(false)
+    .option(prompt_fields_1.appsailAddPromptFields.get('name'))
+    .option(prompt_fields_2.initCommonPromptFields.get('stack'))
+    .option(prompt_fields_1.appsailAddPromptFields.get('source'))
+    .option(prompt_fields_1.appsailAddPromptFields.get('overwrite'))
+    .option(prompt_fields_1.appsailAddPromptFields.get('buildPath'))
+    .option(prompt_fields_1.appsailAddPromptFields.get('platform'))
+    .option(prompt_fields_1.appsailAddPromptFields.get('command'))
+    .option(prompt_fields_1.appsailAddPromptFields.get('port'))
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const config = runtime_store_1.default.get('config');
     yield (yield Promise.resolve().then(() => __importStar(require('../../init/features')))).appsail();

package/lib/commands/client/delete.js

@@ -27,8 +27,10 @@ const fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
 const index_1 = require("../../util_modules/logger/index");
 const option_1 = require("../../util_modules/option");
-exports.default = new command_1.default('client:delete [client_version]')
+const env_1 = require("../../util_modules/env");
+exports.default = new command_1.default('client:delete')
     .description('Delete a version of the client from the remote console or the local directory')
+    .argument('[client_version]', 'version of the client to delete')
     .option('--local', 'removes the client from local machine')
     .option('--remote', 'removes the selected client from remote console')
     .needs('auth', [scopes_js_1.default.webapp])
@@ -48,6 +50,9 @@ exports.default = new command_1.default('client:delete [client_version]')
             arg: [(0, ansi_colors_1.bold)('--local'), (0, ansi_colors_1.bold)('--remote')]
         });
     }
+    if (!localOpt && !remoteOpt && (0, env_1.isNonInteractiveMode)()) {
+        localOpt = true;
+    }
     if (!localOpt && !remoteOpt) {
         const locationAns = yield prompt_1.default.ask(prompt_1.default.question('location', 'Choose a location to get more information', {
             type: 'list',
@@ -77,7 +82,7 @@ exports.default = new command_1.default('client:delete [client_version]')
                 location: local
             };
             try {
-                const configFile = fs_1.ASYNC.readJSONFile(packageJsonFile, {
+                const configFile = yield fs_1.ASYNC.readJSONFile(packageJsonFile, {
                     checkpath: true
                 });
                 if (configFile === undefined) {
@@ -116,6 +121,13 @@ exports.default = new command_1.default('client:delete [client_version]')
         }
     }
     if (remoteOpt) {
+        if ((0, env_1.isNonInteractiveMode)()) {
+            throw new index_js_1.default('Remote deletion is not supported in non-interactive mode', {
+                exit: 1,
+                errorId: 'CDEL-8',
+                arg: [(0, ansi_colors_1.bold)('catalyst client:delete --local')]
+            });
+        }
         const choicesArray = [];
         let historyArr = (yield clientApi.getAllHistory());
         if (js_1.JS.isEmpty(historyArr)) {
@@ -171,7 +183,7 @@ exports.default = new command_1.default('client:delete [client_version]')
                     : false
             }));
         });
-        const choiceAns = yield prompt_1.default.ask(prompt_1.default.question('choice', 'Select all the client versions you want to delete', {
+        const choiceAns = yield prompt_1.default.ask(prompt_1.default.question('clientsToDelete', 'Select all the client versions you want to delete', {
             type: 'checkbox',
             choices: choicesArray,
             validate: (answers) => {
@@ -184,8 +196,8 @@ exports.default = new command_1.default('client:delete [client_version]')
                 return choicesArray.length > 2;
             }
         }));
-        if (choiceAns.choice !== undefined) {
-            appsToBeDeleted.push(...choiceAns.choice);
+        if (choiceAns.clientsToDelete !== undefined) {
+            appsToBeDeleted.push(...choiceAns.clientsToDelete);
         }
         else if (choicesArray.length === 2 && !choicesArray[1].disabled) {
             appsToBeDeleted.push(choicesArray[1].value);
@@ -204,7 +216,7 @@ exports.default = new command_1.default('client:delete [client_version]')
     const consentAns = yield prompt_1.default.ask(prompt_1.default.question('consent', 'Are you sure you want to delete the clients : ' +
         appsToBeDeleted.map((app) => `${app.version}(${app.location})`).join(','), {
         type: 'confirm',
-        defaultAns: false,
+        defaultAns: (0, env_1.isNonInteractiveMode)(),
         when: () => {
             return appsToBeDeleted.length > 0;
         }