zcatalyst-cli 1.18.0-beta.12 → 1.18.0-beta.14

package/README.md

@@ -1,5 +1,5 @@
 <center>
-    <a href="https://www.zoho.com/catalyst/">
+    <a href="https://catalyst.zoho.com/
         <img width="200" height="200" src="https://www.zohowebstatic.com/sites/default/files/catalyst/catalyst-logo.svg">
     </a>
 </center>
@@ -25,7 +25,7 @@ This is the Catalyst Command Line Interface (CLI) Tool. They can be used to:
 - Interact with data in your Catalyst projects via console
 - Deploy code and assets to your Catalyst projects
 
-To get started with the Catalyst CLI, you can go through our documentation  [CLI documentation](https://www.zoho.com/catalyst/help/cli-command-reference.html).
+To get started with the Catalyst CLI, you can go through our documentation  [CLI documentation](https://docs.catalyst.zoho.com/en/cli/v1/cli-command-reference/).
 
 ## Installation
 
@@ -37,7 +37,7 @@ Then you need to install [Node.js](http://nodejs.org/) and [npm](https://npmjs.o
 **NOTE**
 
 1. Installing Node.js should install npm as well.
-2. The ZCatalyst-CLI is compatible only with node versions >=12.
+2. The ZCatalyst-CLI is compatible only with node versions >=14.
 
 ---
 
@@ -55,7 +55,7 @@ This will provide you with the globally accessible `catalyst` command.
 
 1. If you need to setup the cli in current directory alone use the same command without `-g` option.
 
-2. Alternatively you can visit [CLI Installation Documentation](https://www.zoho.com/catalyst/help/installing-catalyst-cli.html) for installation instructions.
+2. Alternatively you can visit [CLI Installation Documentation](https://docs.catalyst.zoho.com/en/getting-started/installing-catalyst-cli/) for installation instructions.
 
 ---
 
@@ -69,6 +69,7 @@ Certain command are project specific and for it to work you must be inside a pro
 
 Command | Description
 ------- | -----------
+**help** | Display the command reference or help for a specific command.
 **login** | Log the CLI in to your Catalyst account. *Requires access to a web browser*.
 **whoami** | Print the email address of the user currently logged in.
 **token:generate** | Generate a token to authenticate accessing the CLI from a remote system.
@@ -96,13 +97,16 @@ Command | Description
 **functions:shell** | Launch a node shell to test emulated functions of any stack or type, other than Advanced I/O functions.
 **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 service to Catalyst Project.
+**appsail:add** | Link an already existing AppSail app to Catalyst Project.
+**slate:link** | Configure your existing app in slate service
+**slate:create** | Create a new slate app
+**slate:unlink** | Unlink your existing slate app
 **codelib:install** | Install the code library functionalities into your project.
 **event:generate \| generate:event** | Generate sample payloads from different components or custom event sources to test Event functions.
 **event:generate:integ** | Generate sample payloads for the required integration service to test Integration functions.
+**event:generate:job** | Generate sample payloads to test the job functions
 **serve** | Serve Basic I/O and Advanced I/O functions, and the client, to test them locally.
 **deploy** | Deploy the Catalyst project and project resources to the remote console from the local directory.
-**help** | Display the command reference or help for a specific command.
 **run-script \| run** | Run a particular command script defined in *catalyst.json*.
 **config:set** |  Set catalyst configuration as a key value pair.
 **config:get** |  Get catalyst config value for the specified key.
@@ -122,3 +126,7 @@ This is to make sure your local project is upto date with the CLI version that i
 ### **v1.4.0**
 
 - Global configuration file (zcatalyst-cli-nodejs/zcatalyst-cli.json) structure change.
+
+### **v1.6.2**
+
+- Global configuration file (zcatalyst-cli-nodejs/zcatalyst-cli.json) structure change.

package/lib/commands/index.js

@@ -49,6 +49,7 @@ exports.default = (client) => {
         });
     }
     return Promise.all([
+        loadCommand('help'),
         loadCommand('login'),
         loadCommand('whoami'),
         loadCommand('token:generate'),
@@ -72,10 +73,10 @@ exports.default = (client) => {
         loadCommand('client:setup'),
         loadCommand('client:delete'),
         loadCommand('functions:setup'),
-        loadCommand('functions:delete'),
         loadCommand('functions:add'),
         loadCommand('functions:shell'),
         loadCommand('functions:config'),
+        loadCommand('functions:delete'),
         loadCommand('appsail:add'),
         loadCommand('slate:link'),
         loadCommand('slate:create'),
@@ -83,11 +84,10 @@ exports.default = (client) => {
         loadCommand('codelib:install'),
         loadCommand('event:generate'),
         loadCommand('event:generate:integ'),
-        loadCommand('zest:generate'),
         loadCommand('event:generate:job'),
+        loadCommand('zest:generate'),
         loadCommand('serve'),
         loadCommand('deploy'),
-        loadCommand('help'),
         loadCommand('run'),
         loadCommand('config:set'),
         loadCommand('config:get'),

package/lib/commands/slate/create.js

@@ -41,7 +41,7 @@ const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('slate:create')
-    .description('Configure a new slate service in catalyst')
+    .description('Configure a new slate app in catalyst')
     .option('--name <app_name>', 'Please provide name for your slate')
     .option('--framework <framework_name>', 'Specify framework name for your slate')
     .option('--template <template_url>', 'Provide template url for your slate')

package/lib/index.js

@@ -23,6 +23,6 @@ program.helpOption('-h, --help', 'Display help for a Catalyst command');
 program.showSuggestionAfterError();
 program.showHelpAfterError(`For more usage information use the ${(0, ansi_colors_1.bold)('catalyst help')} command`);
 program.addHelpText('before', fs_1.SYNC.readFile(constants_1.TEMPLATE.banner, 'utf-8') || '');
-program.addHelpText('afterAll', `\nFor detailed documentations please visit ${(0, ansi_colors_1.underline)('https://www.zoho.com/catalyst/help/cli-command-reference.html')}`);
+program.addHelpText('afterAll', `\nFor detailed documentations please visit ${(0, ansi_colors_1.underline)('https://docs.catalyst.zoho.com/en/cli/v1/cli-command-reference/')}`);
 const cli = new client_1.Client(program);
 exports.default = cli;

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

@@ -97,7 +97,7 @@ function spinUpMaster(listenPort, { otherServerDetails, appSailDetails, slateDet
             }
         }
         const proxy = (0, utils_1.createProxyServer)(listenPort);
-        const signRedirectUrl = slateDetails ? undefined : '/app/local-redirect';
+        const signRedirectUrl = slateDetails ? '/' : '/app/local-redirect';
         appSailDetails && ((_b = (_a = appSailDetails.target) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.catalyst_auth) === true
             ? proxy.on('proxyRes', (0, utils_1.proxyResponseHandler)({
                 signInRedirect: appSailDetails.target.config.login_redirect || '/'

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

@@ -11,25 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addSlateRoutes = void 0;
 function addSlateRoutes(app, details, proxy, unknownProxy) {
-    app.use('/__catalyst/sdk/init', (req, res) => __awaiter(this, void 0, void 0, function* () {
+    app.use(['/accounts', '/oauthorize', '/__catalyst'], (req, res) => {
         req.url = req.originalUrl;
         unknownProxy(req, res);
-    }));
-    app.use(['/accounts', '/oauthorize'], (req, res) => {
-        req.url = req.originalUrl;
-        unknownProxy(req, res);
-    });
-    app.use('/__catalyst', (req, res) => {
-        req.url = req.originalUrl;
-        if (req.url.includes('redirect_url')) {
-            res.redirect(req.url.split('redirect_url=')[1]);
-        }
-        else if (req.url.includes('service_url')) {
-            res.redirect(req.url.split('service_url=')[1]);
-        }
-        else {
-            unknownProxy(req, res);
-        }
     });
     app.use('/', (req, res) => __awaiter(this, void 0, void 0, function* () {
         if (req.header('catalyst-component') === 'true') {

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

@@ -89,9 +89,11 @@ const proxyResponseHandler = ({ systemRoutes, signInRedirect }) => (proxyRes, re
         return cookie;
     });
     if (req.url.startsWith('/baas') || req.url.startsWith('/__catalyst')) {
-        if (req.url.includes('/signin-redirect') && signInRedirect) {
+        const urlParams = new URLSearchParams(req.url.split('?')[1] || '');
+        const redirectUrl = urlParams.get('redirect_url') || urlParams.get('service_url') || signInRedirect;
+        if (req.url.includes('/signin-redirect') && redirectUrl) {
             if (systemRoutes === undefined) {
-                (0, exports.redirectByAuth)(req, res, signInRedirect);
+                (0, exports.redirectByAuth)(req, res, redirectUrl);
                 return;
             }
             const sourceRedirectUrl = Object.keys(systemRoutes).find((sourceUrl) => {

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

@@ -7,86 +7,55 @@ const env_js_1 = require("../../env.js");
 const dc_js_1 = require("../../../dc.js");
 const dc_type_js_1 = __importDefault(require("./dc-type.js"));
 class URL {
+    static get zohoCDN() {
+        return (0, env_js_1.envOverride)('ZOHO_CDN', mapDataCenterUrl(URL._zohoCDNBase));
+    }
     static get auth() {
-        const dc = (0, dc_js_1.getActiveDCType)();
-        if (dc === undefined) {
-            return URL._auth;
-        }
-        if (dc.value === dc_type_js_1.default.ca.value) {
-            return URL._auth.replace('.zoho.com', '.zohocloud.ca');
-        }
-        return URL._auth.replace('.com', dc.ext);
+        return (0, env_js_1.envOverride)('CATALYST_AUTH_URL', mapDataCenterUrl(URL._authBase));
     }
     static get iamPortal() {
-        const dc = (0, dc_js_1.getActiveDCType)();
-        if (dc === undefined) {
-            return URL._portal;
-        }
-        return URL._portal.replace('.com', dc.ext);
+        return (0, env_js_1.envOverride)('CATALYST_PORTAL_DOMAIN', mapDataCenterUrl(URL._portalBase));
     }
     static get admin() {
-        const dc = (0, dc_js_1.getActiveDCType)();
-        if (dc === undefined) {
-            return URL._admin;
-        }
-        if (dc.value === dc_type_js_1.default.ca.value) {
-            return URL._admin.replace('.zoho.com', '.zohocloud.ca');
-        }
-        return URL._admin.replace('.com', dc.ext);
+        return (0, env_js_1.envOverride)('CATALYST_ADMIN_URL', mapDataCenterUrl(URL._adminBase));
     }
     static get app() {
-        const dc = (0, dc_js_1.getActiveDCType)();
-        if (dc === undefined) {
-            return URL._app;
-        }
-        return URL._app.replace('.com', dc.ext);
+        return (0, env_js_1.envOverride)('CATALYST_APP_URL', mapDataCenterUrl(URL._appBase));
     }
     static get appSailDomain() {
-        const dc = (0, dc_js_1.getActiveDCType)();
-        if (dc === undefined) {
-            return URL._appSailDomain;
-        }
-        return URL._appSailDomain.replace('.com', dc.ext);
+        return (0, env_js_1.envOverride)('CATALYST_APPSAIL_URL', mapDataCenterUrl(URL._appSailDomainBase));
     }
     static get catalystStatic() {
-        const dc = (0, dc_js_1.getActiveDCType)();
-        if (dc === undefined) {
-            return URL._zohoStatic;
-        }
-        if (dc.value === dc_type_js_1.default.ca.value) {
-            return URL._zohoStatic.replace('.zoho.com', '.zohocloud.ca');
-        }
-        return URL._zohoStatic.replace(dc_type_js_1.default.us.ext, dc.ext);
+        return (0, env_js_1.envOverride)('ZOHO_STATIC', mapDataCenterUrl(URL._zohoStaticBase));
     }
     static get console() {
-        const dc = (0, dc_js_1.getActiveDCType)();
-        if (dc === undefined) {
-            return URL._console;
-        }
-        if (dc.value === dc_type_js_1.default.ca.value) {
-            return URL._console.replace('.zoho.com', '.zohocloud.ca');
-        }
-        return URL._console.replace('.com', dc.ext);
+        return (0, env_js_1.envOverride)('CATALYST_CONSOLE_URL', mapDataCenterUrl(URL._consoleBase));
     }
     static get stratusSuffix() {
-        const dc = (0, dc_js_1.getActiveDCType)();
-        if (dc === undefined) {
-            return URL._stratusSuffix;
-        }
-        return URL._stratusSuffix.replace('.com', dc.ext);
+        return (0, env_js_1.envOverride)('CATALYST_STRATUS_RESOURCE_SUFFIX', mapDataCenterUrl(URL._stratusSuffixBase));
     }
 }
 exports.default = URL;
-URL._auth = (0, env_js_1.envOverride)('CATALYST_AUTH_URL', 'https://accounts.zoho.com');
-URL._portal = (0, env_js_1.envOverride)('CATALYST_PORTAL_DOMAIN', 'https://accounts.zohoportal.com');
-URL._admin = (0, env_js_1.envOverride)('CATALYST_ADMIN_URL', 'https://api.catalyst.zoho.com');
-URL._app = (0, env_js_1.envOverride)('CATALYST_APP_URL', 'https://catalystserverless.com');
-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._authBase = 'https://accounts.zoho.com';
+URL._portalBase = 'https://accounts.zohoportal.com';
+URL._adminBase = 'https://api.catalyst.zoho.com';
+URL._appBase = 'https://catalystserverless.com';
+URL._appSailDomainBase = 'https://catalystappsail.com';
+URL._zohoStaticBase = 'https://www.zoho.com/catalyst';
+URL._consoleBase = 'https://console.catalyst.zoho.com';
+URL._stratusSuffixBase = '.zohostratus.com';
+URL._zohoCDNBase = 'https://static.zohocdn.com';
 URL.external = Object.freeze({
     gitHubAPI: 'https://api.github.com',
     gitHubWeb: 'https://github.com'
 });
+function mapDataCenterUrl(url) {
+    const dc = (0, dc_js_1.getActiveDCType)();
+    if (dc === undefined) {
+        return url;
+    }
+    if (dc.value === dc_type_js_1.default.ca.value && url.includes('.zoho.com')) {
+        return url.replace('.zoho.com', '.zohocloud.ca');
+    }
+    return url.replace(dc_type_js_1.default.us.ext, dc.ext);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.18.0-beta.12",
+	"version": "1.18.0-beta.14",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
@@ -21,7 +21,7 @@
 		"functions",
 		"zcatalyst"
 	],
-	"author": "Catalyst (https://catalyst.zoho.com)",
+	"author": "Catalyst (https://github.com/catalystbyzoho)",
 	"homepage": "https://catalyst.zoho.com",
 	"license": "MIT",
 	"dependencies": {