@sap/cli-core 2023.18.0 → 2023.22.0

package/CHANGELOG.md

@@ -5,6 +5,12 @@ 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.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

@@ -95,7 +95,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 +120,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/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");
@@ -117,8 +118,11 @@ const init = async () => {
     program = (0, commands_1.createCommand)();
     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.`);
+    const cliName = (0, config_1.get)()[constants_1.CLI_NAME];
+    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.22.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.0",
     "commander": "11.0.0",
     "config": "3.3.9",
     "dotenv": "16.3.1",