@sap/cli-core 2023.17.0 → 2023.18.0

package/commands/config.command/secrets.command/reset.command.d.ts

@@ -0,0 +1,3 @@
+import { Command } from "../../../types";
+declare const resetCommand: Command;
+export default resetCommand;

package/commands/config.command/secrets.command/reset.command.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/* jscpd:ignore-start */
+const SecretsStorageSingleton_1 = require("../../../cache/secrets/SecretsStorageSingleton");
+const handler_1 = require("../../handler");
+const cache_1 = require("../../handler/authentication/oauth/secretsProvider/cache");
+/* jscpd:ignore-end */
+const removeSecrets = async () => async () => {
+    await SecretsStorageSingleton_1.SecretsStorageSingleton.SINGLETON.deleteAllSecrets();
+};
+const resetCommand = {
+    type: "command",
+    command: "reset",
+    description: "remove all locally stored secrets for interactive OAuth authentication",
+    handler: (0, handler_1.createNextHandler)((0, handler_1.createParseArgumentsHandler)(), (0, handler_1.createResilientHandler)((0, cache_1.create)()), removeSecrets),
+};
+exports.default = resetCommand;

package/commands/{secrets.command → config.command/secrets.command}/show.command.d.ts

@@ -1,3 +1,3 @@
-import { Command } from "../../types";
+import { Command } from "../../../types";
 declare const showCommand: Command;
 export default showCommand;

package/commands/{secrets.command → config.command/secrets.command}/show.command.js

