@sap-ux/odata-service-inquirer 0.6.13 → 0.7.2

package/dist/i18n.js

@@ -7,6 +7,7 @@ exports.defaultProjectNumber = void 0;
 exports.initI18nOdataServiceInquirer = initI18nOdataServiceInquirer;
 exports.t = t;
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
+const project_input_validator_1 = require("@sap-ux/project-input-validator");
 const i18next_1 = __importDefault(require("i18next"));
 const odata_service_inquirer_i18n_json_1 = __importDefault(require("./translations/odata-service-inquirer.i18n.json"));
 const odataServiceInquirerNamespace = 'odata-service-inquirer';
@@ -34,8 +35,9 @@ async function initI18nOdataServiceInquirer() {
         }
     });
     i18next_1.default.addResourceBundle('en', odataServiceInquirerNamespace, odata_service_inquirer_i18n_json_1.default);
-    // add the inquirer common i18n resource bundle to ensure all translations are available
+    // add other bundles that are used in consumed modules
     (0, inquirer_common_1.addi18nResourceBundle)();
+    (0, project_input_validator_1.addi18nResourceBundle)();
 }
 /**
  * Helper function facading the call to i18next. Unless a namespace option is provided the local namespace will be used.

package/dist/prompts/connectionValidator.js

@@ -215,7 +215,7 @@ class ConnectionValidator {
             return 200;
         }
         catch (e) {
-            logger_helper_1.default.logger.debug(`ConnectionValidator.checkSapService() - error: ${e.message}`);
+            logger_helper_1.default.logger.debug(`ConnectionValidator.checkUrl() - error: ${e.message}`);
             if (e?.isAxiosError) {
                 // Error handling for BAS specific 500 errors
                 if (e?.response?.status.toString().match(/5\d\d/) && isBAS) {
@@ -491,7 +491,7 @@ class ConnectionValidator {
             odataVersion: requiredOdataVersion
         });
         const validationResult = this.getValidationResultFromStatusCode(status);
-        if (this.validity.reachable && (!this.validity.authRequired || this.validity.authenticated)) {
+        if (this.validity.reachable) {
             this._validatedUrl = destUrl;
         }
         if (!this.validity.reachable) {
@@ -504,7 +504,9 @@ class ConnectionValidator {
         }
         if (this.validity.authRequired) {
             return {
-                valResult: inquirer_common_1.ErrorHandler.getErrorMsgFromType(inquirer_common_1.ERROR_TYPE.AUTH),
+                valResult: inquirer_common_1.ErrorHandler.getErrorMsgFromType(inquirer_common_1.ERROR_TYPE.AUTH, destination.Authentication !== btp_utils_1.Authentication.NO_AUTHENTICATION
+                    ? (0, i18n_1.t)('texts.checkDestinationAuthConfig')
+                    : undefined),
                 errorType: inquirer_common_1.ERROR_TYPE.AUTH
             };
         }
@@ -560,7 +562,7 @@ class ConnectionValidator {
                 isSystem,
                 odataVersion
             });
-            logger_helper_1.default.logger.debug(`ConnectionValidator.checkSapServiceUrl() - status: ${status}; url: ${serviceUrl}`);
+            logger_helper_1.default.logger.debug(`ConnectionValidator.validateUrl() - status: ${status}; url: ${serviceUrl}`);
             this.validity.urlFormat = true;
             this._validatedUrl = serviceUrl;
             return this.getValidationResultFromStatusCode(status);
@@ -718,7 +720,7 @@ class ConnectionValidator {
                 isSystem,
                 odataVersion
             });
-            logger_helper_1.default.logger.debug(`ConnectionValidator.checkSapServiceUrl() - status: ${status}; url: ${url}`);
+            logger_helper_1.default.logger.debug(`ConnectionValidator.validateAuth() - status: ${status}; url: ${url}`);
             // Since an exception was not thrown, this is a valid url
             this.validity.urlFormat = true;
             this._validatedUrl = url;

package/dist/prompts/datasources/sap-system/service-selection/questions.js

@@ -56,7 +56,9 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
                         (0, service_helper_1.sendDestinationServiceSuccessTelemetryEvent)(answers?.[`${types_1.promptNames.systemSelection}`]?.system);
                     }
                 }
-                else if (connectValidator.odataService && connectValidator.validatedUrl) {
+                else if (connectValidator.odataService &&
+                    connectValidator.validatedUrl &&
+                    !(await connectValidator.isAuthRequired())) {
                     // We have connected to a service endpoint, use this service as the only choice
                     const serviceUrl = new URL(connectValidator.destinationUrl ?? connectValidator.validatedUrl);
                     serviceChoices = [

package/dist/translations/odata-service-inquirer.i18n.json

@@ -161,6 +161,7 @@
         "forUserName": "(for user [{{username}}])",
         "systemTypeBTP": "BTP",
         "systemTypeS4HC": "S4HC",
-        "httpStatus": "http status {{httpStatus}}"
+        "httpStatus": "http status {{httpStatus}}",
+        "checkDestinationAuthConfig": "Please check the SAP BTP destination authentication configuration."
     }
 }

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.6.13",
+  "version": "0.7.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -19,19 +19,19 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@sap/cf-tools": "3.2.0",
+    "@sap/cf-tools": "3.2.2",
     "axios": "1.7.4",
     "axios-logger": "2.8.0",
     "fast-xml-parser": "4.4.1",
     "i18next": "23.5.1",
     "inquirer-autocomplete-prompt": "2.0.1",
     "os-name": "4.0.1",
-    "@sap-ux/axios-extension": "1.17.4",
-    "@sap-ux/btp-utils": "0.17.0",
-    "@sap-ux/fiori-generator-shared": "0.7.11",
+    "@sap-ux/axios-extension": "1.17.6",
+    "@sap-ux/btp-utils": "0.17.1",
+    "@sap-ux/fiori-generator-shared": "0.7.12",
     "@sap-ux/guided-answers-helper": "0.1.0",
-    "@sap-ux/telemetry": "0.5.45",
-    "@sap-ux/inquirer-common": "0.5.5",
+    "@sap-ux/telemetry": "0.5.46",
+    "@sap-ux/inquirer-common": "0.5.7",
     "@sap-ux/logger": "0.6.0",
     "@sap-ux/project-access": "1.28.8",
     "@sap-ux/project-input-validator": "0.3.4",
@@ -43,8 +43,8 @@
     "@types/inquirer": "8.2.6",
     "@types/lodash": "4.14.202",
     "jest-extended": "3.2.4",
-    "@sap-ux/fiori-generator-shared": "0.7.11",
-    "@sap-ux/feature-toggle": "0.2.2",
+    "@sap-ux/fiori-generator-shared": "0.7.12",
+    "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/odata-service-writer": "0.24.0"
   },
   "engines": {