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

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

@@ -54,6 +54,7 @@ exports.default = new command_1.default('event:generate <source> <action>')
     .needs('auth')
     .action(function generate(source, action) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const unknownArgs = (0, option_1.getUnknownOpts)([]);
         if (unknownArgs.length % 2 !== 0) {
             throw new error_1.default('Unknown options are not provided as key value pairs', {
@@ -175,7 +176,7 @@ exports.default = new command_1.default('event:generate <source> <action>')
                     break;
             }
         });
-        const sourceModule = (yield Promise.resolve().then(() => __importStar(require('../../../event_generate/' + source)))).default;
+        const sourceModule = (yield (_a = '../../../event_generate/' + source, Promise.resolve().then(() => __importStar(require(_a))))).default;
         eventJsonContent = yield sourceModule(eventJsonContent, optionMap, action);
         const jsonContent = JSON.parse(eventJsonContent);
         Object.keys(jsonContent).forEach((key) => {

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

@@ -46,6 +46,7 @@ exports.default = new command_1.default('event:generate:integ <service>')
     .needs('rc')
     .needs('auth')
     .action((service) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const availableServices = Object.keys(constants_1.INTEG.service_map);
     if (!availableServices.includes(service)) {
         throw new error_1.default('Unknown service requested', {
@@ -56,7 +57,7 @@ exports.default = new command_1.default('event:generate:integ <service>')
     }
     const inputs = (0, option_1.getOptionValue)('inputs', '');
     const serviceValue = constants_1.INTEG.service_map[service];
-    const serviceModule = (yield Promise.resolve().then(() => __importStar(require(`../../../event_generate/integration/${serviceValue}`))))
+    const serviceModule = (yield (_a = `../../../event_generate/integration/${serviceValue}`, Promise.resolve().then(() => __importStar(require(_a)))))
         .default;
     const payload = yield serviceModule(inputs);
     process.stdout.write(payload + '\n');

package/lib/commands/index.js

@@ -36,7 +36,8 @@ exports.default = (client) => {
     function loadCommand(name) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                const cmd = (yield Promise.resolve().then(() => __importStar(require('./' + name.split(':').join('/'))))).default;
+                var _a;
+                const cmd = (yield (_a = './' + name.split(':').join('/'), Promise.resolve().then(() => __importStar(require(_a))))).default;
                 try {
                     cmd.register(client);
                     resolve();

package/lib/init/features/client/index.js

@@ -38,6 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = __importDefault(require("../../../prompt/index.js"));
 const index_js_2 = require("../../../util_modules/constants/index.js");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const clientInitAnswer = yield index_js_1.default.ask(index_js_1.default.question('clientFlavour', 'Choose the type of client to initialise: ', {
         type: 'list',
         choices: index_js_2.PLUGIN.client.map((plugin) => {
@@ -47,5 +48,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             });
         })
     }));
-    return (yield Promise.resolve().then(() => __importStar(require('./initializers/' + clientInitAnswer.clientFlavour)))).default();
+    return (yield (_a = './initializers/' + clientInitAnswer.clientFlavour, Promise.resolve().then(() => __importStar(require(_a))))).default();
 });

package/lib/internal/command.js

@@ -229,7 +229,8 @@ class Command {
                 (0, logger_1.debug)(e);
             }
             yield Promise.all(js_1.JS.map(this.beforeRunners, (before) => __awaiter(this, void 0, void 0, function* () {
-                const beforeModule = (yield Promise.resolve().then(() => __importStar(require('../command_needs/' + before.fn)))).default;
+                var _a;
+                const beforeModule = (yield (_a = '../command_needs/' + before.fn, Promise.resolve().then(() => __importStar(require(_a))))).default;
                 return beforeModule.call(this, before.args);
             })));
             return this.cmdAction.call(this, ...args);

package/lib/migration/index.js

@@ -44,6 +44,7 @@ const rc_1 = __importDefault(require("../internal/rc"));
 const fs_1 = require("../util_modules/fs");
 const logger_1 = require("../util_modules/logger");
 const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     if (migFiles.length <= idx) {
         return Promise.resolve();
     }
@@ -54,7 +55,7 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
         return runMigration(rc, migFiles, ++idx);
     }
     try {
-        const migModule = yield Promise.resolve().then(() => __importStar(require(migFile)));
+        const migModule = yield (_a = migFile, Promise.resolve().then(() => __importStar(require(_a))));
         if (migModule.isRequire()) {
             (0, logger_1.debug)('migration started for v' + currentMigFileVersion);
             migModule.migrate();
@@ -83,6 +84,7 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
     return runMigration(rc, migFiles, ++idx);
 });
 const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, function* () {
+    var _b;
     if (migFiles.length === 0) {
         return;
     }
@@ -96,7 +98,7 @@ const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, funct
         return runGlobalMigration(migFiles);
     }
     try {
-        const migModule = yield Promise.resolve().then(() => __importStar(require(migFile)));
+        const migModule = yield (_b = migFile, Promise.resolve().then(() => __importStar(require(_b))));
         if (migModule.isRequire()) {
             (0, logger_1.debug)('migration started for v' + currentMigFileVersion);
             migModule.migrate();

package/lib/optional-import.js

@@ -42,6 +42,7 @@ const async_js_1 = require("./util_modules/fs/lib/async.js");
 const error_js_1 = __importDefault(require("./error.js"));
 const ansi_colors_1 = require("ansi-colors");
 exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     if (name === (0, path_1.basename)(name)) {
         const projectModulePath = (0, project_js_1.resolveProjectPath)((0, path_1.join)(source, 'node_modules', name));
         const projectModulePathExists = yield (0, async_js_1.dirExists)(projectModulePath);
@@ -53,7 +54,7 @@ exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function*
             });
         }
         app_module_path_1.default.addPath(projectModulePath);
-        return Promise.resolve().then(() => __importStar(require(projectModulePath)));
+        return _a = projectModulePath, Promise.resolve().then(() => __importStar(require(_a)));
     }
     const projectModulePath = (0, project_js_1.resolveProjectPath)(name);
     const projectModulePathExists = yield (0, async_js_1.dirExists)(projectModulePath);
@@ -65,5 +66,5 @@ exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function*
         });
     }
     app_module_path_1.default.addPath(projectModulePath);