@@ -1,14 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("../../logger");
-const handler_1 = require("../handler");
-const cache_1 = require("../handler/authentication/oauth/secretsProvider/cache");
-const utils_1 = require("../handler/authentication/oauth/utils");
-const showSecrets = () => async () => {
+/* jscpd:ignore-start */
+const SecretsStorageSingleton_1 = require("../../../cache/secrets/SecretsStorageSingleton");
+const logger_1 = require("../../../logger");
+const handler_1 = require("../../handler");
+const cache_1 = require("../../handler/authentication/oauth/secretsProvider/cache");
+/* jscpd:ignore-end */
+const showSecrets = async () => async () => {
     const { output, error } = (0, logger_1.get)("commands.secrets-show");
     try {
-        const secrets = (0, utils_1.getSecrets)();
-        output(JSON.stringify(secrets, null, 2));
+        const secrets = await SecretsStorageSingleton_1.SecretsStorageSingleton.SINGLETON.getAllSecrets();
+        if (secrets.length === 0) {
+            output("No secrets exist");
+        }
+        else {
+            output(JSON.stringify(secrets, null, 2));
+        }
     }
     catch (err) {
         error("failed to read secrets", err);

package/commands/handler/authentication/oauth/secretsProvider/cache.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
-const constants_1 = require("../../../../../constants");
 const logger_1 = require("../../../../../logger");
-const utils_1 = require("../utils");
-const cache_1 = require("../../../../../cache");
-const create = () => () => async () => {
+const SecretsStorageSingleton_1 = require("../../../../../cache/secrets/SecretsStorageSingleton");
+const create = () => async () => async () => {
     const { error, info } = (0, logger_1.get)("commands.handler.authentication.oauth.secretsProvider.cache");
     info("reading secrets from cache");
     try {
-        (0, utils_1.setSecrets)(JSON.parse(await (0, cache_1.readFile)(constants_1.CACHE_SECRETS_FILE)));
+        // verify whether secret is available by retrieving default secret for current host
+        await SecretsStorageSingleton_1.SecretsStorageSingleton.SINGLETON.getDefaultSecret();
     }
     catch (err) {
         error("failed to read secrets from cache", err);

package/commands/handler/authentication/oauth/secretsProvider/file.js

@@ -7,13 +7,13 @@ const constants_1 = require("../../../../../constants");
 const logger_1 = require("../../../../../logger");
 const options_1 = require("../../../../../utils/options");
 const options_2 = require("../../../options");
-const utils_1 = require("../utils");
-const handler = () => async () => {
+const SecretsStorageSingleton_1 = require("../../../../../cache/secrets/SecretsStorageSingleton");
+const handler = async () => async () => {
     const { error, debug, info } = (0, logger_1.get)("commands.handler.authentication.oauth.secretsProvider.file");
     info("reading secrets from file");
     try {
         const secretsFile = (0, options_1.getOptionValueFromConfig)(constants_1.OPTION_SECRETS_FILE);
-        (0, utils_1.setSecrets)(JSON.parse(await (0, fs_extra_1.readFile)(secretsFile, "utf8")));
+        await SecretsStorageSingleton_1.SecretsStorageSingleton.SINGLETON.storeSecret(JSON.parse(await (0, fs_extra_1.readFile)(secretsFile, "utf8")));
         debug("secrets found from file");
     }
     catch (err) {

package/commands/handler/authentication/oauth/secretsProvider/options.js

@@ -6,13 +6,14 @@ const or_1 = require("../../../or");
 const options_1 = require("../../../options");
 const checkOptionsExistence_1 = require("../../../checkOptionsExistence");
 const constants_1 = require("../../../../../constants");
-const utils_1 = require("../utils");
 const logger_1 = require("../../../../../logger");
 const options_2 = require("../../../../../utils/options");
+const SecretsStorageSingleton_1 = require("../../../../../cache/secrets/SecretsStorageSingleton");
 const createOptHandler = (option) => (0, options_1.create)([option], undefined, true, true);
-const setOAuthFromOptions = () => async () => {
+const getLogger = () => (0, logger_1.get)("commands.handler.authentication.oauth.secretsProvider.options");
+const setOAuthFromOptions = async () => async () => {
     const expiresIn = (0, options_2.getOptionValueFromConfigGracefully)(constants_1.OPTION_EXPIRES_IN);
-    (0, utils_1.setSecrets)({
+    await SecretsStorageSingleton_1.SecretsStorageSingleton.SINGLETON.storeSecret({
         client_id: (0, options_2.getOptionValueFromConfigGracefully)(constants_1.OPTION_CLIENT_ID),
         client_secret: (0, options_2.getOptionValueFromConfigGracefully)(constants_1.OPTION_CLIENT_SECRET),
         authorization_url: (0, options_2.getOptionValueFromConfigGracefully)(constants_1.OPTION_AUTHORIZATION_URL),
@@ -22,9 +23,14 @@ const setOAuthFromOptions = () => async () => {
         expires_in: expiresIn ? parseInt(expiresIn, 10) : undefined,
     });
 };
-const pre = () => async () => {
-    const { info } = (0, logger_1.get)("commands.handler.authentication.oauth.secretsProvider.options");
+const pre = async () => async () => {
+    const { info } = getLogger();
     info("reading secrets from options");
 };
-const create = () => (0, next_1.create)(pre, (0, or_1.create)((0, checkOptionsExistence_1.create)(constants_1.OPTION_ACCESS_TOKEN, false), (0, next_1.create)(createOptHandler(constants_1.OPTION_CLIENT_ID), createOptHandler(constants_1.OPTION_CLIENT_SECRET), createOptHandler(constants_1.OPTION_AUTHORIZATION_URL), createOptHandler(constants_1.OPTION_TOKEN_URL), (0, options_1.create)([constants_1.OPTION_REFRESH_TOKEN, constants_1.OPTION_EXPIRES_IN]))), setOAuthFromOptions);
+const create = () => (0, next_1.create)(pre, (0, or_1.create)((0, checkOptionsExistence_1.create)(constants_1.OPTION_ACCESS_TOKEN, false), (0, next_1.create)(createOptHandler(constants_1.OPTION_CLIENT_ID), createOptHandler(constants_1.OPTION_CLIENT_SECRET), (0, options_1.create)([
+    constants_1.OPTION_AUTHORIZATION_URL,
+    constants_1.OPTION_TOKEN_URL,
+    constants_1.OPTION_REFRESH_TOKEN,
+    constants_1.OPTION_EXPIRES_IN,
+]))), setOAuthFromOptions);
 exports.create = create;

package/commands/handler/authentication/oauth/tokenProvider/getToken.js

@@ -1,81 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
-const fs_extra_1 = require("fs-extra");
-const http_1 = require("http");
 const next_1 = require("../../../next");
 const options_1 = require("../../../options");
 const constants_1 = require("../../../../../constants");
 const logger_1 = require("../../../../../logger");
 const utils_1 = require("../utils");
-const options_2 = require("../../../../../utils/options");
-const utils_2 = require("../../../../../utils/utils");
+const utils_2 = require("./utils");
+const SecretsStorageSingleton_1 = require("../../../../../cache/secrets/SecretsStorageSingleton");
 const getLogger = () => (0, logger_1.get)("commands.handler.authentication.oauth.tokenProvider.getToken");
-const retrieveCode = async () => new Promise((resolve, reject) => {
-    const PORT = parseInt(process.env.CLI_HTTP_PORT || "8080", 10);
-    const { debug } = getLogger();
-    let timeout;
-    const server = (0, http_1.createServer)(async (req, res) => {
-        clearTimeout(timeout);
-        const code = new URL(req.url ? `http://localhost:${PORT}${req.url}` : "http://no-code.damn").searchParams.get("code");
-        let file;
-        try {
-            file = await (0, fs_extra_1.readFile)(code ? constants_1.PATH_TO_SUCCESS_HTML : constants_1.PATH_TO_ERROR_HTML, "utf8");
-        }
-        catch (err) {
-            debug("failed to read file for code", code, err);
-            file =
-                "<html><body>Ops, something went wrong! Please try again.</body></html>";
-        }
-        res.writeHead(200, {
-            "Content-Type": "text/html",
-            "Content-Security-Policy": "frame-ancestors 'none'",
-            "X-Frame-Options": "DENY",
-        });
-        res.end(file, "utf8");
-        server.close();
-        if (code) {
-            resolve(code);
-        }
-        else {
-            reject(new Error("no code found in callback URI"));
-        }
-    });
-    timeout = setTimeout(() => {
-        server.close();
-        reject(new Error("Did not receive a code within 30 seconds"));
-    }, 30 * 1000);
-    server.listen(PORT);
-    debug(`started http server at localhost:${PORT}`);
-});
-const getCode = async (authorizeUrl, clientId) => {
-    const { debug } = getLogger();
-    try {
-        return (0, options_2.getOptionValueFromConfig)(constants_1.OPTION_CODE);
-    }
-    catch (err) {
-        debug("failed to retrieve code from options", err);
-        return (await Promise.all([
-            retrieveCode(),
-            (0, utils_2.openUrlInBrowser)(authorizeUrl, {
-                response_type: "code",
-                client_id: clientId,
-            }),
-        ]))[0];
-    }
-};
-const handler = () => async () => {
+const handler = async () => async () => {
     const { info: logInfo, debug } = getLogger();
     logInfo("checking token existence");
-    const secrets = (0, utils_1.getSecrets)();
+    const secrets = await SecretsStorageSingleton_1.SecretsStorageSingleton.SINGLETON.getDefaultSecret();
     if (!secrets.access_token && !secrets.refresh_token) {
         debug("access token not available, retrieving token from server");
-        const code = await getCode(secrets.authorization_url, secrets.client_id);
+        const code = await (0, utils_2.getCode)(secrets.authorization_url, secrets.client_id);
         await (0, utils_1.readToken)({
             code,
             grant_type: "authorization_code",
         });
-        await (0, utils_1.storeSecrets)();
     }
     else if (secrets.access_token) {
         debug("token available");

package/commands/handler/authentication/oauth/tokenProvider/refreshToken.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const logger_1 = require("../../../../../logger");
 const utils_1 = require("./utils");
-const create = (forceRefresh = false) => () => async () => {
+const create = (forceRefresh = false) => async () => async () => {
     try {
         await (0, utils_1.refreshToken)(forceRefresh);
     }

package/commands/handler/authentication/oauth/tokenProvider/setAuthorization.js

@@ -8,12 +8,12 @@ const options_1 = require("../../../../../utils/options");
 const utils_1 = require("../../../options/utils");
 const utils_2 = require("../../../utils");
 const utils_3 = require("../../utils");
-const utils_4 = require("../utils");
+const SecretsStorageSingleton_1 = require("../../../../../cache/secrets/SecretsStorageSingleton");
 const updateAuthorization = async () => {
     const { info: logInfo, debug } = (0, logger_1.get)("commands.handler.authentication.oauth.tokenProvider.setAuthorization");
     logInfo("setting authorization using access token");
     const config = (0, config_1.get)();
-    const secrets = (0, utils_4.getSecrets)();
+    const secrets = await SecretsStorageSingleton_1.SecretsStorageSingleton.SINGLETON.getDefaultSecret();
     const accessToken = secrets.access_token ||
         (0, options_1.getOptionValueFromConfigGracefully)(constants_1.OPTION_ACCESS_TOKEN);
     if (accessToken) {
@@ -28,8 +28,8 @@ const updateAuthorization = async () => {
     }
 };
 exports.updateAuthorization = updateAuthorization;
-const create = () => (command) => {
-    (0, utils_1.checkOptions)(constants_1.OPTION_ACCESS_TOKEN, command);
+const create = () => async (command) => {
+    await (0, utils_1.checkOptions)(constants_1.OPTION_ACCESS_TOKEN, command);
     return exports.updateAuthorization;
 };
 exports.create = create;

package/commands/handler/authentication/oauth/tokenProvider/utils.d.ts

@@ -1 +1,3 @@
 export declare const refreshToken: (forceRefresh?: boolean) => Promise<void>;
+export declare const retrieveCode: () => Promise<string>;
+export declare const getCode: (authorizeUrl: string, clientId: string) => Promise<string>;

package/commands/handler/authentication/oauth/tokenProvider/utils.js

@@ -1,12 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.refreshToken = void 0;
+exports.getCode = exports.retrieveCode = exports.refreshToken = void 0;
+const http_1 = require("http");
+const fs_extra_1 = require("fs-extra");
 const logger_1 = require("../../../../../logger");
 const utils_1 = require("../utils");
 const setAuthorization_1 = require("./setAuthorization");
+const constants_1 = require("../../../../../constants");
+const options_1 = require("../../../../../utils/options");
+const utils_2 = require("../../../../../utils/utils");
+const SecretsStorageSingleton_1 = require("../../../../../cache/secrets/SecretsStorageSingleton");
+const getLogger = () => (0, logger_1.get)("commands.handler.authentication.oauth.tokenProvider.utils.refreshToken");
 const refreshToken = async (forceRefresh = false) => {
-    const { info: logInfo, debug } = (0, logger_1.get)("commands.handler.authentication.oauth.tokenProvider.utils.refreshToken");
-    const secrets = (0, utils_1.getSecrets)();
+    const { info: logInfo, debug } = getLogger();
+    const secrets = await SecretsStorageSingleton_1.SecretsStorageSingleton.SINGLETON.getDefaultSecret();
     if ((!forceRefresh && !secrets.expires_after) || !secrets.refresh_token) {
         throw new Error("invalid secrets information");
     }
@@ -17,7 +24,6 @@ const refreshToken = async (forceRefresh = false) => {
             refresh_token: secrets.refresh_token,
             grant_type: "refresh_token",
         });
-        await (0, utils_1.storeSecrets)();
         await (0, setAuthorization_1.updateAuthorization)();
     }
     else {
@@ -25,3 +31,70 @@ const refreshToken = async (forceRefresh = false) => {
     }
 };
 exports.refreshToken = refreshToken;
+const retrieveCode = async () => 
+// eslint-disable-next-line no-async-promise-executor
+new Promise(async (resolve, reject) => {
+    const { debug, error } = getLogger();
+    try {
+        const secrets = await SecretsStorageSingleton_1.SecretsStorageSingleton.SINGLETON.getDefaultSecret();
+        const defaultPort = secrets.customClient ? "8080" : "65000";
+        const PORT = parseInt(process.env.CLI_HTTP_PORT || defaultPort, 10);
+        let timeout;
+        const server = (0, http_1.createServer)(async (req, res) => {
+            clearTimeout(timeout);
+            const code = new URL(req.url
+                ? `http://localhost:${PORT}${req.url}`
+                : "http://no-code.damn").searchParams.get("code");
+            let file;
+            try {
+                file = await (0, fs_extra_1.readFile)(code ? constants_1.PATH_TO_SUCCESS_HTML : constants_1.PATH_TO_ERROR_HTML, "utf8");
+            }
+            catch (err) {
+                debug("failed to read file for code", code, err);
+                file =
+                    "<html><body>Ops, something went wrong! Please try again.</body></html>";
+            }
+            res.writeHead(200, {
+                "Content-Type": "text/html",
+                "Content-Security-Policy": "frame-ancestors 'none'",
+                "X-Frame-Options": "DENY",
+            });
+            res.end(file, "utf8");
+            server.close();
+            if (code) {
+                resolve(code);
+            }
+            else {
+                reject(new Error("no code found in callback URI"));
+            }
+        });
+        timeout = setTimeout(() => {
+            server.close();
+            reject(new Error("Did not receive a code within 30 seconds"));
+        }, 30 * 1000);
+        server.listen(PORT);
+        debug(`started http server at localhost:${PORT}`);
+    }
+    catch (err) {
+        error("failed to instantiate server", err);
+        reject(new Error("failed to instantiate server", { cause: err }));
+    }
+});
+exports.retrieveCode = retrieveCode;
+const getCode = async (authorizeUrl, clientId) => {
+    const { debug } = getLogger();
+    try {
+        return (0, options_1.getOptionValueFromConfig)(constants_1.OPTION_CODE);
+    }
+    catch (err) {
+        debug("failed to retrieve code from options", err);
+        return (await Promise.all([
+            (0, exports.retrieveCode)(),
+            (0, utils_2.openUrlInBrowser)(authorizeUrl, {
+                response_type: "code",
+                client_id: clientId,
+            }),
+        ]))[0];
+    }
+};
+exports.getCode = getCode;

package/commands/handler/authentication/oauth/utils.d.ts

@@ -1,4 +1,3 @@
-import { Secrets } from "../../../../types";
 type Data = {
     grant_type: "refresh_token";
     refresh_token: string;
@@ -6,9 +5,6 @@ type Data = {
     grant_type: "authorization_code";
     code: string;
 };
-export declare const setSecrets: (info: Partial<Secrets>) => void;
-export declare const getSecrets: () => Secrets;
-export declare const storeSecrets: () => Promise<void>;
 export declare const calculateExpiresAfter: (expires_in: number) => number;
 export declare const isExpired: (expires_after: number) => boolean;
 export declare const readToken: (data: Data) => Promise<void>;

package/commands/handler/authentication/oauth/utils.js

@@ -3,37 +3,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readToken = exports.isExpired = exports.calculateExpiresAfter = exports.storeSecrets = exports.getSecrets = exports.setSecrets = void 0;
+exports.readToken = exports.isExpired = exports.calculateExpiresAfter = void 0;
 const qs_1 = __importDefault(require("qs"));
-const cache_1 = require("../../../../cache");
-const config_1 = require("../../../../config");
-const constants_1 = require("../../../../constants");
 const http_1 = require("../../../../utils/http");
-const setSecrets = (info) => {
-    (0, config_1.set)({ oauth: info });
-};
-exports.setSecrets = setSecrets;
-const getSecrets = () => {
-    const { oauth } = (0, config_1.get)();
-    if (oauth) {
-        return oauth;
-    }
-    throw new Error("no secrets exist");
-};
-exports.getSecrets = getSecrets;
-const storeSecrets = async () => {
-    await (0, cache_1.writeFile)(constants_1.CACHE_SECRETS_FILE, JSON.stringify((0, exports.getSecrets)()));
-};
-exports.storeSecrets = storeSecrets;
+const SecretsStorageSingleton_1 = require("../../../../cache/secrets/SecretsStorageSingleton");
 const calculateExpiresAfter = (expires_in) => Math.floor(Date.now() / 1000) + expires_in - 10;
 exports.calculateExpiresAfter = calculateExpiresAfter;
 const isExpired = (expires_after) => expires_after <= (0, exports.calculateExpiresAfter)(10);
 exports.isExpired = isExpired;
 const readToken = async (data) => {
-    const secrets = (0, exports.getSecrets)();
+    const secrets = await SecretsStorageSingleton_1.SecretsStorageSingleton.SINGLETON.getDefaultSecret();
     if (!secrets.token_url || !secrets.client_id || !secrets.client_secret) {
         throw new Error("invalid secrets information");
     }
+    const body = {
+        ...data,
+        response_type: "token",
+    };
+    if (!secrets.customClient) {
+        body.client_id = secrets.client_id;
+    }
     const info = (await (0, http_1.fetch)({
         method: "POST",
         url: secrets.token_url,
@@ -42,15 +31,12 @@ const readToken = async (data) => {
             password: secrets.client_secret,
         },
         headers: {
-            "x-sap-sac-custom-auth": true,
+            "x-sap-sac-custom-auth": !!secrets.customClient,
             "content-type": "application/x-www-form-urlencoded",
         },
-        data: qs_1.default.stringify({
-            ...data,
-            response_type: "token",
-        }),
+        data: qs_1.default.stringify(body),
     })).data;
-    (0, exports.setSecrets)({
+    await SecretsStorageSingleton_1.SecretsStorageSingleton.SINGLETON.storeSecret({
         ...info,
         expires_after: (0, exports.calculateExpiresAfter)(info.expires_in),
     });

package/commands/handler/authentication/passcode/function.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const config_1 = require("../../../../config");
 const constants_1 = require("../../../../constants");
-const create = () => () => async () => {
+const create = () => async () => async () => {
     const config = (0, config_1.get)();
     /* jscpd:ignore-end */
     if (!config[constants_1.CONFIG_PASSCODE_FUNCTION] ||

package/commands/handler/authentication/passcode/input.js

@@ -9,8 +9,8 @@ const prompts_1 = __importDefault(require("prompts"));
 const config_1 = require("../../../../config");
 const constants_1 = require("../../../../constants");
 const utils_1 = require("../../options/utils");
-const create = () => (command) => {
-    (0, utils_1.checkOptions)(constants_1.OPTION_PASSCODE, command);
+const create = () => async (command) => {
+    await (0, utils_1.checkOptions)(constants_1.OPTION_PASSCODE, command);
     return async () => {
         const config = (0, config_1.get)();
         let passcode = config.options[constants_1.OPTION_PASSCODE.longName];

package/commands/handler/authentication/passcode/setPasscode.js

@@ -6,7 +6,7 @@ const utils_1 = require("../utils");
 const utils_2 = require("../../utils");
 /* jscpd:ignore-start */
 const constants_1 = require("../../../../constants");
-const create = () => () => async () => {
+const create = () => async () => async () => {
     const config = (0, config_1.get)();
     /* jscpd:ignore-end */
     (0, utils_2.setTargetHost)(config.host);

package/commands/handler/authentication/technicalJWT/index.js

@@ -5,8 +5,8 @@ const config_1 = require("../../../../config");
 const commands_1 = require("../../../../utils/commands");
 const types_1 = require("./types");
 const utils_1 = require("./utils");
-const create = () => (command) => {
-    command.addOption((0, commands_1.buildOption)(types_1.OPTION_SECRET));
+const create = () => async (command) => {
+    command.addOption(await (0, commands_1.buildOption)(types_1.OPTION_SECRET));
     return async () => {
         const token = await (0, utils_1.getTechnicalJwt)();
         (0, config_1.set)({ authorization: { Authorization: `Bearer ${token}` } });

package/commands/handler/checkOptionsExistence.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const config_1 = require("../../config");
 const logger_1 = require("../../logger");
-const create = (option, throwIfExists = true) => () => async () => {
+const create = (option, throwIfExists = true) => async () => async () => {
     const config = (0, config_1.get)();
     const { trace } = (0, logger_1.get)("commands.handler.checkOptionsExistence");
     trace(`checking options existence ${option.longName} in config, value in config is ${config.options[option.longName]}, throw error if option exists ${throwIfExists}`);

package/commands/handler/error.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const logger_1 = require("../../logger");
 const stackTrace_1 = require("./stackTrace");
-const errorHandler = (errorMessage, handler) => (command) => {
-    const commandHandler = handler(command);
+const errorHandler = (errorMessage, handler) => async (command) => {
+    const commandHandler = await handler(command);
     return async (...args) => {
         try {
             await commandHandler(...args);

package/commands/handler/fail.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const logger_1 = require("../../logger");
-const create = () => () => async () => {
+const create = () => async () => async () => {
     const { debug } = (0, logger_1.get)("commands.handler.fail");
     debug(`running fail handler`);
     throw new Error("Fail I must");

package/commands/handler/fetch/fetch.js

@@ -78,6 +78,6 @@ const runRequest = (method, path, parameterMappings, responsePostProcessor) => a
 /* jscpd:ignore-start */
 const create = (method, path, parameterMappings, responsePostProcessor) => {
     /* jscpd:ignore-end */
-    return () => runRequest(method, path, parameterMappings, responsePostProcessor);
+    return async () => runRequest(method, path, parameterMappings, responsePostProcessor);
 };
 exports.create = create;

package/commands/handler/fetch/utils.js

@@ -109,7 +109,7 @@ const handleResponseData = async (data) => {
         ResultHandlerFactory_1.ResultHandlerFactory.get().setResult(data);
     }
     const { output } = (0, logger_1.get)("handler.fetch");
-    const formatted = config.options[constants_1.OPTION_PRETTY.longName]
+    const formatted = config.options.pretty
         ? JSON.stringify(data, null, 2)
         : JSON.stringify(data);
     if (config.options[constants_1.OPTION_OUTPUT.longName]) {

package/commands/handler/input/file.js

@@ -11,7 +11,7 @@ const constants_1 = require("../../../constants");
 const checkOptionsExistence_1 = require("../checkOptionsExistence");
 const next_1 = require("../next");
 const options_1 = require("../options");
-const readBodyFromFile = () => async () => {
+const readBodyFromFile = async () => async () => {
     const config = (0, config_1.get)();
     const filePath = config.options[constants_1.OPTION_FILE_PATH.longName];
     const { debug, trace } = (0, logger_1.get)("commands.handler.input.file");

package/commands/handler/input/input.js

@@ -9,8 +9,8 @@ const config_1 = require("../../../config");
 const constants_1 = require("../../../constants");
 const logger_1 = require("../../../logger");
 const commands_1 = require("../../../utils/commands");
-const create = () => (command) => {
-    command.addOption((0, commands_1.buildOption)(constants_1.OPTION_INPUT));
+const create = () => async (command) => {
+    command.addOption(await (0, commands_1.buildOption)(constants_1.OPTION_INPUT));
     return async () => {
         const config = (0, config_1.get)();
         const { debug } = (0, logger_1.get)("handler.input.input");

package/commands/handler/mandatoryOptions.js

@@ -11,7 +11,7 @@ const MANDATORY_OPTIONS = [
     constants_1.OPTION_OPTIONS_FILE,
     { ...constants_1.OPTION_HOST, required: true },
 ];
-const post = () => async () => {
+const post = async () => async () => {
     const config = (0, config_1.get)();
     const tenant = (0, utils_1.parseTenant)(config.options[constants_1.OPTION_HOST.longName]);
     const info = (0, utils_1.getInfoFromTenant)(tenant, config.verbose);

package/commands/handler/next.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const stackTrace_1 = require("./stackTrace");
-const nextHandler = (...handlers) => (command) => {
+const nextHandler = (...handlers) => async (command) => {
     const commandHandlers = [];
     for (const handler of handlers) {
-        commandHandlers.push(handler(command));
+        // eslint-disable-next-line no-await-in-loop
+        commandHandlers.push(await handler(command));
     }
     return async (...args) => {
         for (const handler of commandHandlers) {

package/commands/handler/options/env.js

@@ -5,14 +5,13 @@ const logger_1 = require("../../../logger");
 const utils_1 = require("../../../utils/utils");
 const utils_2 = require("./utils");
 /* jscpd:ignore-start */
-const create = (option) => () => async () => {
+const create = (option) => async () => async () => {
     const { debug } = (0, logger_1.get)("commands.handler.options.env");
     /* jscpd:ignore-end */
     debug(`reading option ${option.longName} from env`);
     if (!process.env[(0, utils_1.toConstantCase)(option.longName)]) {
         throw new Error(`env variable process.env.${(0, utils_1.toConstantCase)(option.longName)} is not set`);
     }
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     (0, utils_2.setOption)(option, process.env[(0, utils_1.toConstantCase)(option.longName)]);
 };
 exports.create = create;

package/commands/handler/options/file.js

@@ -6,7 +6,7 @@ const logger_1 = require("../../../logger");
 const options_1 = require("../../../utils/options");
 const utils_1 = require("./utils");
 /* jscpd:ignore-start */
-const create = (option) => () => async () => {
+const create = (option) => async () => async () => {
     const { debug, trace } = (0, logger_1.get)("commands.handler.options.file");
     /* jscpd:ignore-end */
     debug(`reading option ${option.longName} from file`);