@sap-ux/odata-service-inquirer 0.5.29 → 0.5.31

package/dist/error-handler/error-handler.js

@@ -133,7 +133,7 @@ class ErrorHandler {
         [ERROR_TYPE.DESTINATION_BAD_GATEWAY_503]: (0, i18n_1.t)('errors.destinationUnavailable'),
         [ERROR_TYPE.REDIRECT]: (0, i18n_1.t)('errors.redirectError'),
         [ERROR_TYPE.NO_SUCH_HOST]: (0, i18n_1.t)('errors.noSuchHostError'),
-        [ERROR_TYPE.NO_ABAP_ENVS]: (0, i18n_1.t)('error.abapEnvsUnavailable')
+        [ERROR_TYPE.NO_ABAP_ENVS]: (0, i18n_1.t)('errors.abapEnvsUnavailable')
     });
     /**
      * Get the Guided Answers (help) node for the specified error type.

package/dist/prompts/connectionValidator.d.ts

@@ -152,6 +152,13 @@ export declare class ConnectionValidator {
      * @param connectConfig.odataVersion the odata version to restrict the catalog requests if only a specific version is required
      */
     private createSystemConnection;
+    /**
+     * Check if we should attempt to use the v4 catalog service as a fallback.
+     *
+     * @param statusCode http status code, if not provided will return false as we cannot determine the reason for v2 catalog request failure
+     * @returns true if we should attempt the v4 catalog service
+     */
+    private shouldAttemptV4Catalog;
     /**
      * Callback for when the refresh token changes.
      *

package/dist/prompts/connectionValidator.js

@@ -281,12 +281,22 @@ class ConnectionValidator {
         if (!odataVersion || odataVersion === axios_extension_1.ODataVersion.v4) {
             this._catalogV4 = this._serviceProvider.catalog(axios_extension_1.ODataVersion.v4);
         }
+        let v4Requested = false;
         try {
-            this._catalogV2 ? await this._catalogV2.listServices() : await this._catalogV4?.listServices();
+            if (this._catalogV2) {
+                await this._catalogV2?.listServices();
+            }
+            else if (this._catalogV4) {
+                v4Requested = true;
+                await this._catalogV4?.listServices();
+            }
         }
         catch (error) {
-            // We will try the v4 catalog if v2 returns a 404
-            if (error.response?.status === 404 && this._catalogV4) {
+            // We will try the v4 catalog if v2 returns a 404 or an auth code. Try the v4 catalog with the credentials provided also
+            // as the user may not be authorized for the v2 catalog specifically.
+            if (this._catalogV4 &&
+                !v4Requested &&
+                this.shouldAttemptV4Catalog(error.response?.status)) {
                 await this._catalogV4.listServices();
             }
             else {
@@ -294,6 +304,19 @@ class ConnectionValidator {
             }
         }
     }
+    /**
+     * Check if we should attempt to use the v4 catalog service as a fallback.
+     *
+     * @param statusCode http status code, if not provided will return false as we cannot determine the reason for v2 catalog request failure
+     * @returns true if we should attempt the v4 catalog service
+     */
+    shouldAttemptV4Catalog(statusCode) {
+        if (!statusCode) {
+            return false;
+        }
+        const errorType = error_handler_1.ErrorHandler.getErrorType(statusCode);
+        return errorType === error_handler_1.ERROR_TYPE.NOT_FOUND || errorType === error_handler_1.ERROR_TYPE.AUTH;
+    }
     /**
      * Callback for when the refresh token changes.
      *

package/dist/prompts/datasources/sap-system/abap-on-btp/questions.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCFDiscoverPrompts = exports.getAbapOnBTPSystemQuestions = void 0;
-const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const cf_tools_1 = require("@sap/cf-tools");
 const error_handler_1 = require("../../../../error-handler/error-handler");
@@ -147,18 +146,13 @@ function getCFDiscoverPrompts(connectionValidator) {
                 if (abapService) {
                     return await validateServiceInfo(abapService, connectionValidator);
                 }
-                return false;
-            },
-            additionalMessages: () => {
                 const errorType = prompt_helpers_1.errorHandler.getCurrentErrorType();
                 if (errorType === error_handler_1.ERROR_TYPE.NO_ABAP_ENVS) {
                     const errorMsg = prompt_helpers_1.errorHandler.getErrorMsg(true);
                     const seeLogMsg = (0, i18n_1.t)('texts.seeLogForDetails');
-                    return {
-                        message: `${errorMsg} ${seeLogMsg}`,
-                        severity: yeoman_ui_types_1.Severity.warning
-                    };
+                    return `${errorMsg} ${seeLogMsg}`;
                 }
+                return false;
             }
         }
     ];

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.29",
+  "version": "0.5.31",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,10 +29,10 @@
     "@sap-ux/axios-extension": "1.16.5",
     "@sap-ux/btp-utils": "0.15.2",
     "@sap-ux/guided-answers-helper": "0.0.1",
-    "@sap-ux/telemetry": "0.5.24",
+    "@sap-ux/telemetry": "0.5.25",
     "@sap-ux/inquirer-common": "0.4.6",
     "@sap-ux/logger": "0.6.0",
-    "@sap-ux/project-access": "1.26.8",
+    "@sap-ux/project-access": "1.26.9",
     "@sap-ux/project-input-validator": "0.3.3",
     "@sap-ux/store": "0.9.1"
   },
@@ -43,7 +43,7 @@
     "@types/lodash": "4.14.202",
     "jest-extended": "3.2.4",
     "lodash": "4.17.21",
-    "@sap-ux/odata-service-writer": "0.22.3",
+    "@sap-ux/odata-service-writer": "0.22.4",
     "@sap-ux/feature-toggle": "0.2.0"
   },
   "engines": {