zcatalyst-cli 1.18.0-beta.4 → 1.18.0-beta.5

package/docs/commands/ds/import.toml

@@ -6,15 +6,15 @@ link = 'https://www.zoho.com/catalyst/help/cli-import-export.html#Import'
 [IMP-2]
 context = '''File needed for import! A CSV file is mandatory for executing this command.'''
 aid = '''Please provide the path of the CSV file present in the local machine with the command, or 
-provide the file_id of the file that is already uploaded to the File Store in the config json.'''
+provide the object_details of the file that is already uploaded to the Stratus in the config json.'''
 link = 'https://www.zoho.com/catalyst/help/cli-import-export.html#CSV'
 
 [IMP-3]
-context = '''No Folders present in the File Store! You must have atleast one folder in the File Store to upload the CSV file.'''
-aid = '''Please create atleast one folder in the Catalyst File Store to proceed.'''
+context = '''No Buckets present in the Stratus! You must have atleast one bucket in the Stratus to upload the CSV file.'''
+aid = '''Please create atleast one bucket in the Catalyst Stratus to proceed.'''
 link = 'https://www.zoho.com/catalyst/help/file-store.html#Creating'
 
 [IMP-4]
-context = '''The folder ${arg[0]} specified in the ${arg[1]} config file does not exists in the Catalyst file store.'''
-aid = '''Please specify the name of a folder that's already present in Catalyst file store. Alternatively, you can try uploading the ${arg[2]} file to a folder in the Catalyst file store and specify it's ${arg[3]} as ${arg[4]} in the ${arg[1]} config file.'''
+context = '''The bucket ${arg[0]} specified in the ${arg[1]} config file does not exists in the Catalyst Stratus.'''
+aid = '''Please specify the name of a bucket that's already present in Catalyst Stratus. Alternatively, you can try uploading the ${arg[2]} file to a bucket in the Catalyst Stratus and specify it's ${arg[3]} as ${arg[4]} in the ${arg[1]} config file.'''
 link = 'https://catalyst.zoho.com/help/cli-import-export.html#Import_File_Format'

package/lib/commands/ds/import.js

@@ -45,6 +45,7 @@ exports.default = new command_1.default('ds:import [file]')
     .needs('config', { optional: true })
     .needs('rc', { optional: true })
     .action((uploadFile) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
     const env = (0, option_1.getOptionValue)('production', false) ? 'Production' : 'Development';
     const configPath = (0, option_1.getOptionValue)('config', false);
     const importConfig = configPath ? yield getWriteConfigFromPath(configPath) : {};
@@ -52,44 +53,59 @@ exports.default = new command_1.default('ds:import [file]')
     if (!tableId) {
         throw new error_1.default('Table identifier missing', { exit: 0, errorId: 'IMP-1' });
     }
-    if (!importConfig.file_id) {
+    if (!importConfig.file_id && !((_a = importConfig.object_details) === null || _a === void 0 ? void 0 : _a.object_key)) {
         if (!uploadFile) {
             throw new error_1.default('No CSV file provided', { exit: 0, errorId: 'IMP-2' });
         }
-        const fileAPI = yield (0, endpoints_1.filestoreAPI)({ env });
-        const allFolders = (yield fileAPI.getAllFolders());
-        if (allFolders.length > 0) {
-            const choices = allFolders.map((folderDetail) => prompt_1.default.choice(folderDetail.folder_name, {
-                value: folderDetail
+        const bucketAPI = yield (0, endpoints_1.stratusAPI)({ env });
+        const allBuckets = (yield bucketAPI.getAllBuckets());
+        if (allBuckets.length > 0) {
+            const choices = allBuckets.map((bucketDetail) => prompt_1.default.choice(bucketDetail.bucket_name, {
+                value: bucketDetail
             }));
-            const folderAns = yield prompt_1.default.ask(prompt_1.default.question('folder', 'Select a folder to which you want to upload the file to : ', {
+            const bucketAns = yield prompt_1.default.ask(prompt_1.default.question('bucket', 'Select a bucket to which you want to upload the object to : ', {
                 type: 'list',
                 choices,
-                when: !importConfig.folder_id
+                when: !((_b = importConfig.object_details) === null || _b === void 0 ? void 0 : _b.bucket_name)
             }));
-            folderAns.folder =
-                folderAns.folder === undefined
-                    ? allFolders.find((folderDetails) => folderDetails.folder_name === importConfig.folder_id ||
-                        folderDetails.id === importConfig.folder_id)
-                    : folderAns.folder;
-            if (!folderAns.folder) {
-                throw new error_1.default('Folder not present', {
+            const bucket = bucketAns.bucket;
+            const bucketName = bucket.bucket_name === undefined
+                ? allBuckets.find((bucketDetails) => {
+                    var _a;
+                    return bucketDetails.bucket_name ===
+                        ((_a = importConfig.object_details) === null || _a === void 0 ? void 0 : _a.bucket_name);
+                })
+                : bucket.bucket_name;
+            if (!bucketName) {
+                throw new error_1.default('Bucket not present', {
                     exit: 1,
                     errorId: 'IMP-4',
                     arg: [
-                        ansi_colors_1.bold.red(importConfig.folder_id || ''),
+                        ansi_colors_1.bold.red(((_c = importConfig.object_details) === null || _c === void 0 ? void 0 : _c.bucket_name) || ''),
                         (0, ansi_colors_1.italic)(configPath || ''),
                         (0, ansi_colors_1.bold)(uploadFile),
-                        (0, ansi_colors_1.bold)('Unique ID'),
-                        (0, ansi_colors_1.italic)('file_id')
+                        (0, ansi_colors_1.bold)('Details(bucket_name and object_key)'),
+                        (0, ansi_colors_1.italic)('object_details')
                     ]
                 });
             }
-            const fileDetails = (yield fileAPI.uploadFile(folderAns.folder.id, fs_1.SYNC.getReadStream((0, path_1.resolve)(uploadFile))));
-            importConfig.file_id = fileDetails.id;
+            try {
+                yield bucketAPI.uploadObject(bucketName, uploadFile, fs_1.SYNC.getReadStream((0, path_1.resolve)(uploadFile)));
+            }
+            catch (err) {
+                throw new error_1.default('Error while uploading the object to the stratus. Use --verbose for error details', {
+                    exit: 1,
+                    original: err
+                });
+            }
+            const objDetail = {
+                bucket_name: bucketName,
+                object_key: uploadFile
+            };
+            importConfig.object_details = objDetail;
         }
         else {
-            throw new error_1.default('folder needed', { exit: 0, errorId: 'IMP-3' });
+            throw new error_1.default('bucket needed', { exit: 0, errorId: 'IMP-3' });
         }
     }
     const bulkAPI = yield (0, endpoints_1.bulkDSAPI)({ env });

package/lib/commands/event/generate/index.js

@@ -149,10 +149,22 @@ exports.default = new command_1.default('event:generate <source> <action>')
                     break;
                 case 'action':
                     const eventRefArr = constants_1.EVENT_REF[remoteSourceName];
-                    const remoteRefAction = action.charAt(0).toUpperCase() + action.slice(1);
+                    const remoteRefAction = action
+                        .split('_')
+                        .map((act) => act.charAt(0).toUpperCase() + act.slice(1))
+                        .join(' ');
                     (0, logger_1.debug)(`action provided is : ${remoteRefAction}`);
                     const indexOfAction = eventRefArr.indexOf(remoteRefAction);
                     if (indexOfAction < 0) {
+                        const availableActions = eventRefArr
+                            .map((act) => {
+                            act = act
+                                .split(' ')
+                                .map((act) => act.charAt(0).toUpperCase() + act.slice(1))
+                                .join('_');
+                            return '* ' + act;
+                        })
+                            .join('\n');
                         throw new error_1.default('Action incompatible with the source ' + eventRefArr, {
                             exit: 1,
                             errorId: 'IDX-6',
@@ -160,7 +172,7 @@ exports.default = new command_1.default('event:generate <source> <action>')
                                 (0, ansi_colors_1.bold)(action),
                                 ansi_colors_1.bold.red('X'),
                                 (0, ansi_colors_1.bold)(source),
-                                (0, ansi_colors_1.bold)(eventRefArr.map((act) => '* ' + act).join('\n'))
+                                (0, ansi_colors_1.bold)(availableActions)
                             ]
                         });
                     }

package/lib/endpoints/index.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tunnelAPI = exports.commonAPI = exports.jobScheduling = exports.codeDeck = exports.gitHubAPI = exports.appSailAPI = exports.logAPI = exports.eventBusAPI = exports.functionsAPI = exports.applogicAPI = exports.bulkDSAPI = exports.apigAPI = exports.clientAPI = exports.datastoreAPI = exports.zcqlAPI = exports.queueAPI = exports.filestoreAPI = exports.cacheAPI = exports.sdkAPI = exports.envAPI = exports.projectAPI = exports.orgAPI = void 0;
+exports.credentialsAPI = exports.tunnelAPI = exports.commonAPI = exports.jobScheduling = exports.codeDeck = exports.gitHubAPI = exports.stratusAPI = exports.appSailAPI = exports.logAPI = exports.eventBusAPI = exports.functionsAPI = exports.applogicAPI = exports.bulkDSAPI = exports.apigAPI = exports.clientAPI = exports.datastoreAPI = exports.zcqlAPI = exports.queueAPI = exports.filestoreAPI = exports.cacheAPI = exports.sdkAPI = exports.envAPI = exports.projectAPI = exports.orgAPI = void 0;
 const project_1 = require("../util_modules/project");
 function orgAPI({ auth = true } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -156,6 +156,13 @@ function appSailAPI({ auth = true, projectId = (0, project_1.getProjectId)(), en
     });
 }
 exports.appSailAPI = appSailAPI;
+function stratusAPI({ auth = true, projectId = (0, project_1.getProjectId)(), env = (0, project_1.getEnvName)() } = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const stratus = (yield Promise.resolve().then(() => __importStar(require('./lib/stratus')))).default;
+        return new stratus(projectId, { authNeeded: auth, env });
+    });
+}
+exports.stratusAPI = stratusAPI;
 function gitHubAPI() {
     return __awaiter(this, void 0, void 0, function* () {
         const gitHub = (yield Promise.resolve().then(() => __importStar(require('./lib/git-hub')))).default;
@@ -191,3 +198,10 @@ function tunnelAPI({ auth = true, projectId = (0, project_1.getProjectId)() } =
     });
 }
 exports.tunnelAPI = tunnelAPI;
+function credentialsAPI({ auth = false, projectId = (0, project_1.getProjectId)() } = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const credentials = (yield Promise.resolve().then(() => __importStar(require('./lib/credentials')))).default;
+        return new credentials(projectId, { authNeeded: auth });
+    });
+}
+exports.credentialsAPI = credentialsAPI;

package/lib/endpoints/lib/credentials.js

@@ -0,0 +1,59 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const api_1 = __importDefault(require("../../internal/api"));
+const logger_1 = require("../../util_modules/logger");
+const error_1 = __importDefault(require("../../error"));
+const project_1 = require("../../util_modules/project");
+const constants_1 = require("../../util_modules/constants");
+const js_1 = require("../../util_modules/js");
+class Credentials {
+    constructor(projectId, opts) {
+        this.opts = opts;
+        this.projectId = projectId;
+        this.projectDomain = `https://${(0, project_1.getDomainPrefix)()}.${constants_1.ORIGIN.app.replace('https://', '')}`;
+    }
+    generateJWTToken(cookie) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(Object.assign(Object.assign({}, this.opts), { headers: { Cookie: cookie }, origin: this.projectDomain })).get(`/baas/v1/project/${this.projectId}/authentication/custom-token`);
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            (0, logger_1.debug)('Download response from server : ' + res.body);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
+    convertJwtToAuthToken(reqOpts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(Object.assign(Object.assign({}, this.opts), { origin: constants_1.ORIGIN.iamPortal, headers: { Origin: this.projectDomain } })).post(`/clientoauth/v2/${(0, project_1.getDomainKey)()}/remote/auth`, {
+                qs: {
+                    response_type: 'remote_token',
+                    jwt_token: reqOpts.jwt_token,
+                    client_id: reqOpts.client_id,
+                    scope: js_1.JS.values(reqOpts.scopes).join(' ')
+                }
+            });
+            if (res.body) {
+                return res.body;
+            }
+            (0, logger_1.debug)('Download response from server : ' + res.body);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
+}
+exports.default = Credentials;

package/lib/endpoints/lib/ds-bulk.js

@@ -50,6 +50,7 @@ class BulkDS {
                 body: {
                     table_identifier: table,
                     operation: config === null || config === void 0 ? void 0 : config.operation,
+                    object_details: config === null || config === void 0 ? void 0 : config.object_details,
                     file_id: config === null || config === void 0 ? void 0 : config.file_id,
                     callback: config === null || config === void 0 ? void 0 : config.callback,
                     find_by: config === null || config === void 0 ? void 0 : config.find_by,

package/lib/endpoints/lib/stratus.js

@@ -0,0 +1,63 @@
+'use strict';
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const error_1 = __importDefault(require("../../error"));
+const api_1 = __importDefault(require("../../internal/api"));
+const logger_1 = require("../../util_modules/logger");
+const mime_types_1 = __importDefault(require("mime-types"));
+const constants_1 = require("../../util_modules/constants");
+class Stratus {
+    constructor(projectId, opts) {
+        this.opts = opts;
+        this.projectId = projectId;
+    }
+    getAllBuckets() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).get(`/baas/v1/project/${this.projectId}/bucket`);
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            (0, logger_1.debug)('get all buckets response from server : ' + res.body);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
+    uploadObject(bucketName, objectName, fileStream) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const extension = objectName.substring(objectName.lastIndexOf('.') + 1).toLowerCase();
+            const contentType = mime_types_1.default.lookup(extension + '');
+            const res = yield new api_1.default(Object.assign({ origin: `https://${bucketName}` +
+                    (this.opts.env === 'Development'
+                        ? '-' + this.opts.env.toLowerCase()
+                        : '') +
+                    constants_1.ORIGIN.stratusSuffix, isExternal: true }, this.opts)).put(`/${objectName}`, {
+                body: fileStream,
+                headers: {
+                    compress: 'false',
+                    'Content-Type': contentType || 'application/octet-stream'
+                },
+                json: false
+            });
+            if (res.status === 200) {
+                return res.status;
+            }
+            (0, logger_1.debug)('upload object response from server : ' + res);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
+}
+exports.default = Stratus;

package/lib/event_generate/stratus.js

@@ -0,0 +1,52 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const moment_1 = __importDefault(require("moment"));
+const runtime_store_1 = __importDefault(require("../runtime-store"));
+const constants_1 = require("../util_modules/constants");
+const js_1 = require("../util_modules/js");
+const project_1 = require("../util_modules/project");
+function generateStratusEventJson(eventJson) {
+    const userDetails = {
+        email_id: runtime_store_1.default.get('user.Email'),
+        user_id: js_1.JS.randomNumber(15),
+        is_confirmed: getRandomBoolean(),
+        last_name: js_1.JS.randomString(5),
+        first_name: js_1.JS.randomString(10),
+        zuid: js_1.JS.randomNumber(10)
+    };
+    const time = (0, moment_1.default)().format('MMM DD, YYYY hh:mm A');
+    const data = {
+        bucket_details: {
+            bucket_name: 'sample-bucket',
+            project_details: {
+                id: (0, project_1.getProjectId)(),
+                project_name: (0, project_1.getProjectName)(),
+                project_type: 'Live'
+            },
+            created_by: userDetails,
+            created_time: time,
+            modified_by: userDetails,
+            modified_time: time,
+            bucket_meta: {
+                versioning: getRandomBoolean(),
+                caching: {
+                    status: getRandomBoolean() ? 'Enabled' : 'Disabled'
+                },
+                encryption: getRandomBoolean(),
+                audit_consent: getRandomBoolean()
+            }
+        },
+        object_key: 'path1/path2/myfile.png'
+    };
+    eventJson = eventJson.replace(new RegExp(constants_1.PLACEHOLDER.event_data.rule_id, 'g'), 'NULL');
+    eventJson = eventJson.replace(new RegExp(constants_1.PLACEHOLDER.event_data.source_id, 'g'), 'NULL');
+    eventJson = eventJson.replace(new RegExp(constants_1.PLACEHOLDER.event_data.data, 'g'), JSON.stringify(data));
+    return eventJson;
+}
+exports.default = generateStratusEventJson;
+function getRandomBoolean() {
+    return js_1.JS.random(0, 1) === 1;
+}

package/lib/express_middlewares/authenticator.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const project_1 = __importDefault(require("../endpoints/lib/project"));
 const credential_1 = __importDefault(require("../internal/credential"));
+const endpoints_1 = require("../endpoints");
 exports.default = (req, _RES, next) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const projectId = req.headers['x-zc-projectid'];
@@ -34,7 +35,16 @@ exports.default = (req, _RES, next) => __awaiter(void 0, void 0, void 0, functio
     }, [false, false, false]);
     if (hasCSRF && hasADT && hasBDT) {
         req.headers['x-zc-user-type'] = 'project-user';
-        req.headers['x-zc-cookie'] = cookie;
+        try {
+            const jwtResponse = yield (yield (0, endpoints_1.credentialsAPI)()).generateJWTToken(cookie);
+            const tokenRes = yield (yield (0, endpoints_1.credentialsAPI)()).convertJwtToAuthToken(jwtResponse);
+            req.headers['x-zc-user-cred-type'] = 'token';
+            req.headers['x-zc-user-cred-token'] = tokenRes
+                .access_token;
+        }
+        catch (err) {
+            req.headers['x-zc-cookie'] = cookie;
+        }
     }
     else if (typeof authorization !== 'undefined') {
         const currentUser = yield new project_1.default({

package/lib/serve/server/lib/appsail/index.js

@@ -42,7 +42,7 @@ const startAppSail = (port, opts) => {
     const child = (0, shell_1.spawn)('node', _opts, {
         cwd: opts.target,
         stdio: 'pipe',
-        env: Object.assign({ X_ZOHO_CATALYST_LISTEN_PORT: port + '', X_ZOHO_CATALYST_RUNTIME_MEMORY: opts.memory + '', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZC_RESOURCE_NAME: opts.name + '', CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, (opts.env || {}))
+        env: Object.assign({ X_ZOHO_CATALYST_LISTEN_PORT: port + '', X_ZOHO_CATALYST_RUNTIME_MEMORY: opts.memory + '', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZC_RESOURCE_NAME: opts.name + '', CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, (opts.env || {}))
     }).RAW();
     return new Promise((_res, _rej) => {
         child.on('spawn', () => _res(child));

package/lib/serve/server/lib/java/index.js

@@ -54,6 +54,6 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
     return (0, shell_1.spawn)(spawnCommand, opts, {
         cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)),
         stdio: 'pipe',
-        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_CODE_LOCATION: targetDir + path_1.sep, X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_f = details.target) === null || _f === void 0 ? void 0 : _f.id, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
+        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_CODE_LOCATION: targetDir + path_1.sep, X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_f = details.target) === null || _f === void 0 ? void 0 : _f.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
     }).RAW();
 });

package/lib/serve/server/lib/master/utils.js

@@ -34,7 +34,7 @@ const isIamCookie = (cookieStr) => iam_cookies.some((val) => cookieStr.startsWit
 const removeSecure = (str) => str.replace(/;\s?Secure/i, '').replace(/;\s?SameSite=None/i, '');
 exports.removeSecure = removeSecure;
 const redirectByAuth = (req, res, redirectUrl) => {
-    if (req.headers['x-zc-user-cred-token'] === undefined) {
+    if (req.headers['cookie'] !== undefined) {
         res.writeHead(302, { Location: redirectUrl });
         res.end();
     }

package/lib/serve/server/lib/node/index.js

@@ -88,6 +88,6 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
     return (0, shell_1.spawn)('node', opts, {
         cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)),
         stdio: 'pipe',
-        env: Object.assign({ NODE_PATH: targetSource + path_1.sep + 'node_modules', X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_g = details.target) === null || _g === void 0 ? void 0 : _g.id, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
+        env: Object.assign({ NODE_PATH: targetSource + path_1.sep + 'node_modules', X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_g = details.target) === null || _g === void 0 ? void 0 : _g.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
     }).RAW();
 });

package/lib/serve/server/lib/node/server/package-lock.json

@@ -0,0 +1,12 @@
+{
+  "name": "catalyst-cli-node-runtime",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "catalyst-cli-node-runtime",
+      "version": "1.0.0"
+    }
+  }
+}

package/lib/serve/server/lib/python/index.js

@@ -36,7 +36,7 @@ exports.default = (details) => __awaiter(void 0, void 0, void 0, function* () {
         const child = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), opts, {
             cwd: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)),
             stdio: 'pipe',
-            env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_a = details.target) === null || _a === void 0 ? void 0 : _a.id, X_ZOHO_CATALYST_CODE_LOCATION: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: details.httpPort.toString(), CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
+            env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_a = details.target) === null || _a === void 0 ? void 0 : _a.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_CODE_LOCATION: targetSource === null || targetSource === void 0 ? void 0 : targetSource.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build)), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: details.httpPort.toString(), CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, details.target.env_var)
         }).RAW();
         child.on('spawn', () => __awaiter(void 0, void 0, void 0, function* () {
             yield (0, http_functions_1.checkIfRuntimeServerRunning)(details.httpPort.toString());

package/lib/shell/dependencies/http-functions.js

@@ -117,7 +117,7 @@ class HttpFunctions {
             const slave = (0, shell_1.spawn)(opts.command, opts.options, {
                 cwd: opts.pth,
                 stdio: 'pipe',
-                env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, CATALYST_PROJECT_TIMEZONE: (0, project_2.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, opts.envVars)
+                env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PROJECT_TIMEZONE: (0, project_2.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, opts.envVars)
             }).RAW();
             (_a = slave.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
                 (0, logger_2.info)(Buffer.isBuffer(data) ? data.toString() : data);

package/lib/shell/dependencies/invoker/integ/java/JavaintegInvoker.java

@@ -123,6 +123,7 @@ public class JavaintegInvoker {
 		catalystConfig.put("project_key", project.get("x-zc-project-key").toString());
 		catalystConfig.put("project_domain", project.get("x-zc-project-domain").toString());
 		catalystConfig.put("environment", project.get("x-zc-environment").toString());
+								
 
 		ZCThreadLocal.putValue("CATALYST_CONFIG", catalystConfig.toString());
 	}

package/lib/shell/dependencies/local-function.js

@@ -158,7 +158,7 @@ class LocalFunction {
                     this.slave = (0, shell_1.spawn)('node', slaveOptions, {
                         cwd: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name),
                         stdio: 'pipe',
-                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_h = this.target) === null || _h === void 0 ? void 0 : _h.id, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
+                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_h = this.target) === null || _h === void 0 ? void 0 : _h.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
                     }).RAW();
                 }
                 else if ((_j = this.target.stack) === null || _j === void 0 ? void 0 : _j.startsWith(runtime_1.default.language.java.value)) {
@@ -196,7 +196,7 @@ class LocalFunction {
                     this.slave = (0, shell_1.spawn)(spawnCommand, slaveOptions, {
                         cwd: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name),
                         stdio: 'pipe',
-                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_k = this.target) === null || _k === void 0 ? void 0 : _k.id, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
+                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_k = this.target) === null || _k === void 0 ? void 0 : _k.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone) }, this.target.env_var)
                     }).RAW();
                 }
                 else if ((_l = this.target.stack) === null || _l === void 0 ? void 0 : _l.startsWith(runtime_1.default.language.python.value)) {
@@ -211,7 +211,7 @@ class LocalFunction {
                     this.slave = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), slaveOptions, {
                         cwd: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name),
                         stdio: 'pipe',
-                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_o = this.target) === null || _o === void 0 ? void 0 : _o.id, X_ZOHO_CATALYST_CODE_LOCATION: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: runTimePort.toString(), X_ZOHO_DATA_URL: `http://localhost:${runTimePort}/data`, X_ZOHO_CALLBACK_URL: `http://localhost:${runTimePort}/callback`, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), X_ZOHO_ADMIN_CRED_TOKEN: 'dummy', X_ZOHO_PROJECT_SECRET_KEY: 'dummy', X_ZOHO_CATALYST_ORG: (0, project_1.getEnvId)(), X_ZOHO_CATALYST_ENVIRONMENT: 'Local', X_ZOHO_JOBMETA_JOBID: 'dummy', CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[this.target.type] }, this.target.env_var)
+                        env: Object.assign({ X_ZOHO_CATALYST_IS_LOCAL: 'true', X_ZOHO_CATALYST_FUNCTION_LOADED: 'true', X_ZOHO_CATALYST_ACCOUNTS_URL: constants_1.ORIGIN.auth, X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin, X_ZOHO_CATALYST_RESOURCE_ID: (_o = this.target) === null || _o === void 0 ? void 0 : _o.id, X_ZOHO_STRATUS_RESOURCE_SUFFIX: constants_1.ORIGIN.stratusSuffix, X_ZOHO_CATALYST_CODE_LOCATION: (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, this.target.name), X_ZOHO_CATALYST_SERVER_LISTEN_PORT: runTimePort.toString(), X_ZOHO_DATA_URL: `http://localhost:${runTimePort}/data`, X_ZOHO_CALLBACK_URL: `http://localhost:${runTimePort}/callback`, CATALYST_PROJECT_TIMEZONE: (0, project_1.getProjectTimezone)(Intl.DateTimeFormat().resolvedOptions().timeZone), X_ZOHO_ADMIN_CRED_TOKEN: 'dummy', X_ZOHO_PROJECT_SECRET_KEY: 'dummy', X_ZOHO_CATALYST_ORG: (0, project_1.getEnvId)(), X_ZOHO_CATALYST_ENVIRONMENT: 'Local', X_ZOHO_JOBMETA_JOBID: 'dummy', CATALYST_FUNCTION_TYPE: constants_1.REMOTE_REF.functions.type[this.target.type] }, this.target.env_var)
                     }).RAW();
                     this.slave.once('spawn', () => __awaiter(this, void 0, void 0, function* () {
                         var _r;

package/lib/util_modules/constants/lib/event-action.js

@@ -9,6 +9,7 @@ exports.default = Object.freeze({
     [event_source_1.default.cache]: ['Put'],
     [event_source_1.default.user]: ['SignUp', 'Delete'],
     [event_source_1.default.filestore]: ['Upload', 'Download'],
+    [event_source_1.default.stratus]: ['Object Upload', 'Object Download', 'Object Update', 'Object Delete'],
     [event_source_1.default.webapp]: ['Success'],
     [event_source_1.default.github]: ['Success', 'Failure'],
     [event_source_1.default.custom]: ['Produce']

package/lib/util_modules/constants/lib/event-source.js

@@ -6,6 +6,7 @@ exports.default = Object.freeze({
     user: 'UserManagement',
     custom: 'Custom',
     filestore: 'Filestore',
+    stratus: 'Stratus',
     webapp: 'Webapp',
     github: 'Github'
 });

package/lib/util_modules/constants/lib/scopes.js

@@ -66,8 +66,14 @@ exports.default = Object.freeze({
     tunneling_read: 'ZohoCatalyst.tunneling.READ',
     tunneling_update: 'ZohoCatalyst.tunneling.UPDATE',
     iam_profile: 'AaaServer.profile.READ',
-    stratus_create: 'Stratus.sdkop.CREATE',
-    stratus_read: 'Stratus.sdkop.READ',
+    object_creation: 'Stratus.fileop.CREATE',
+    object_operation: 'Stratus.fileop.ALL',
+    stratus_bucket_operation: 'Stratus.bucketop.ALL',
+    object_update: 'ZohoCatalyst.buckets.objects.UPDATE',
+    object_read: 'ZohoCatalyst.buckets.objects.READ',
+    object_delete: 'ZohoCatalyst.buckets.objects.DELETE',
+    bucket_read: 'ZohoCatalyst.buckets.READ',
+    object_create: 'ZohoCatalyst.buckets.objects.CREATE',
     pipline_read: 'ZohoCatalyst.pipeline.READ',
     pipeline_exec_create: 'ZohoCatalyst.pipeline.execution.CREATE'
 });

package/lib/util_modules/constants/lib/urls.js

@@ -68,6 +68,13 @@ class URL {
         }
         return URL._console.replace('.com', dc.ext);
     }
+    static get stratusSuffix() {
+        const dc = (0, dc_js_1.getActiveDCType)();
+        if (dc === undefined) {
+            return URL._stratusSuffix;
+        }
+        return URL._stratusSuffix.replace('.com', dc.ext);
+    }
 }
 exports.default = URL;
 URL._auth = (0, env_js_1.envOverride)('CATALYST_AUTH_URL', 'https://accounts.zoho.com');
@@ -77,6 +84,7 @@ URL._app = (0, env_js_1.envOverride)('CATALYST_APP_URL', 'https://catalystserver
 URL._appSailDomain = (0, env_js_1.envOverride)('CATALYST_APPSAIL_URL', 'https://catalystappsail.com');
 URL._zohoStatic = (0, env_js_1.envOverride)('ZOHO_STATIC', 'https://www.zoho.com/catalyst');
 URL._console = (0, env_js_1.envOverride)('CATALYST_CONSOLE_URL', 'https://console.catalyst.zoho.com');
+URL._stratusSuffix = (0, env_js_1.envOverride)('CATALYST_STRATUS_RESOURCE_SUFFIX', '.zohostratus.com');
 URL.zohoCDN = (0, env_js_1.envOverride)('ZOHO_CDN', 'https://static.zohocdn.com');
 URL.external = Object.freeze({
     gitHubAPI: 'https://api.github.com',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.18.0-beta.4",
+	"version": "1.18.0-beta.5",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
@@ -70,6 +70,7 @@
 		"@types/inquirer-autocomplete-prompt": "^1.3.4",
 		"@types/jest": "^27.4.1",
 		"@types/lodash": "^4.14.182",
+		"@types/mime-types": "^2.1.4",
 		"@types/minimatch": "^5.1.2",
 		"@types/node": "^20.12.7",
 		"@types/request": "^2.48.8",