zcatalyst-cli 1.15.0 → 1.15.2

package/lib/authentication/login.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.missingScopes = void 0;
 const ansi_colors_1 = require("ansi-colors");
 const http_1 = require("http");
 const server_js_1 = require("../util_modules/server.js");
@@ -30,6 +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");
+exports.missingScopes = {
+    [constants_1.DC_TYPE.au.value]: ['zia_hub'],
+    [constants_1.DC_TYPE.eu.value]: ['zia_hub']
+};
 class Login {
     constructor(localhost = true, user = true) {
         this.localhost = localhost;
@@ -58,7 +63,7 @@ class Login {
             '/oauth/v2/auth?' +
             js_1.JS.map({
                 client_id: constants_1.AUTH.web.id,
-                scope: js_1.JS.values(constants_1.SCOPE).join(' '),
+                scope: js_1.JS.values(this._getScopes()).join(' '),
                 response_type: 'code',
                 access_type: 'offline',
                 prompt: 'consent',
@@ -115,7 +120,7 @@ class Login {
                 qs: {
                     client_id: constants_1.AUTH.mobile.id,
                     client_secret: constants_1.AUTH.mobile.secret,
-                    scope: js_1.JS.values(constants_1.SCOPE).join(' '),
+                    scope: js_1.JS.values(this._getScopes()).join(' '),
                     grant_type: 'device_token',
                     code
                 },
@@ -215,7 +220,7 @@ class Login {
                 origin: constants_1.ORIGIN.auth,
                 qs: {
                     client_id: constants_1.AUTH.mobile.id,
-                    scope: js_1.JS.values(constants_1.SCOPE).join(' '),
+                    scope: js_1.JS.values(this._getScopes()).join(' '),
                     grant_type: 'device_request',
                     access_type: 'offline',
                     prompt: 'consent'
@@ -260,7 +265,7 @@ class Login {
                 return {
                     user: userDetails,
                     token: result,
-                    scopes: js_1.JS.values(constants_1.SCOPE),
+                    scopes: js_1.JS.values(this._getScopes()),
                     dc: (0, dc_1.getActiveDC)()
                 };
             }
@@ -322,7 +327,7 @@ class Login {
                             resolve({
                                 user: userDetails,
                                 token: result,
-                                scopes: js_1.JS.values(constants_1.SCOPE),
+                                scopes: js_1.JS.values(this._getScopes()),
                                 dc: (0, dc_1.getActiveDC)()
                             });
                         }
@@ -356,5 +361,17 @@ class Login {
             });
         });
     }
+    _getScopes() {
+        const dc = (0, dc_1.getActiveDC)();
+        if (dc in exports.missingScopes) {
+            const devoidScopes = exports.missingScopes[dc];
+            const _scopes = Object.assign({}, constants_1.SCOPE);
+            devoidScopes.forEach((scope) => {
+                delete _scopes[scope];
+            });
+            return _scopes;
+        }
+        return constants_1.SCOPE;
+    }
 }
 exports.default = Login;

package/lib/commands/init.js

@@ -130,7 +130,7 @@ exports.default = new command_1.default('init [feature]')
         return saveAndComplete(config);
     }
     if (typeof feature === 'string') {
-        featureAns.features = feature;
+        featureAns.features = [feature];
     }
     runtime_store_1.default.set('context.features', featureAns.features);
     yield (yield Promise.resolve().then(() => __importStar(require('../init')))).default();

package/lib/fn-utils/lib/common.js

@@ -253,11 +253,13 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
 }
 exports.refineTargets = refineTargets;
 function refineEnvVariables(vars) {
-    return Object.entries(vars || {}).reduce((envObj, curEntry) => {
-        envObj[curEntry[0]] =
-            typeof curEntry[1] === 'object' ? JSON.stringify(curEntry[1]) : curEntry[1];
-        return envObj;
-    }, {});
+    return !vars
+        ? undefined
+        : Object.entries(vars).reduce((envObj, curEntry) => {
+            envObj[curEntry[0]] =
+                typeof curEntry[1] === 'object' ? JSON.stringify(curEntry[1]) : curEntry[1];
+            return envObj;
+        }, {});
 }
 function executeHook({ prefix, command }) {
     if ((0, option_1.getOptionValue)('ignoreScripts', false)) {

package/package.json

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