@sap-ux/odata-service-inquirer 2.2.28 → 2.2.30

package/dist/prompts/connectionValidator.d.ts

@@ -183,12 +183,17 @@ export declare class ConnectionValidator {
      */
     private createSystemConnection;
     /**
-     * Check if we should attempt to use the v4 catalog service as a fallback.
+     * Determine if a v4 catalog request should be made based on the specified error and if the error originated from a v2 or v4 catalog request.
+     * If the error originated from a v2 catalog request and it is of type 401/403/404 then we try the v4 catalog.
+     * If the v4 catalog request fails, for any reason, and the v2 catalog request failed with 401/403 we will throw that (401/403) error,
+     * ultimately resulting in a basic auth prompt for the end-user.
+     * Otherwise the v4 catalog request error is thrown, which may also be a 401/403, again resulting in a basic auth prompt and re-validation.
+     * If both catalogs have returned 404 nothing else can be done, the error is thrown and reported.
      *
-     * @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
+     * @param error - an error returned from either a v2 or v4 catalog listServices request.
+     * @param v4Requested - has the v4 catalog been requested
      */
-    private shouldAttemptV4Catalog;
+    private handleCatalogError;
     /**
      * Callback for when the Abap cloud system refresh token changes.
      *

package/dist/prompts/connectionValidator.js

@@ -338,32 +338,43 @@ class ConnectionValidator {
             }
         }
         catch (error) {
-            // 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 {
-                // Either the v2 or v4 catalog request failed for a specific odata version, or both failed where no odata verison was specified
-                // Do some root cause analysis to determine the end user help message
-                throw error;
-            }
+            await this.handleCatalogError(error, v4Requested);
         }
     }
     /**
-     * Check if we should attempt to use the v4 catalog service as a fallback.
+     * Determine if a v4 catalog request should be made based on the specified error and if the error originated from a v2 or v4 catalog request.
+     * If the error originated from a v2 catalog request and it is of type 401/403/404 then we try the v4 catalog.
+     * If the v4 catalog request fails, for any reason, and the v2 catalog request failed with 401/403 we will throw that (401/403) error,
+     * ultimately resulting in a basic auth prompt for the end-user.
+     * Otherwise the v4 catalog request error is thrown, which may also be a 401/403, again resulting in a basic auth prompt and re-validation.
+     * If both catalogs have returned 404 nothing else can be done, the error is thrown and reported.
      *
-     * @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
+     * @param error - an error returned from either a v2 or v4 catalog listServices request.
+     * @param v4Requested - has the v4 catalog been requested
      */
-    shouldAttemptV4Catalog(statusCode) {
-        if (!statusCode) {
-            return false;
+    async handleCatalogError(error, v4Requested) {
+        const statusCode = error.response?.status;
+        const errorType = statusCode ? inquirer_common_1.ErrorHandler.getErrorType(statusCode) : undefined;
+        // Try the v4 catalog with the credentials provided
+        // as the user may not be authorized for the v2 catalog specifically.
+        const shouldFallbackToV4 = statusCode && !v4Requested && (errorType === inquirer_common_1.ERROR_TYPE.NOT_FOUND || errorType === inquirer_common_1.ERROR_TYPE.AUTH);
+        if (this._catalogV4 && shouldFallbackToV4) {
+            try {
+                await this._catalogV4.listServices();
+            }
+            catch (v4Error) {
+                // if original error was of type auth, throw it so the consumer can handle it accordingly e.g show basic auth prompts
+                if (errorType === inquirer_common_1.ERROR_TYPE.AUTH) {
+                    throw error;
+                }
+                throw v4Error;
+            }
+        }
+        else {
+            // Either the v2 or v4 catalog request failed for a specific odata version, or both failed where no odata verison was specified
+            // Do some root cause analysis to determine the end user help message
+            throw error;
         }
-        const errorType = inquirer_common_1.ErrorHandler.getErrorType(statusCode);
-        return errorType === inquirer_common_1.ERROR_TYPE.NOT_FOUND || errorType === inquirer_common_1.ERROR_TYPE.AUTH;
     }
     /**
      * Callback for when the Abap cloud system refresh token changes.

package/dist/utils/index.js

@@ -137,7 +137,7 @@ function getDefaultChoiceIndex(list) {
  */
 function removeCircularFromServiceProvider(serviceProvider) {
     for (const service in serviceProvider.services) {
-        delete serviceProvider[service].log;
+        delete serviceProvider.services?.[service]?.log;
     }
     delete serviceProvider.log;
     return serviceProvider;

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