@sap-ux/odata-service-inquirer 0.5.34 → 0.5.35

package/dist/prompts/connectionValidator.d.ts

@@ -39,7 +39,7 @@ export declare class ConnectionValidator {
      *
      * @returns the axios configuration
      */
-    get axiosConfig(): AxiosRequestConfig | undefined;
+    get axiosConfig(): AxiosRequestConfig;
     /**
      * Get the odata service instance.
      *

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

@@ -8,8 +8,8 @@ const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const i18n_1 = require("../../../i18n");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
-const logger_helper_1 = __importDefault(require("../../logger-helper"));
 const connectionValidator_1 = require("../../connectionValidator");
+const logger_helper_1 = __importDefault(require("../../logger-helper"));
 const types_2 = require("./types");
 const validators_1 = require("./validators");
 /**
@@ -39,7 +39,7 @@ function getServiceUrlPrompt(connectValidator, requiredVersion) {
                 if (!connectValidator.validity.authRequired && connectValidator.odataService) {
                     return (0, validators_1.validateService)(url, {
                         odataService: connectValidator.odataService,
-                        abapServiceProvider: connectValidator.serviceProvider
+                        axiosConfig: connectValidator.axiosConfig
                     }, requiredVersion);
                 }
                 return true;
@@ -82,7 +82,7 @@ function getIgnoreCertErrorsPrompt(connectValidator, requiredVersion) {
                 if (!connectValidator.validity.authRequired && connectValidator.odataService) {
                     return (0, validators_1.validateService)(serviceUrl, {
                         odataService: connectValidator.odataService,
-                        abapServiceProvider: connectValidator.serviceProvider
+                        axiosConfig: connectValidator.axiosConfig
                     }, requiredVersion, ignoreCertError);
                 }
                 return true;
@@ -123,7 +123,7 @@ function getCliIgnoreCertValidatePrompt(connectValidator, requiredVersion) {
                     // Will log on CLI
                     const validService = await (0, validators_1.validateService)(serviceUrl, {
                         odataService: connectValidator.odataService,
-                        abapServiceProvider: connectValidator.serviceProvider
+                        axiosConfig: connectValidator.axiosConfig
                     }, requiredVersion, true);
                     if (validService !== true) {
                         throw new Error((0, i18n_1.t)('errors.exitingGeneration', { exitReason: validService.toString() }));
@@ -183,7 +183,7 @@ function getPasswordPrompt(connectValidator, requiredVersion) {
             if (validAuth === true && connectValidator.odataService) {
                 return (0, validators_1.validateService)(serviceUrl, {
                     odataService: connectValidator.odataService,
-                    abapServiceProvider: connectValidator.serviceProvider
+                    axiosConfig: connectValidator.axiosConfig
                 }, requiredVersion, ignoreCertError);
             }
             return validAuth;

package/dist/prompts/datasources/service-url/validators.d.ts

@@ -1,4 +1,4 @@
-import type { AbapServiceProvider, ODataService } from '@sap-ux/axios-extension';
+import { type AxiosRequestConfig, type ODataService } from '@sap-ux/axios-extension';
 import type { OdataVersion } from '@sap-ux/odata-service-writer';
 /**
  * Validates that a service specified by the service url is accessible, has the required version and returns valid metadata.
@@ -7,13 +7,13 @@ import type { OdataVersion } from '@sap-ux/odata-service-writer';
  * @param url the full odata service url including query parameters
  * @param connectionConfig the connection configuration to use for the validation, a subset of the ConnectionValidator properties
  * @param connectionConfig.odataService the odata service instance used to retrieve the metadata (as used by ConnectionValidator)
- * @param connectionConfig.abapServiceProvider the abap service provider instance used to retrieve annotations (as used by ConnectionValidator)
+ * @param connectionConfig.axiosConfig the axios config to use for the annotations request (as used by ConnectionValidator)
  * @param requiredVersion if specified and the service odata version does not match this version, an error is returned
  * @param ignoreCertError if true some certificate errors are ignored
  * @returns true if a valid odata service was returned, false or an error message string otherwise
  */
-export declare function validateService(url: string, { odataService, abapServiceProvider }: {
+export declare function validateService(url: string, { odataService, axiosConfig }: {
     odataService: ODataService;
-    abapServiceProvider: AbapServiceProvider;
+    axiosConfig: AxiosRequestConfig;
 }, requiredVersion?: OdataVersion | undefined, ignoreCertError?: boolean): Promise<boolean | string>;
 //# sourceMappingURL=validators.d.ts.map

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

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateService = void 0;
+const axios_extension_1 = require("@sap-ux/axios-extension");
 const error_handler_1 = require("../../../error-handler/error-handler");
 const i18n_1 = require("../../../i18n");
 const types_1 = require("../../../types");
@@ -18,12 +19,12 @@ const prompt_helpers_1 = require("../../prompt-helpers");
  * @param url the full odata service url including query parameters
  * @param connectionConfig the connection configuration to use for the validation, a subset of the ConnectionValidator properties
  * @param connectionConfig.odataService the odata service instance used to retrieve the metadata (as used by ConnectionValidator)
- * @param connectionConfig.abapServiceProvider the abap service provider instance used to retrieve annotations (as used by ConnectionValidator)
+ * @param connectionConfig.axiosConfig the axios config to use for the annotations request (as used by ConnectionValidator)
  * @param requiredVersion if specified and the service odata version does not match this version, an error is returned
  * @param ignoreCertError if true some certificate errors are ignored
  * @returns true if a valid odata service was returned, false or an error message string otherwise
  */
-async function validateService(url, { odataService, abapServiceProvider }, requiredVersion = undefined, ignoreCertError = false) {
+async function validateService(url, { odataService, axiosConfig }, requiredVersion = undefined, ignoreCertError = false) {
     try {
         if (ignoreCertError === true) {
             connectionValidator_1.ConnectionValidator.setGlobalRejectUnauthorized(!ignoreCertError);
@@ -49,7 +50,8 @@ async function validateService(url, { odataService, abapServiceProvider }, requi
         // Best effort attempt to get annotations but dont throw an error if it fails as this may not even be an Abap system
         try {
             // Create an abap provider instance to get the annotations using the same request config
-            const catalogService = abapServiceProvider.catalog(serviceOdataVersion);
+            const abapProvider = (0, axios_extension_1.createForAbap)(axiosConfig);
+            const catalogService = abapProvider.catalog(serviceOdataVersion);
             logger_helper_1.default.attachAxiosLogger(catalogService.interceptors);
             logger_helper_1.default.logger.debug('Getting annotations for service');
             const annotations = await catalogService.getAnnotations({ path: fullUrl.pathname });

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": "0.5.34",
+  "version": "0.5.35",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,8 +30,8 @@
     "@sap-ux/btp-utils": "0.15.2",
     "@sap-ux/guided-answers-helper": "0.0.2",
     "@sap-ux/telemetry": "0.5.26",
-    "@sap-ux/logger": "0.6.0",
     "@sap-ux/inquirer-common": "0.4.6",
+    "@sap-ux/logger": "0.6.0",
     "@sap-ux/project-access": "1.27.0",
     "@sap-ux/project-input-validator": "0.3.3",
     "@sap-ux/store": "0.9.1"