-    return Promise.resolve().then(() => __importStar(require(projectModulePath)));
+    return _b = projectModulePath, Promise.resolve().then(() => __importStar(require(_b)));
 });

package/lib/prompt/types/tree.js

@@ -26,6 +26,9 @@ var ETreeState;
     ETreeState[ETreeState["EXPANDED"] = 3] = "EXPANDED";
 })(ETreeState || (ETreeState = {}));
 class TreeNode {
+    get indent() {
+        return this.level * 2;
+    }
     constructor(root) {
         _TreeNode_instances.add(this);
         this.open = false;
@@ -36,9 +39,6 @@ class TreeNode {
         this.level = 1;
         this.root = root;
     }
-    get indent() {
-        return this.level * 2;
-    }
     addNode(node) {
         if (node instanceof TreeNode) {
             this.leaves.push(node);

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

@@ -23,12 +23,12 @@ function addAppSailRoutes(app, details, proxy, unknownProxy) {
         req.url = req.originalUrl;
         unknownProxy(req, res);
     }));
-    app.use('/baas/logout', (req, res) => {
+    app.use('/__catalyst', (req, res) => __awaiter(this, void 0, void 0, function* () {
         req.url = req.originalUrl;
         unknownProxy(req, res);
-    });
+    }));
     ((_b = (_a = details.target) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.catalyst_auth) === true &&
-        app.use(['/__catalyst', '/accounts', '/oauthorize'], (req, res) => {
+        app.use(['/accounts', '/oauthorize'], (req, res) => {
             if (req.url.includes('/appsail/logout_redirect')) {
                 res.redirect(typeof req.query.service_url === 'string' ? req.query.service_url : '/');
                 return;

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

@@ -20,6 +20,17 @@ const error_1 = __importDefault(require("../../../../error"));
 const project_1 = require("../../../../util_modules/project");
 const http_proxy_1 = require("http-proxy");
 const logger_1 = require("../../../../util_modules/logger");
+const iam_cookies = [
+    'ZD_CSRF_TOKEN',
+    '_iamadt_client',
+    '_iambdt_client',
+    '_zcsr_tmp',
+    'iamcsr',
+    'zalb',
+    'stk',
+    'JSESSIONID'
+];
+const isIamCookie = (cookieStr) => iam_cookies.some((val) => cookieStr.startsWith(val));
 const removeSecure = (str) => str.replace(/;\s?Secure/i, '').replace(/;\s?SameSite=None/i, '');
 exports.removeSecure = removeSecure;
 const redirectByAuth = (req, res, redirectUrl) => {
@@ -68,17 +79,16 @@ const createProxyServer = (port) => {
 };
 exports.createProxyServer = createProxyServer;
 const proxyResponseHandler = ({ systemRoutes, signInRedirect = '/app/local-redirect' }) => (proxyRes, req, res) => {
+    var _a, _b;
     if (!req.url) {
         return;
     }
-    if (req.url.startsWith('/oauthorize')) {
-        const set = proxyRes.headers['set-cookie'];
-        if (set) {
-            const result = Array.isArray(set) ? set.map(exports.removeSecure) : (0, exports.removeSecure)(set);
-            proxyRes.headers['set-cookie'] = result;
-        }
-    }
-    else if (req.url.startsWith('/baas') || req.url.startsWith('/__catalyst')) {
+    proxyRes.headers['set-cookie'] = (_a = proxyRes.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a.map((cookie) => {
+        if (isIamCookie(cookie))
+            return (0, exports.removeSecure)(cookie);
+        return cookie;
+    });
+    if (req.url.startsWith('/baas') || req.url.startsWith('/__catalyst')) {
         if (req.url.includes('/signin-redirect')) {
             if (systemRoutes === undefined) {
                 (0, exports.redirectByAuth)(req, res, signInRedirect);
@@ -107,12 +117,8 @@ const proxyResponseHandler = ({ systemRoutes, signInRedirect = '/app/local-redir
             }
         }
     }
-    else if (req.url.startsWith('/accounts')) {
-        const set = proxyRes.headers['set-cookie'] || [];
-        if (req.url.includes('/signin')) {
-            set.push('IAM_TEST_COOKIE=IAM_TEST_COOKIE; Domain=localhost; Path=/');
-        }
-        proxyRes.headers['set-cookie'] = set.map(exports.removeSecure);
+    else if (req.url.startsWith('/accounts') && req.url.includes('/signin')) {
+        (_b = proxyRes.headers['set-cookie']) === null || _b === void 0 ? void 0 : _b.push('IAM_TEST_COOKIE=IAM_TEST_COOKIE; Domain=localhost; Path=/');
     }
 };
 exports.proxyResponseHandler = proxyResponseHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.18.0-beta.3",
+	"version": "1.18.0-beta.4",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
@@ -94,6 +94,7 @@
 		"build:watch": "gulp watch",
 		"clean": "gulp cleanup",
 		"test:unit": "jest --config jest.config.js",
+		"lint:nofix": "eslint --ext .ts src/ --color",
 		"lint:src": "eslint --ext .ts src/ --fix --color",
 		"lint:unit": "eslint --ext .js,.ts test/ --fix --color",
 		"lint": "run-p lint:src lint:unit",