zcatalyst-cli 1.16.0 → 1.16.2

package/lib/authentication/login.js

@@ -31,9 +31,10 @@ const fs_1 = require("../util_modules/fs");
 const js_1 = require("../util_modules/js");
 const logger_1 = require("../util_modules/logger");
 const option_1 = require("../util_modules/option");
+const crypto_1 = require("crypto");
 exports.missingScopes = {
-    [constants_1.DC_TYPE.au.value]: ['zia_hub'],
-    [constants_1.DC_TYPE.eu.value]: ['zia_hub']
+    [constants_1.DC_TYPE.au.value]: ['quick_ml'],
+    [constants_1.DC_TYPE.eu.value]: ['quick_ml']
 };
 class Login {
     constructor(localhost = true, user = true) {
@@ -58,7 +59,7 @@ class Login {
     _getCallbackUrl(port) {
         return 'http://localhost:' + port;
     }
-    _getLoginUrl(callbackUrl) {
+    _getLoginUrl(callbackUrl, state) {
         return (constants_1.ORIGIN.auth +
             '/oauth/v2/auth?' +
             js_1.JS.map({
@@ -67,7 +68,8 @@ class Login {
                 response_type: 'code',
                 access_type: 'offline',
                 prompt: 'consent',
-                redirect_uri: callbackUrl
+                redirect_uri: callbackUrl,
+                state
             }, (v, k) => {
                 return k + '=' + encodeURIComponent(v);
             }).join('&'));
@@ -281,7 +283,8 @@ class Login {
                 var _a;
                 const dcRef = (_a = (0, dc_1.getActiveDCType)()) === null || _a === void 0 ? void 0 : _a.ref;
                 const callbackUrl = this._getCallbackUrl(port);
-                const authUrl = this._getLoginUrl(callbackUrl);
+                const nonce = encodeURIComponent((0, crypto_1.randomBytes)(16).toString());
+                const authUrl = this._getLoginUrl(callbackUrl, nonce);
                 let reqCount = 0;
                 const server = (0, http_1.createServer)((req, res) => __awaiter(this, void 0, void 0, function* () {
                     try {
@@ -296,6 +299,9 @@ class Login {
                         reqCount += 1;
                         const queryParamsObj = new url_1.URL(req.url, `http://${req.headers.host}`)
                             .searchParams;
+                        if (queryParamsObj.get('state') !== nonce) {
+                            throw new error_1.default('Invalid state param received.', { exit: 2 });
+                        }
                         const code = queryParamsObj !== undefined && queryParamsObj.get('code');
                         const _location = queryParamsObj !== undefined && queryParamsObj.get('location');
                         const location = _location === 'dev' ? 'us' : _location;
@@ -348,7 +354,7 @@ class Login {
                     }
                 }));
                 const destroyer = new server_js_1.ConnectionDestroyer(server);
-                server.listen(port, () => {
+                server.listen(port, '127.0.0.1', () => {
                     (0, logger_1.info)();
                     (0, logger_1.info)('Visit this URL on this device to log in:');
                     (0, logger_1.info)(ansi_colors_1.bold.underline(authUrl));

package/lib/command_needs/auth.js

@@ -53,6 +53,6 @@ exports.default = (inScopes = []) => {
         });
     }
     runtime_store_1.default.set('auth_scopes', requiredScopes);
-    runtime_store_1.default.set('user', config_store_1.default.get(`${activeDC}.user`, null));
-    runtime_store_1.default.set('credential', credential_1.default.init(tokenObj.token, tokenObj.temp));
+    runtime_store_1.default.set('user', config_store_1.default.get(`${activeDC}.user`));
+    runtime_store_1.default.set('credential', credential_1.default.initToken(tokenObj.token, tokenObj.temp));
 };

package/lib/command_needs/rc.js

@@ -26,9 +26,14 @@ const option_1 = require("../util_modules/option");
 const project_2 = require("../util_modules/project");
 const config_store_1 = __importDefault(require("../config-store"));
 const dc_1 = require("../dc");
+const env_1 = require("../util_modules/env");
 exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck = true } = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    const orgOpt = (0, option_1.getGlobalOptionValue)('org', null);
-    const projectOpt = (0, option_1.getGlobalOptionValue)('project', null);
+    const globOrgOpt = (0, option_1.getGlobalOptionValue)('org', null);
+    const orgOpt = globOrgOpt ? globOrgOpt : (0, env_1.getEnvVariable)('CATALYST_ORG', null);
+    const globProjectOpt = (0, option_1.getGlobalOptionValue)('project', null);
+    const projectOpt = globProjectOpt
+        ? globProjectOpt
+        : (0, env_1.getEnvVariable)('CATALYST_PROJECT', null);
     if (projectOpt !== null && orgOpt === null) {
         throw new error_1.default('Org option is needed when project option is supplied', {
             exit: 2

package/lib/commands/iac/import.js

@@ -106,7 +106,7 @@ const ensureUserAction = (deployRes) => __awaiter(void 0, void 0, void 0, functi
             }
         }));
         const destroyer = new server_js_1.ConnectionDestroyer(server);
-        server.listen(callbackPort, () => {
+        server.listen(callbackPort, '127.0.0.1', () => {
             const urlString = accessUrl.toString();
             (0, logger_1.info)();
             (0, logger_1.info)('Visit this URL on this device to proceed:');

package/lib/commands/serve.js

@@ -49,7 +49,7 @@ exports.default = new command_1.default('serve')
     .option('--except <targets>', 'serve all targets except specified (e.g. "client")')
     .option('--ignore-scripts', 'ignore the pre and post lifescycle scripts')
     .option('--no-open', 'disable opening the client automatically when served')
-    .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.functions_execution, constants_1.SCOPE.webapp])
+    .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.functions_execution, constants_1.SCOPE.webapp, constants_1.SCOPE.pdf_shot])
     .needs('config')
     .needs('rc')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/express_middlewares/unknownReqProxy.js

@@ -9,6 +9,10 @@ exports.default = (proxyInstance, customProxyUrl) => (req, res) => {
     if (req.url.length === 1 && req.url.startsWith('/')) {
         res.redirect('/app/');
     }
+    else if (req.url.match(/accounts\/p\/[0-9]+\/clientidprequest/g)) {
+        res.redirect(308, `https://${req.headers['x-zc-project-domain']}${req.url}`);
+        return;
+    }
     else if (typeof customProxyUrl === 'string' &&
         !req.url.match(/^(\/baas|\/app|\/server|\/oauthorize|\/__catalyst).*/g)) {
         (0, logger_1.debug)(`proxying "${req.url}" to "${customProxyUrl}"`);

package/lib/internal/credential.js

@@ -182,6 +182,13 @@ class Credential {
     get createdTime() {
         return this.cTime;
     }
+    static initToken(token, temp = false) {
+        if (token.slice(1, 2) !== '_' && !Credential.crypt.isEncrypted(token)) {
+            Credential.oneTimeToken = token;
+            return Credential.oneTimeToken;
+        }
+        return this.init(token, temp);
+    }
     static init(token, temp = false) {
         let tokenObj;
         if (typeof token === 'string') {

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

@@ -116,6 +116,7 @@ function spinUpMaster(listenPort, otherServerDetails) {
         });
         app.use('*/.catalyst%2Freload-script.js', (req, res) => {
             var _a;
+            req.url = '/.catalyst%2Freload-script.js';
             (_a = otherServerDetails.client) === null || _a === void 0 ? void 0 : _a.forEach((clientDetails) => {
                 const appTarget = `http://127.0.0.1:${clientDetails.httpPort}/app/`;
                 proxy.web(req, res, {
@@ -150,6 +151,9 @@ function spinUpMaster(listenPort, otherServerDetails) {
             protocolRewrite: 'http'
         })
             .on('error', (err, req, res) => {
+            if (res.writableEnded) {
+                return;
+            }
             if (res instanceof http_1.ServerResponse) {
                 res.writeHead(502, { 'Content-Type': 'json' });
             }
@@ -159,6 +163,9 @@ function spinUpMaster(listenPort, otherServerDetails) {
             console.error(err);
         })
             .on('econnreset', (err, req, res, targetUrl) => {
+            if (res.writableEnded) {
+                return;
+            }
             if (res instanceof http_1.ServerResponse) {
                 res.writeHead(502, { 'Content-Type': 'json' });
             }
@@ -266,9 +273,8 @@ function spinUpMaster(listenPort, otherServerDetails) {
                 case 'appSail': {
                     (_d = otherServerDetails.appSail) === null || _d === void 0 ? void 0 : _d.forEach((appSailDetails) => {
                         app.use('/', (req, res) => {
-                            var _a, _b, _c;
-                            if ((_b = (_a = appSailDetails.target) === null || _a === void 0 ? void 0 : _a.url) === null || _b === void 0 ? void 0 : _b.includes('/__catalyst/sdk/init.js')) {
-                                req.url = (_c = appSailDetails.target) === null || _c === void 0 ? void 0 : _c.url;
+                            var _a;
+                            if ((_a = req.url) === null || _a === void 0 ? void 0 : _a.includes('/__catalyst/sdk/init.js')) {
                                 (0, unknownReqProxy_1.default)(proxy, customProxyUrl)(req, res);
                             }
                             else {
@@ -290,7 +296,7 @@ function spinUpMaster(listenPort, otherServerDetails) {
         });
         app.use('/', (0, unknownReqProxy_1.default)(proxy, customProxyUrl));
         app.use(error_handler_1.default);
-        const expressServer = app.listen(listenPort).on('error', (err) => {
+        const expressServer = app.listen(listenPort, '127.0.0.1').on('error', (err) => {
             if (proxy) {
                 proxyDestroyer.destroy();
             }

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

@@ -69,7 +69,7 @@ const browserLogicHandler = async (req, res) => {
 
 const server = createServer(type === 'browserlogic' ? browserLogicHandler : aioHandler);
 
-server.listen(listenPort).on('error', (err) => {
+server.listen(listenPort, '127.0.0.1').on('error', (err) => {
 	// eslint-disable-next-line no-console
 	console.error(err);
 });

package/lib/serve/server/lib/web_client/server.js

@@ -174,7 +174,7 @@ function webClientServer(httpPort, source, { homepage = 'index.html', enableWatc
                 res.send('Error fetching the resource');
             });
         }));
-        const server = app.listen(httpPort).on('error', (err) => {
+        const server = app.listen(httpPort, '127.0.0.1').on('error', (err) => {
             eventListener.emit('error', err);
         });
         const expressDestroyer = new server_js_1.ConnectionDestroyer(server);

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

@@ -326,7 +326,7 @@ class HttpFunctions {
                 }
             });
             return new Promise((res) => {
-                const server = this.app.listen(httpPort, () => {
+                const server = this.app.listen(httpPort, '127.0.0.1', () => {
                     this.targets.forEach((target) => {
                         var _a, _b;
                         (_a = target.watcher) === null || _a === void 0 ? void 0 : _a.on('preparing', () => {

package/lib/util_modules/constants/lib/plugin.js

@@ -23,6 +23,6 @@ exports.default = Object.freeze({
         plugin: 'zcatalyst-cli-plugin-angular',
         runner_command: ['ng', 'new'],
         collection_name: 'zcatalyst-angular-schematics',
-        runner_package: '@angular/cli@v12-lts'
+        runner_package: '@angular/cli@v15-lts'
     }
 });

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

@@ -47,7 +47,9 @@ exports.default = Object.freeze({
     notification_web: 'ZohoCatalyst.notifications.web',
     search_read: 'ZohoCatalyst.search.READ',
     zia: 'ZohoCatalyst.mlkit.READ',
-    zia_hub: 'ZiaHub.deployment.READ',
+    quick_ml: 'QuickML.deployment.READ',
+    pdf_shot: 'ZohoCatalyst.pdfshot.execute',
+    dataverse: 'ZohoCatalyst.dataverse.execute',
     circuits_execute: 'ZohoCatalyst.circuits.execute',
     circuits_exe_read: 'ZohoCatalyst.circuits.execution.READ',
     circuits_exe_delete: 'ZohoCatalyst.circuits.execution.DELETE',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.16.0",
+	"version": "1.16.2",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
@@ -21,8 +21,8 @@
 		"functions",
 		"zcatalyst"
 	],
-	"author": "Catalyst (https://www.zoho.com/catalyst/)",
-	"homepage": "https://www.zoho.com/catalyst/",
+	"author": "Catalyst (https://catalyst.zoho.com)",
+	"homepage": "https://catalyst.zoho.com",
 	"license": "MIT",
 	"dependencies": {
 		"ansi-colors": "^4.1.1",
@@ -57,7 +57,7 @@
 		"ws": "^8.5.0",
 		"xml2js": "^0.4.23",
 		"yaml": "^2.0.1",
-		"zcatalyst-angular-schematics": "^0.1.0"
+		"zcatalyst-angular-schematics": "^1.0.0"
 	},
 	"devDependencies": {
 		"@types/app-module-path": "^2.2.0",