@sap/cli-core 2023.18.0 → 2023.23.0

package/CHANGELOG.md

@@ -5,6 +5,40 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2023.23.0
+
+### Fixed
+
+- Trailing single quotes (`'`) were removed from option values even though there was no leading single quote. This version contains a fix that trailing single quotes are only removed if there is a leading single quote.
+
+  Trailing single quote is not removed: `some 'value'` stays `some 'value'`.
+
+  Trailing single quote is removed: `'some value'` becomes `some value`.
+
+- The help output did not mention the correct CLI name. Instead the output showed the name 'terminal'.
+
+  ```javascript
+  Usage: terminal [options] [command]
+
+  Command-Line Interface for <product name>.
+  ...
+  ```
+
+  Since this version, the name is shown correctly.
+
+  ```javascript
+  Usage: <cli> [options] [command]
+
+  Command-Line Interface for <product name>.
+  ...
+  ```
+
+## 2023.19.0
+
+### Fixed
+
+- Logging in failed if required information such as the client ID or client secret were provided via interactive input prompt. When the information were provided using a secrets file or via options, the login worked as expected.
+
 ## 2023.18.0
 
 ### Added

package/cache/secrets/SecretsStorageImpl.js

@@ -49,9 +49,10 @@ class SecretsStorageImpl {
     }
     async getDefaultSecretId() {
         const tenantUrl = (0, utils_2.getTenantUrl)();
-        const secret = this.secrets.find((s) => new URL(s.tenantUrl).host === new URL(tenantUrl).host);
+        const { host } = new URL(tenantUrl);
+        const secret = this.secrets.find((s) => new URL(s.tenantUrl).host === host);
         if (!secret) {
-            throw new Error("Method not implemented.");
+            throw new Error(`No secret found for host ${host}`);
         }
         return secret.id;
     }
