zcatalyst-cli 1.22.0 → 1.22.1

package/lib/express_middlewares/auth-checker.js

@@ -34,7 +34,8 @@ exports.default = (req, res, next) => {
                 break;
             case 'OAuth':
                 const oauthHeader = req.get('authorization');
-                if (oauthHeader !== undefined) {
+                const userType = req.headers['x-zc-user-type'];
+                if (oauthHeader !== undefined && userType === 'admin') {
                     accumulator[0] = type;
                     accumulator[1] = oauthHeader;
                 }
@@ -45,6 +46,13 @@ exports.default = (req, res, next) => {
                     accumulator[0] = type;
                     accumulator[1] = csrfToken;
                 }
+                else {
+                    const authHeader = req.get('authorization');
+                    if (authHeader !== undefined) {
+                        accumulator[0] = type;
+                        accumulator[1] = authHeader;
+                    }
+                }
                 break;
         }
         return accumulator;

package/lib/internal/command.js

@@ -169,7 +169,7 @@ class Command {
                     arg: [(0, ansi_colors_1.bold)(cmd.name()), (0, ansi_colors_1.bold)('CI=true catalyst help')]
                 }));
             }
-            if (programArgs.slice(-1)[0].args.length > argCount &&
+            if (programArgs.slice(-1)[0].args.filter((_arg) => _arg.trim() !== '').length > argCount &&
                 !this.allowUnknownOptions) {
                 return (0, errorOut_1.default)(new index_js_1.default('Too many arguments', {
                     exit: 1,

package/lib/serve/features/index.d.ts

@@ -1,7 +1,8 @@
 import { IFnTarget } from '../../fn-utils/lib/common.js';
 import { TAppSailServerDetails } from './appsail.js';
+import { TSlateServerDetails } from './slate.js';
 export declare function client(): Promise<void>;
 export declare function functions(): Promise<Array<IFnTarget>>;
 export declare function apig(): Promise<void>;
 export declare function appsail(): Promise<Array<TAppSailServerDetails>>;
-export declare function slate(): Promise<void>;
+export declare function slate(): Promise<Array<TSlateServerDetails>>;

package/lib/serve/features/index.js

@@ -86,8 +86,8 @@ function appsail() {
 exports.appsail = appsail;
 function slate() {
     return __awaiter(this, void 0, void 0, function* () {
-        const appSailModule = yield Promise.resolve().then(() => __importStar(require('./slate.js')));
-        yield appSailModule.default();
+        const slateModule = yield Promise.resolve().then(() => __importStar(require('./slate.js')));
+        return slateModule.default();
     });
 }
 exports.slate = slate;

package/lib/serve/features/slate.d.ts

@@ -8,5 +8,5 @@ export type TSlateServerDetails = ISlateConfig & {
         kill: boolean;
     };
 };
-declare const _default: () => Promise<void>;
+declare const _default: () => Promise<Array<TSlateServerDetails>>;
 export default _default;

package/lib/serve/features/slate.js

@@ -24,7 +24,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const optionTargets = slate_utils_1.slateUtils.filterTargets(allTargets || []);
     if (optionTargets.length === 0) {
         (0, logger_1.debug)('Slate targets are empty');
-        return;
+        return [];
     }
     const validated = (0, slate_utils_1.validateServeCommand)(optionTargets);
     const filledTargets = yield Promise.all(validated.map((targ) => __awaiter(void 0, void 0, void 0, function* () {
@@ -46,4 +46,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         return Object.assign(Object.assign({}, targ), { port: { slate: slatePort, proxy: proxyPort }, trigger: { kill: false } });
     })));
     runtime_store_1.default.set('context.slate.targets', filledTargets);
+    return filledTargets;
 });

package/lib/serve/index.js

@@ -136,7 +136,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             }
         }
         if (serveTargets.includes('slate')) {
-            const slates = runtime_store_1.default.get('context.slate.targets', []);
+            const slates = yield features.slate();
             const validSlates = slates.filter((slate) => {
                 if (!slate.validity.valid) {
                     (0, index_1.warning)('skipping serve of Slate service [' +

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

@@ -23,7 +23,6 @@ const logger_1 = __importDefault(require("../../../../express_middlewares/logger
 const project_1 = __importDefault(require("../../../../express_middlewares/project"));
 const unknown_req_proxy_1 = __importDefault(require("./unknown-req-proxy"));
 const url_rewriter_1 = __importDefault(require("../../../../express_middlewares/url-rewriter"));
-const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
 const constants_1 = require("../../../../util_modules/constants");
 const js_1 = require("../../../../util_modules/js");
 const index_1 = require("../../../../util_modules/logger/index");
@@ -35,6 +34,7 @@ const appsail_1 = require("./appsail");
 const web_client_1 = require("./web-client");
 const functions_1 = require("./functions");
 const slate_1 = require("./slate");
+const apig_1 = __importDefault(require("../../../features/apig"));
 function spinUpMaster(listenPort, { otherServerDetails, appSailDetails, slateDetails }) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
@@ -49,7 +49,7 @@ function spinUpMaster(listenPort, { otherServerDetails, appSailDetails, slateDet
             key: (0, project_2.getDomainKey)(),
             env_name: (0, project_2.getEnvName)()
         };
-        const rules = runtime_store_1.default.get('context.apig.local.config', -1);
+        const rules = (yield (0, apig_1.default)()) || -1;
         const customProxyUrl = (0, option_1.getOptionValue)('proxy');
         const app = (0, express_1.default)();
         let systemRoutes;

package/package.json

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