@sap-ux/odata-service-inquirer 2.4.13 → 2.4.15

package/dist/prompts/connectionValidator.d.ts

@@ -347,12 +347,6 @@ export declare class ConnectionValidator {
      * Reset the validity state.
      */
     private resetValidity;
-    /**
-     * Set the rejectUnauthorized option of the global https agent.
-     *
-     * @param rejectUnauthorized - true to reject unauthorized certificates, false to accept them
-     */
-    static setGlobalRejectUnauthorized(rejectUnauthorized: boolean): void;
 }
 export {};
 //# sourceMappingURL=connectionValidator.d.ts.map

package/dist/prompts/connectionValidator.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionValidator = void 0;
 const axios_extension_1 = require("@sap-ux/axios-extension");
 const btp_utils_1 = require("@sap-ux/btp-utils");
+const nodejs_utils_1 = require("@sap-ux/nodejs-utils");
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
-const https_1 = __importDefault(require("https"));
 const i18n_1 = require("../i18n");
 const types_1 = require("../types");
 const logger_helper_1 = __importDefault(require("./logger-helper"));
@@ -253,7 +253,7 @@ class ConnectionValidator {
             // VSCode default extension proxy setting does not allow bypassing cert errors using httpsAgent (as used by Axios)
             // so we must use globalAgent to bypass cert validation
             if (ignoreCertError === true) {
-                ConnectionValidator.setGlobalRejectUnauthorized(!ignoreCertError);
+                (0, nodejs_utils_1.setGlobalRejectUnauthorized)(!ignoreCertError);
             }
             if (isBAS) {
                 url.searchParams.append('saml2', 'disabled');
@@ -320,7 +320,7 @@ class ConnectionValidator {
         if (await this.shouldIgnoreCertError(axiosConfig)) {
             this._ignoreCertError = true;
             axiosConfig.ignoreCertErrors = true;
-            ConnectionValidator.setGlobalRejectUnauthorized(false);
+            (0, nodejs_utils_1.setGlobalRejectUnauthorized)(false);
         }
         this._axiosConfig = axiosConfig;
         this._serviceProvider = (0, axios_extension_1.create)(this._axiosConfig);
@@ -407,7 +407,7 @@ class ConnectionValidator {
             if (await this.shouldIgnoreCertError(axiosConfig, odataVersion)) {
                 this._ignoreCertError = true;
                 axiosConfig.ignoreCertErrors = true;
-                ConnectionValidator.setGlobalRejectUnauthorized(false);
+                (0, nodejs_utils_1.setGlobalRejectUnauthorized)(false);
             }
             this._axiosConfig = axiosConfig;
             this._serviceProvider = (0, axios_extension_1.createForAbap)(axiosConfig);
@@ -456,7 +456,7 @@ class ConnectionValidator {
             // The v2 catalog was not available therefore cert errors will not have been seen (hidden by 404), only abap on prem uses axiosConfig directly
             if (this._axiosConfig && (await this.shouldIgnoreCertError(this._axiosConfig, axios_extension_1.ODataVersion.v4))) {
                 this._ignoreCertError = true;
-                ConnectionValidator.setGlobalRejectUnauthorized(false);
+                (0, nodejs_utils_1.setGlobalRejectUnauthorized)(false);
                 this._axiosConfig = {
                     ...this._axiosConfig,
                     ignoreCertErrors: true
@@ -880,21 +880,6 @@ class ConnectionValidator {
         this._destinationUrl = undefined;
         this._destination = undefined;
     }
-    /**
-     * Set the rejectUnauthorized option of the global https agent.
-     *
-     * @param rejectUnauthorized - true to reject unauthorized certificates, false to accept them
-     */
-    static setGlobalRejectUnauthorized(rejectUnauthorized) {
-        if (https_1.default.globalAgent.options) {
-            https_1.default.globalAgent.options.rejectUnauthorized = rejectUnauthorized;
-        }
-        //@ts-expect-error - fallbackAgent is only present in BoundHttpsProxyAgent implementation and is not part of the Node.js API
-        if (https_1.default.globalAgent.fallbackAgent) {
-            //@ts-expect-error - fallbackAgent is not typed in Node.js API
-            https_1.default.globalAgent.fallbackAgent.options.rejectUnauthorized = rejectUnauthorized;
-        }
-    }
 }
 exports.ConnectionValidator = ConnectionValidator;
 //# sourceMappingURL=connectionValidator.js.map

package/dist/prompts/datasources/service-url/validators.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateService = validateService;
 const axios_extension_1 = require("@sap-ux/axios-extension");
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
+const nodejs_utils_1 = require("@sap-ux/nodejs-utils");
 const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
 const i18n_1 = require("../../../i18n");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
-const connectionValidator_1 = require("../../connectionValidator");
 const logger_helper_1 = __importDefault(require("../../logger-helper"));
 const prompt_helpers_1 = require("../../prompt-helpers");
 const validators_1 = require("../../validators");
@@ -29,7 +29,7 @@ const validators_1 = require("../../validators");
 async function validateService(url, { odataService, axiosConfig }, requiredVersion = undefined, ignoreCertError = false) {
     try {
         if (ignoreCertError === true) {
-            connectionValidator_1.ConnectionValidator.setGlobalRejectUnauthorized(!ignoreCertError);
+            (0, nodejs_utils_1.setGlobalRejectUnauthorized)(!ignoreCertError);
         }
         const metadata = await odataService.metadata();
         const odataVersionValResult = (0, validators_1.validateODataVersion)(metadata, requiredVersion);
@@ -92,7 +92,7 @@ async function validateService(url, { odataService, axiosConfig }, requiredVersi
         };
     }
     finally {
-        connectionValidator_1.ConnectionValidator.setGlobalRejectUnauthorized(true);
+        (0, nodejs_utils_1.setGlobalRejectUnauthorized)(true);
     }
 }
 //# sourceMappingURL=validators.js.map

package/dist/prompts/logger-helper.js

@@ -70,9 +70,15 @@ class LoggerHelper {
             LoggerHelper.logger.getLogLevel() === 'trace';
         const debugLogger = LoggerHelper.logger.debug.bind(LoggerHelper.logger);
         interceptors.request.use((request) => {
+            // Due to a bug in `axios-logger`, the `baseURL` is not logged if the `url` is falsey.
+            if (!request.url) {
+                debugLogger(`[@sap-ux/odata-service-inquirer] Request URL: ${request.baseURL}`);
+            }
             return AxiosLogger.requestLogger(request, {
                 url: true,
                 data: true,
+                params: true,
+                method: true,
                 prefixText: '@sap-ux/odata-service-inquirer',
                 headers: true,
                 logger: debugLogger

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/odata-service-inquirer",
   "description": "Prompts module that can prompt users for inputs required for odata service writing",
-  "version": "2.4.13",
+  "version": "2.4.15",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -33,8 +33,9 @@
     "@sap-ux/fiori-generator-shared": "0.12.6",
     "@sap-ux/guided-answers-helper": "0.3.0",
     "@sap-ux/telemetry": "0.6.3",
-    "@sap-ux/inquirer-common": "0.7.7",
+    "@sap-ux/inquirer-common": "0.7.8",
     "@sap-ux/logger": "0.7.0",
+    "@sap-ux/nodejs-utils": "0.2.1",
     "@sap-ux/project-access": "1.30.2",
     "@sap-ux/project-input-validator": "0.6.2",
     "@sap-ux/store": "1.1.0"
@@ -47,7 +48,7 @@
     "@types/lodash": "4.14.202",
     "jest-extended": "3.2.4",
     "@sap-ux/fiori-generator-shared": "0.12.6",
-    "@sap-ux/fiori-elements-writer": "2.4.12",
+    "@sap-ux/fiori-elements-writer": "2.4.13",
     "@sap-ux/fiori-freestyle-writer": "2.4.9",
     "@sap-ux/feature-toggle": "0.3.0",
     "@sap-ux/odata-service-writer": "0.27.5",