@sap-ux/odata-service-inquirer 0.6.9 → 0.6.10

package/dist/prompts/connectionValidator.js

@@ -476,15 +476,20 @@ class ConnectionValidator {
         this.resetValidity();
         // Get the destination URL in the BAS specific form <protocol>://<destinationName>.dest
         const destUrl = (0, btp_utils_1.getDestinationUrlForAppStudio)(destination.Name, servicePath);
-        // Get the destination URL in the portable form <protocol>://<host>:<port>
-        this._destinationUrl = servicePath ? new URL(`${destination.Host}${servicePath}`).toString() : destination.Host;
+        // Get the destination URL in the portable form <protocol>://<host>:<port>.
+        // We remove trailing slashes (up to 10, infinite would allow DOS attack) from the host to avoid double slashes when appending the service path.
+        this._destinationUrl = servicePath
+            ? destUrl.replace(`https://${destination.Name}.dest`, destination.Host.replace(/\/{1,10}$/, ''))
+            : destination.Host;
         this._destination = destination;
         // No need to apply sap-client as this happens automatically (from destination config) when going through the BAS proxy
         const status = await this.checkUrl(new URL(destUrl), undefined, undefined, {
             odataVersion: requiredOdataVersion
         });
-        this._validatedUrl = destUrl;
         const validationResult = this.getValidationResultFromStatusCode(status);
+        if (this.validity.reachable && (!this.validity.authRequired || this.validity.authenticated)) {
+            this._validatedUrl = destUrl;
+        }
         if (!this.validity.reachable) {
             // Log the error
             const errorLog = prompt_helpers_1.errorHandler.logErrorMsgs(status);

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

@@ -137,16 +137,22 @@ async function getSystemConnectionQuestions(connectionValidator, promptOptions)
             guiOptions: {
                 hint: (0, i18n_1.t)('prompts.destinationServicePath.hint'),
                 mandatory: true,
-                breadcrumb: true
+                breadcrumb: true,
+                applyDefaultWhenDirty: true
             },
+            default: '',
             validate: async (servicePath, answers) => {
-                if (!servicePath) {
+                // @sap-ux/btp-utils getDestinationUrlForAppStudio() enforces a path length of > 1, even though it could be a valid path
+                // Double slashes are not allowed at the start of the path as they break URL construction
+                if (!servicePath || servicePath.trim().length < 2 || servicePath.startsWith('//')) {
+                    connectionValidator.resetConnectionState(true);
                     return (0, i18n_1.t)('prompts.destinationServicePath.invalidServicePathWarning');
                 }
                 // Validate format of the service path, note this relies on the assumption that the destination is correctly configured with a valid URL
                 const selectedDestination = answers?.[types_1.promptNames.systemSelection]?.system;
                 const valUrlResult = (0, validators_1.validateServiceUrl)(selectedDestination.Host, servicePath);
                 if (valUrlResult !== true) {
+                    connectionValidator.resetConnectionState(true);
                     return valUrlResult;
                 }
                 const connectValResult = await (0, prompt_helpers_1.connectWithDestination)(selectedDestination, connectionValidator, requiredOdataVersion, servicePath);

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.9",
+  "version": "0.6.10",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -27,14 +27,14 @@
     "inquirer-autocomplete-prompt": "2.0.1",
     "os-name": "4.0.1",
     "@sap-ux/axios-extension": "1.17.4",
-    "@sap-ux/fiori-generator-shared": "0.7.10",
     "@sap-ux/btp-utils": "0.17.0",
     "@sap-ux/guided-answers-helper": "0.1.0",
+    "@sap-ux/fiori-generator-shared": "0.7.10",
     "@sap-ux/inquirer-common": "0.5.4",
-    "@sap-ux/telemetry": "0.5.44",
-    "@sap-ux/logger": "0.6.0",
     "@sap-ux/project-access": "1.28.7",
+    "@sap-ux/telemetry": "0.5.44",
     "@sap-ux/project-input-validator": "0.3.3",
+    "@sap-ux/logger": "0.6.0",
     "@sap-ux/store": "0.9.3"
   },
   "devDependencies": {
@@ -43,9 +43,9 @@
     "@types/inquirer": "8.2.6",
     "@types/lodash": "4.14.202",
     "jest-extended": "3.2.4",
-    "@sap-ux/fiori-generator-shared": "0.7.10",
     "@sap-ux/feature-toggle": "0.2.2",
-    "@sap-ux/odata-service-writer": "0.23.3"
+    "@sap-ux/odata-service-writer": "0.23.3",
+    "@sap-ux/fiori-generator-shared": "0.7.10"
   },
   "engines": {
     "node": ">=18.x"