@sap-ux/odata-service-inquirer 2.3.7 → 2.3.8

package/dist/prompts/connectionValidator.d.ts

@@ -135,7 +135,8 @@ export declare class ConnectionValidator {
     /**
      * Setting an existing connected system will prevent re-authentication.
      * This should be used where the user has previously authenticated to prevent re-authentication (e.g. via browser) and the previous
-     * connected system is still valid. Only backend systems are currently supported.
+     * connected system is still valid. Only Abap connected backend systems are currently supported for cached connection use.
+     * For non-Abap backend systems, or basic auth connections, the user will be prompted to re-authenticate.
      *
      * @param connectedSystem A connected system object containing the service provider and backend system information. Not relevant for destination connections.
      * @param connectedSystem.serviceProvider

package/dist/prompts/connectionValidator.js

@@ -179,14 +179,19 @@ class ConnectionValidator {
     /**
      * Setting an existing connected system will prevent re-authentication.
      * This should be used where the user has previously authenticated to prevent re-authentication (e.g. via browser) and the previous
-     * connected system is still valid. Only backend systems are currently supported.
+     * connected system is still valid. Only Abap connected backend systems are currently supported for cached connection use.
+     * For non-Abap backend systems, or basic auth connections, the user will be prompted to re-authenticate.
      *
      * @param connectedSystem A connected system object containing the service provider and backend system information. Not relevant for destination connections.
      * @param connectedSystem.serviceProvider
      * @param connectedSystem.backendSystem
      */
     setConnectedSystem({ serviceProvider, backendSystem }) {
-        // Set the state using the provided ConnectedSystem to prevent re-authentication
+        // Set the state using the provided ConnectedSystem to prevent re-authentication if this is a valid AbapServiceProvider connection only
+        if (!serviceProvider.catalog) {
+            logger_helper_1.default.logger.debug('ConnectionValidator.setConnectedSystem(): Use of a cached connected system is only supported for AbapServiceProviders. Re-authorization will be required.');
+            return;
+        }
         this._serviceProvider = serviceProvider;
         this._catalogV2 = this._serviceProvider.catalog(axios_extension_1.ODataVersion.v2);
         this._catalogV4 = this._serviceProvider.catalog(axios_extension_1.ODataVersion.v4);

package/dist/prompts/datasources/sap-system/shared-prompts/shared-prompts.js

@@ -61,14 +61,15 @@ function getSystemUrlQuestion(connectValidator, promptNamespace, requiredOdataVe
                 isSystem: true,
                 odataVersion: (0, utils_1.convertODataVersionType)(requiredOdataVersion)
             });
-            // If basic auth not required we should have an active connection (could be a re-entrance ticket supported system url)
+            // If basic auth not required we should have an active connection and be authenticated
             if (valResult === true) {
-                if (!connectValidator.validity.authRequired && connectValidator.serviceProvider) {
+                if (connectValidator.validity.authenticated && connectValidator.serviceProvider) {
                     utils_1.PromptState.odataService.connectedSystem = {
                         serviceProvider: (0, utils_1.removeCircularFromServiceProvider)(connectValidator.serviceProvider)
                     };
                 }
                 else {
+                    // otherwise we need to try basic auth
                     connectValidator.systemAuthType = 'basic';
                 }
             }

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.3.7",
+  "version": "2.3.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -47,10 +47,10 @@
     "@types/lodash": "4.14.202",
     "jest-extended": "3.2.4",
     "@sap-ux/fiori-generator-shared": "0.11.2",
-    "@sap-ux/fiori-elements-writer": "2.3.4",
-    "@sap-ux/fiori-freestyle-writer": "2.3.2",
+    "@sap-ux/fiori-elements-writer": "2.3.6",
+    "@sap-ux/fiori-freestyle-writer": "2.3.4",
     "@sap-ux/feature-toggle": "0.2.3",
-    "@sap-ux/odata-service-writer": "0.26.16",
+    "@sap-ux/odata-service-writer": "0.26.17",
     "@sap-ux/cap-config-writer": "0.9.28"
   },
   "engines": {