@@ -95,7 +96,8 @@ class SecretsStorageImpl {
         if (secret.client_id) {
             const config = (0, config_1.get)();
             let oauth = {};
-            if (!secret.customClient) {
+            if (!secret.customClient &&
+                (!secret.authorization_url || !secret.token_url)) {
                 oauth = (await (0, http_1.fetch)({
                     method: "GET",
                     url: `${config.tenantUrl}/oauth`,
@@ -119,6 +121,9 @@ class SecretsStorageImpl {
                     tokenUrl = config.tokenUrl;
                 }
             }
+            if (!tokenUrl || !authorizationUrl) {
+                throw new Error("invalid token url or authorization url");
+            }
             this.secrets[secretIndex].authorization_url =
                 (0, utils_1.removeQueryParametersFromUrl)(authorizationUrl);
             this.secrets[secretIndex].token_url = (0, utils_1.removeQueryParametersFromUrl)(tokenUrl);

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

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTechnicalJwt = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const url_1 = require("url");
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const config_1 = require("../../../../config");
 const logger_1 = require("../../../../logger");
 const http_1 = require("../../../../utils/http");

package/commands/handler/input/file.js

@@ -30,5 +30,5 @@ const readBodyFromFile = async () => async () => {
         throw err;
     }
 };
-const create = () => (0, next_1.create)((0, checkOptionsExistence_1.create)(constants_1.OPTION_INPUT), (0, options_1.create)(constants_1.OPTION_FILE_PATH, { readEnv: true, readFile: true, readOptions: true, readPipe: true }, true, true), readBodyFromFile);
+const create = () => (0, next_1.create)((0, checkOptionsExistence_1.create)(constants_1.OPTION_INPUT), (0, options_1.create)(constants_1.OPTION_FILE_PATH, { readEnv: true, readFile: true, readOptions: true }, true, true), readBodyFromFile);
 exports.create = create;

package/commands/handler/options/index.d.ts

@@ -1,6 +1,5 @@
 import { Handler, Option } from "../../../types";
-export declare const create: (options: Array<Option> | Option, { readPipe, readEnv, readFile, readOptions }?: {
-    readPipe: boolean;
+export declare const create: (options: Array<Option> | Option, { readEnv, readFile, readOptions }?: {
     readEnv: boolean;
     readFile: boolean;
     readOptions: boolean;

package/commands/handler/options/index.js

@@ -6,15 +6,13 @@ const utils_1 = require("./utils");
 const or_1 = require("../or");
 const next_1 = require("../next");
 const checkOptionsExistence_1 = require("../checkOptionsExistence");
-const pipe_1 = require("./pipe");
 const file_1 = require("./file");
 const option_1 = require("./option");
 const succeed_1 = require("../succeed");
 const fail_1 = require("../fail");
 const env_1 = require("./env");
 const createHandler = (use, option, handler) => (0, next_1.create)((0, checkOptionsExistence_1.create)(option), use ? handler : (0, succeed_1.create)());
-const create = (options, { readPipe, readEnv, readFile, readOptions } = {
-    readPipe: true,
+const create = (options, { readEnv, readFile, readOptions } = {
     readEnv: true,
     readFile: true,
     readOptions: true,
@@ -23,7 +21,7 @@ const create = (options, { readPipe, readEnv, readFile, readOptions } = {
     await (0, utils_1.checkOptions)(intOptions, command);
     return async () => {
         for (const option of intOptions) {
-            const handler = (0, or_1.create)((0, checkOptionsExistence_1.create)(option, false), (0, or_1.create)(createHandler(readPipe, option, (0, pipe_1.create)(option)), createHandler(readEnv, option, (0, env_1.create)(option)), createHandler(readFile, option, (0, file_1.create)(option)), createHandler(readOptions, option, (0, option_1.create)(option, promptAlways))), throwIfHandlersFailed
+            const handler = (0, or_1.create)((0, checkOptionsExistence_1.create)(option, false), (0, or_1.create)(createHandler(readEnv, option, (0, env_1.create)(option)), createHandler(readFile, option, (0, file_1.create)(option)), createHandler(readOptions, option, (0, option_1.create)(option, promptAlways))), throwIfHandlersFailed
                 ? (0, fail_1.create)()
                 : (0, succeed_1.create)());
             await (await handler(command))();

package/commands/handler/utils.js

@@ -4,6 +4,7 @@ exports.getTargetHost = exports.setTargetHost = exports.getAuthenticationMethod
 const logger_1 = require("../../logger");
 const config_1 = require("../../config");
 const constants_1 = require("../../constants");
+const REGEX_LEADING_TRAILING_SINGLE_QUOTE = /^'.*'$/;
 const getLogger = () => (0, logger_1.get)("commands.handler.utils");
 const getBooleanOption = (value) => !!value;
 exports.getBooleanOption = getBooleanOption;
@@ -17,7 +18,12 @@ const decodeURIComponentInt = (value) => {
         throw err;
     }
 };
-const replaceLeadingTrailingSingleQuotes = (value) => value.replace(/^'/, "").replace(/'$/, "");
+const replaceLeadingTrailingSingleQuotes = (value) => {
+    if (REGEX_LEADING_TRAILING_SINGLE_QUOTE.test(value)) {
+        return value.replace(/^'/, "").replace(/'$/, "");
+    }
+    return value;
+};
 const parseOption = (value) => {
     if (typeof value !== "string") {
         return value;

package/commands/login.command.js

@@ -41,6 +41,6 @@ const loginCommand = {
         { ...constants_1.OPTION_HOST, hidden: false, required: true },
         constants_1.OPTION_VERBOSE,
         constants_1.OPTION_OPTIONS_FILE,
-    ]), verifyHost, (0, handler_1.createOauthHandler)(), initializeCache),
+    ]), (0, handler_1.createMandatoryOptionsHandler)(), verifyHost, (0, handler_1.createOauthHandler)(), initializeCache),
 };
 exports.default = loginCommand;

package/dwc/dwc.js

@@ -7,6 +7,7 @@ exports.getCommands = exports.executeCommand = exports.init = void 0;
 if (process.env.SUPPRESS_NO_CONFIG_WARNING === undefined) {
     process.env.SUPPRESS_NO_CONFIG_WARNING = "true";
 }
+/* eslint-disable import/first */
 const path_1 = __importDefault(require("path"));
 const logger_1 = require("../logger");
 const constants_1 = require("../constants");
@@ -114,11 +115,15 @@ const init = async () => {
     await setTenant();
     await initCacheTolerant();
     await setupSecretsStorage();
+    const cliName = (0, config_1.get)()[constants_1.CLI_NAME];
     program = (0, commands_1.createCommand)();
+    program.name(cliName);
     program.version((0, core_1.getVersion)(), "-v, --version", "output the current version");
     program.description((0, config_1.get)()[constants_1.CLI_DESCRIPTION]);
-    program.showHelpAfterError(`Did you initialize the CLI by running ${(0, config_1.get)()[constants_1.CLI_NAME]} config cache init --host "<Server_URL>"?` +
-        ` Add --help, -h or go to ${(0, config_1.get)()[constants_1.CLI_SAP_HELP]} for additional information.`);
+    program.showHelpAfterError(`Make sure to always define the host using the --host option or by running ${cliName}` +
+        ` config host set "<Server_URL>". Did you initialize the CLI by running ${cliName} config` +
+        ` cache init --host "<Server_URL>"?` +
+        ` Add option --help, -h or go to ${(0, config_1.get)()[constants_1.CLI_SAP_HELP]} for additional information.`);
     program.addOption(await (0, commands_1.buildOption)(constants_1.OPTION_HOST));
     program.addOption(await (0, commands_1.buildOption)(constants_1.OPTION_OPTIONS_FILE));
     program.configureHelp({ sortSubcommands: true });

package/dwc/utils.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOptionValueFromArgv = exports.compareEtags = exports.checkVersion = exports.addCommandsFromFolder = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const logger_1 = require("../logger");
 const discovery_1 = require("../discovery");
 const commands_1 = require("../utils/commands");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cli-core",
-  "version": "2023.18.0",
+  "version": "2023.23.0",
   "description": "Command-Line Interface (CLI) Core Module",
   "license": "SEE LICENSE IN LICENSE",
   "author": "SAP SE",
@@ -18,7 +18,7 @@
   ],
   "dependencies": {
     "ajv": "8.12.0",
-    "axios": "1.4.0",
+    "axios": "1.5.1",
     "commander": "11.0.0",
     "config": "3.3.9",
     "dotenv": "16.3.1",

package/commands/handler/options/pipe.d.ts

@@ -1,2 +0,0 @@
-import { Handler, Option } from "../../../types";
-export declare const create: (option: Option) => Handler;

package/commands/handler/options/pipe.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = void 0;
-const fs_extra_1 = require("fs-extra");
-const logger_1 = require("../../../logger");
-const utils_1 = require("./utils");
-const getLogger = () => (0, logger_1.get)("commands.handler.options.pipe");
-let data;
-const getDataFromPipe = () => {
-    if (data === undefined) {
-        try {
-            data = JSON.parse((0, fs_extra_1.readFileSync)(0, "utf-8"));
-        }
-        catch (err) {
-            const { error } = getLogger();
-            error("failed to read from pipe", err);
-            data = null;
-            return getDataFromPipe();
-        }
-    }
-    else if (data === null) {
-        throw new Error("no data received from pipe");
-    }
-    return data;
-};
-/* jscpd:ignore-start */
-const create = (option) => async () => async () => {
-    const { debug } = getLogger();
-    /* jscpd:ignore-end */
-    debug(`reading option ${option.longName} from pipe`);
-    const options = getDataFromPipe();
-    (0, utils_1.setOption)(option, options[option.longName]);
-};
-exports.create = create;