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

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/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.30",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",