zcatalyst-cli 1.13.0 → 1.13.3

package/docs/apig-utils.toml

@@ -67,3 +67,8 @@ link = 'https://www.zoho.com/catalyst/help/api-gateway.html'
 context = '''Unable to recognise the ${arg[0]}(${arg[1]}) provided for the APIG rule ${arg[2]}.'''
 aid = '''Please provide a valid Catalyst URL as the ${arg[0]}.'''
 link = 'https://www.zoho.com/catalyst/help/api-gateway.html#Routing'
+
+[APIG-UTILS-15]
+context = '''The Regular Expression provided for the rule ${arg[0]} is in an Invalid format.'''
+aid = '''The Regular Expression must be in the format of ${arg[1]}. Where, ${arg[2]} is the name of dynamic value and ${arg[3]} is the Regular Expression.'''
+link = 'https://www.zoho.com/catalyst/help/api-gateway.html#Routingl'

package/lib/apig-utils.js

@@ -194,6 +194,18 @@ exports.apigUtils = {
                 .map((part, currentIdx, allParts) => {
                 if (part.startsWith('{')) {
                     const regexParts = part.slice(1, -1).split(':');
+                    if (regexParts.length !== 2) {
+                        throw new error_1.default('Invalid regex format', {
+                            errorId: 'APIG-UTILS-15',
+                            exit: 1,
+                            arg: [
+                                (0, ansi_colors_1.red)(rule.name),
+                                ansi_colors_1.italic.green(`"{var:regex}"`),
+                                (0, ansi_colors_1.bold)('var'),
+                                (0, ansi_colors_1.bold)('regex')
+                            ]
+                        });
+                    }
                     try {
                         rule.name, new RegExp(regexParts[1]);
                     }

package/lib/client-utils.js

@@ -27,6 +27,7 @@ const js_1 = require("./util_modules/js");
 const logger_1 = require("./util_modules/logger");
 const option_1 = require("./util_modules/option");
 const project_1 = require("./util_modules/project");
+const stream_1 = require("stream");
 exports.clientUtils = {
     validate: (source) => __awaiter(void 0, void 0, void 0, function* () {
         const sourceDir = source || (0, project_1.resolveProjectPath)(config_1.clientConfig.source());
@@ -76,13 +77,19 @@ exports.clientUtils = {
             runtime_store_1.default.set('context.client.valid', true);
             return packageJson;
         }
+        const logStreamPlugin = yield (0, plugin_loader_1.default)('client', 'logs').catch((err) => (0, logger_1.debug)(err));
+        let stream;
+        const streamLogFn = (chunk) => (0, logger_1.log)('info', chunk.toString(), true);
+        if (typeof logStreamPlugin === 'function') {
+            stream = yield logStreamPlugin();
+            stream instanceof stream_1.Stream && stream.on('data', streamLogFn);
+        }
         try {
             yield validatePlugin((0, option_1.getCurrentCommand)(), sourceDir, runtime_store_1.default, packageJson);
         }
         catch (e) {
             const err = error_1.default.getErrorInstance(e, {
-                skipHelp: false,
-                fileName: __filename
+                skipHelp: false
             });
             err.errorId = 'CLIENT-UTILS-5';
             err.arg = [
@@ -92,6 +99,9 @@ exports.clientUtils = {
             ];
             throw err;
         }
+        finally {
+            stream instanceof stream_1.Stream && stream.removeListener('data', streamLogFn);
+        }
         runtime_store_1.default.set('context.client.valid', true);
         return packageJson;
     }),
@@ -110,8 +120,16 @@ exports.clientUtils = {
         let source = (0, project_1.resolveProjectPath)(config_1.clientConfig.source());
         const buildPlugin = yield (0, plugin_loader_1.default)('client', 'build').catch((err) => (0, logger_1.debug)(err));
         if (typeof buildPlugin === 'function') {
+            const logStreamPlugin = yield (0, plugin_loader_1.default)('client', 'logs').catch((err) => (0, logger_1.debug)(err));
+            let stream;
+            const streamLogFn = (chunk) => (0, logger_1.log)('info', chunk.toString(), true);
+            if (typeof logStreamPlugin === 'function') {
+                stream = yield logStreamPlugin();
+                stream instanceof stream_1.Stream && stream.on('data', streamLogFn);
+            }
             try {
                 (0, logger_1.message)(`Plugin : "${runtime_store_1.default.get(`context.client.plugins.build`)}" is used for client deploy`);
+                (0, logger_1.message)('Building Application...');
                 const outputDir = yield buildPlugin(source, runtime_store_1.default);
                 if (typeof outputDir !== 'string') {
                     throw new Error('unexpected return value from build plugin, ' + source);
@@ -120,8 +138,7 @@ exports.clientUtils = {
             }
             catch (e) {
                 const err = error_1.default.getErrorInstance(e, {
-                    skipHelp: false,
-                    fileName: __filename
+                    skipHelp: false
                 });
                 err.errorId = 'CLIENT-UTILS-5';
                 err.arg = [
@@ -131,6 +148,10 @@ exports.clientUtils = {
                 ];
                 throw err;
             }
+            finally {
+                stream instanceof stream_1.Stream &&
+                    stream.removeListener('data', streamLogFn);
+            }
         }
         const exclude = config_1.clientConfig.ignore(source);
         const files = yield fs_1.ASYNC.walk(source, { exclude });

package/lib/command_needs/rc.js

@@ -145,7 +145,9 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
             arg: [(0, ansi_colors_1.bold)(constants_1.FILENAME.rc), (0, ansi_colors_1.bold)('catalyst init project'), (0, ansi_colors_1.bold)('--option')]
         });
     }
-    yield projectApi.getProject(finalProjectObj.id + '').catch((err) => __awaiter(void 0, void 0, void 0, function* () {
+    const projectDetails = yield projectApi
+        .getProject(finalProjectObj.id + '')
+        .catch((err) => __awaiter(void 0, void 0, void 0, function* () {
         if (js_1.JS.hasIn(err, 'context.response.statusCode') &&
             err.context.response.statusCode === 404) {
             (0, logger_1.message)('cleaning up ' +
@@ -164,6 +166,11 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
         }
         throw err;
     }));
+    if (projectDetails && projectDetails.project_name !== finalProjectObj.name) {
+        finalProjectObj.name = projectDetails.project_name;
+        finalProjectObj.domain.name = projectDetails.project_domain_details.project_domain_name;
+        rcInstance.upsertProject(finalProjectObj);
+    }
     if (finalProjectObj === undefined) {
         return;
     }

package/lib/express_middlewares/authenticator.js

@@ -49,6 +49,10 @@ exports.default = (req, _RES, next) => __awaiter(void 0, void 0, void 0, functio
             req.headers['x-zc-user-type'] = 'project-user';
             req.headers['x-zc-user-cred-type'] = 'token';
             req.headers['x-zc-user-cred-token'] = (_a = req.headers.authorization) === null || _a === void 0 ? void 0 : _a.split(' ')[1];
+            if (req.headers['x-zc-user-cred-token'] === undefined) {
+                next(new Error('Provided "authorization" header is not valid'));
+                return;
+            }
         }
     }
     else {
@@ -58,10 +62,5 @@ exports.default = (req, _RES, next) => __awaiter(void 0, void 0, void 0, functio
     }
     req.headers['x-zc-admin-cred-type'] = 'token';
     req.headers['x-zc-admin-cred-token'] = accessToken;
-    if (req.headers['x-zc-user-cred-token'] === undefined) {
-        next(new Error('Provided "authorization" header is not valid'));
-    }
-    else {
-        next();
-    }
+    next();
 });

package/lib/internal/rc.js

@@ -111,7 +111,7 @@ class RC {
         projectObj.env = envArr;
         return this.save();
     }
-    upsertProject(project, { base = false, ignoreEnv = true, active = false }) {
+    upsertProject(project, { base = false, ignoreEnv = true, active = false } = {}) {
         const projectArr = this.projects;
         const existingProjArr = js_1.JS.remove(projectArr, (obj) => obj.id + '' === project.id + '');
         let lastIdx = js_1.JS.size(projectArr);

package/lib/serve/server/index.js

@@ -59,6 +59,7 @@ const logger_1 = require("../../util_modules/logger");
 const shell_1 = require("../../util_modules/shell");
 const master_1 = __importDefault(require("./lib/master"));
 const ansi_colors_1 = require("ansi-colors");
+const stream_1 = require("stream");
 class Server {
     constructor() {
         this.targetDetailsArr = [];
@@ -149,6 +150,14 @@ class Server {
             const configType = details.type === 'server' ? 'functions' : details.type;
             const servePlugin = yield (0, plugin_loader_1.default)(configType, 'start', targetSource).catch((err) => (0, logger_1.debug)(err));
             if (typeof servePlugin === 'function') {
+                const logStreamPlugin = yield (0, plugin_loader_1.default)(configType, 'logs', targetSource).catch((err) => (0, logger_1.debug)(err));
+                if (typeof logStreamPlugin === 'function') {
+                    const stream = yield logStreamPlugin();
+                    if (stream instanceof stream_1.Stream) {
+                        const streamLogFn = (chunk) => (0, logger_1.log)('info', chunk.toString(), true);
+                        stream.on('data', streamLogFn);
+                    }
+                }
                 const event = servePlugin(details, masterPort).catch((e) => {
                     var _a, _b;
                     const err = error_1.default.getErrorInstance(e, {

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

@@ -198,7 +198,8 @@ class HttpFunctions {
                         'x-zc-user-cred-token': request.headers['x-zc-user-cred-token'],
                         'x-zc-admin-cred-type': request.headers['x-zc-admin-cred-type'],
                         'x-zc-admin-cred-token': request.headers['x-zc-admin-cred-token'],
-                        'x-zc-cookie': request.headers['x-zc-cookie']
+                        'x-zc-cookie': request.headers['x-zc-cookie'],
+                        'x-zc-user-type': request.headers['x-zc-user-type']
                     }));
                     slave = this.q.push({
                         command: 'java',

package/lib/shell/dependencies/invoker/bio/java/JavabioInvoker.java

@@ -169,13 +169,20 @@ public class JavabioInvoker {
 			String userType = auth.get("x-zc-user-type").toString(); // No I18N
 			clientAuth.put("user_type", userType); // No I18N
 		}
+		if (auth.containsKey("x-zc-cookie")) {
+			String cookie = auth.get("x-zc-cookie").toString();
+			clientAuth.put("cookie", cookie);
+		}
 		catalystAuth.put("client_cred", clientAuth);
+
 		ZCThreadLocal.putValue("CATALYST_AUTH", catalystAuth.toString()); // No I18N
 
+		// For backward compatibility, to be remove in future.
 		if(auth.containsKey("x-zc-cookie")) {
 			String cookie = auth.get("x-zc-cookie").toString();
 			ZCThreadLocal.putValue("client_cookie", cookie); // No I18N
 		}
+		// to be removed in future
 	}
 
 	public static void main(String[] args) {

package/lib/shell/dependencies/invoker/cron/java/JavacronInvoker.java

@@ -144,13 +144,19 @@ public class JavacronInvoker {
 			String userType = auth.get("x-zc-user-type").toString(); // No I18N
 			clientAuth.put("user_type", userType); // No I18N
 		}
+		if (auth.containsKey("x-zc-cookie")) {
+			String cookie = auth.get("x-zc-cookie").toString();
+			clientAuth.put("cookie", cookie);
+		}
 		catalystAuth.put("client_cred", clientAuth);
 		ZCThreadLocal.putValue("CATALYST_AUTH", catalystAuth.toString()); // No I18N
 
+		// For backward compatibility, to be remove in future.
 		if(auth.containsKey("x-zc-cookie")) {
 			String cookie = auth.get("x-zc-cookie").toString();
 			ZCThreadLocal.putValue("client_cookie", cookie); // No I18N
 		}
+		// to be removed in future
 	}
 
 	public static void main(String[] args) {

package/lib/shell/dependencies/invoker/event/java/JavaeventInvoker.java

@@ -144,13 +144,19 @@ public class JavaeventInvoker {
 			String userType = auth.get("x-zc-user-type").toString(); // No I18N
 			clientAuth.put("user_type", userType); // No I18N
 		}
+		if (auth.containsKey("x-zc-cookie")) {
+			String cookie = auth.get("x-zc-cookie").toString();
+			clientAuth.put("cookie", cookie);
+		}
 		catalystAuth.put("client_cred", clientAuth);
 		ZCThreadLocal.putValue("CATALYST_AUTH", catalystAuth.toString()); // No I18N
 
+		// For backward compatibility, to be remove in future.
 		if(auth.containsKey("x-zc-cookie")) {
 			String cookie = auth.get("x-zc-cookie").toString();
 			ZCThreadLocal.putValue("client_cookie", cookie); // No I18N
 		}
+		// to be removed in future
 	}
 
 	public static void main(String[] args) {

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

@@ -145,13 +145,19 @@ public class JavaintegInvoker {
 			String userType = auth.get("x-zc-user-type").toString(); // No I18N
 			clientAuth.put("user_type", userType); // No I18N
 		}
+		if (auth.containsKey("x-zc-cookie")) {
+			String cookie = auth.get("x-zc-cookie").toString();
+			clientAuth.put("cookie", cookie);
+		}
 		catalystAuth.put("client_cred", clientAuth);
 		ZCThreadLocal.putValue("CATALYST_AUTH", catalystAuth.toString()); // No I18N
 
+		// For backward compatibility, to be remove in future.
 		if (auth.containsKey("x-zc-cookie")) {
 			String cookie = auth.get("x-zc-cookie").toString();
 			ZCThreadLocal.putValue("client_cookie", cookie); // No I18N
 		}
+		// to be removed in future
 	}
 
 	public static void main(String[] args) {

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

@@ -35,6 +35,7 @@ exports.default = Object.freeze({
     folders: 'ZohoCatalyst.folders.ALL',
     file_create: 'ZohoCatalyst.files.CREATE',
     file_read: 'ZohoCatalyst.files.READ',
+    file_delete: 'ZohoCatalyst.files.DELETE',
     functions: 'ZohoCatalyst.functions.ALL',
     functions_execution: 'ZohoCatalyst.functions.EXECUTE',
     event_listeners: 'ZohoCatalyst.eventlistners.ALL',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.13.0",
+	"version": "1.13.3",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {