@sap-ux/odata-service-inquirer 2.5.6 → 2.5.8

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

@@ -145,6 +145,10 @@ function getUserSystemNameQuestion(connectValidator, promptNamespace) {
                         password: connectValidator.axiosConfig?.auth?.password,
                         serviceKeys: connectValidator.serviceInfo,
                         userDisplayName: connectValidator.connectedUserName,
+                        systemType: (0, store_1.getBackendSystemType)({
+                            serviceKeys: connectValidator.serviceInfo,
+                            authenticationType: connectValidator.systemAuthType
+                        }),
                         refreshToken: connectValidator.refreshToken
                     });
                     utils_1.PromptState.odataService.connectedSystem.backendSystem = backendSystem;

package/dist/prompts/datasources/sap-system/system-selection/prompt-helpers.d.ts

@@ -1,6 +1,6 @@
 import type { Destination } from '@sap-ux/btp-utils';
 import type { OdataVersion } from '@sap-ux/odata-service-writer';
-import type { BackendSystem } from '@sap-ux/store';
+import { type BackendSystemKey, type BackendSystem } from '@sap-ux/store';
 import type { ListChoiceOptions } from 'inquirer';
 import type { ConnectedSystem, DestinationFilters } from '../../../../types';
 import type { ConnectionValidator } from '../../../connectionValidator';
@@ -17,13 +17,13 @@ export type SystemSelectionAnswerType = {
  * Connects to the specified backend system and validates the connection.
  * Note this will return true in the case of basic auth validation failure to defer validation to the credentials prompt.
  *
- * @param backendSystem the backend system to connect to
+ * @param backendKey the key {url, client} of the backend system
  * @param connectionValidator the connection validator to use for the connection
  * @param requiredOdataVersion the required OData version for the service, this will be used to narrow the catalog service connections
  * @param cachedConnectedSystem - if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns the validation result of the backend system connection
  */
-export declare function connectWithBackendSystem(backendSystem: BackendSystem, connectionValidator: ConnectionValidator, requiredOdataVersion?: OdataVersion, cachedConnectedSystem?: ConnectedSystem): Promise<ValidationResult>;
+export declare function connectWithBackendSystem(backendKey: BackendSystemKey, connectionValidator: ConnectionValidator, requiredOdataVersion?: OdataVersion, cachedConnectedSystem?: ConnectedSystem): Promise<ValidationResult>;
 /**
  * Connects to the specified destination and validates the connection.
  * Note that a destination may be a system or a service connection.

package/dist/prompts/datasources/sap-system/system-selection/prompt-helpers.js

@@ -23,16 +23,17 @@ exports.CfAbapEnvServiceChoice = 'cfAbapEnvService';
  * Connects to the specified backend system and validates the connection.
  * Note this will return true in the case of basic auth validation failure to defer validation to the credentials prompt.
  *
- * @param backendSystem the backend system to connect to
+ * @param backendKey the key {url, client} of the backend system
  * @param connectionValidator the connection validator to use for the connection
  * @param requiredOdataVersion the required OData version for the service, this will be used to narrow the catalog service connections
  * @param cachedConnectedSystem - if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns the validation result of the backend system connection
  */
-async function connectWithBackendSystem(backendSystem, connectionValidator, requiredOdataVersion, cachedConnectedSystem) {
+async function connectWithBackendSystem(backendKey, connectionValidator, requiredOdataVersion, cachedConnectedSystem) {
     // Create a new connection with the selected system
     utils_1.PromptState.resetConnectedSystem();
     let connectValResult = false;
+    const backendSystem = await new store_1.SystemService(logger_helper_1.default.logger).read(backendKey);
     if (backendSystem) {
         // Backend systems validation supports using a cached service provider to prevent re-authentication (e.g. re-opening a browser window)
         // In case the user has changed the URL, do not use the cached service provider.
@@ -62,7 +63,10 @@ async function connectWithBackendSystem(backendSystem, connectionValidator, requ
             if (errorType === inquirer_common_1.ERROR_TYPE.AUTH &&
                 typeof backendSystem.username === 'string' &&
                 typeof backendSystem.password === 'string') {
-                logger_helper_1.default.logger.error((0, i18n_1.t)('errors.storedSystemConnectionError', { systemName: backendSystem.name, error: connectValResult }));
+                logger_helper_1.default.logger.error((0, i18n_1.t)('errors.storedSystemConnectionError', {
+                    systemName: backendSystem.name,
+                    error: connectValResult
+                }));
                 return true;
             }
         }
@@ -112,14 +116,24 @@ async function connectWithDestination(destination, connectionValidator, required
  */
 function getBackendSystemDisplayName(system) {
     const userDisplayName = system.userDisplayName ? ` [${system.userDisplayName}]` : '';
-    let systemTypeName = '';
-    if (system.authenticationType === 'reentranceTicket') {
+    const systemTypeName = getBackendSystemTypeName(system.systemType);
+    return `${system.name}${systemTypeName}${userDisplayName}`;
+}
+/**
+ * Returns the formatted system type name for the given backend system.
+ *
+ * @param systemType the system type to get the name for
+ * @returns system type name formatted as a string, e.g. " (BTP)" or " (S4HC)".
+ */
+function getBackendSystemTypeName(systemType) {
+    let systemTypeName = ''; // for on prem we do not show the system type
+    if (systemType === 'S4HC') {
         systemTypeName = ` (${(0, i18n_1.t)('texts.systemTypeS4HC')})`;
     }
-    if (system.serviceKeys) {
+    else if (systemType === 'BTP') {
         systemTypeName = ` (${(0, i18n_1.t)('texts.systemTypeBTP')})`;
     }
-    return `${system.name}${systemTypeName}${userDisplayName}`;
+    return systemTypeName;
 }
 /**
  * Matches the destination against the provided filters. Returns true if the destination matches any filters, false otherwise.
@@ -192,7 +206,7 @@ async function createSystemChoices(destinationFilters, includeCloudFoundryAbapEn
         }
     }
     else {
-        const backendSystems = await new store_1.SystemService(logger_helper_1.default.logger).getAll();
+        const backendSystems = await new store_1.SystemService(logger_helper_1.default.logger).getAll({ includeSensitiveData: false });
         systemChoices = backendSystems.map((system) => {
             return {
                 name: getBackendSystemDisplayName(system),

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

@@ -9,6 +9,7 @@ const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 const btp_utils_1 = require("@sap-ux/btp-utils");
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
+const store_1 = require("@sap-ux/store");
 const i18n_1 = require("../../../../i18n");
 const types_1 = require("../../../../types");
 const utils_1 = require("../../../../utils");
@@ -45,7 +46,8 @@ async function validateSystemSelection(systemSelection, connectionValidator, req
     }
     let connectValResult = false;
     if (systemSelection.type === 'backendSystem') {
-        connectValResult = await (0, prompt_helpers_1.connectWithBackendSystem)(systemSelection.system, connectionValidator, requiredOdataVersion, cachedConnectedSystem);
+        const backendKey = store_1.BackendSystemKey.from(systemSelection.system);
+        connectValResult = await (0, prompt_helpers_1.connectWithBackendSystem)(backendKey, connectionValidator, requiredOdataVersion, cachedConnectedSystem);
     }
     else if (systemSelection.type === 'destination') {
         // Partial URL destinations will require additional service path prompt input, so we skip the connection validation here by returning true

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

@@ -17,7 +17,7 @@ const fs_1 = require("fs");
  * @returns true if the system name is already in use, otherwise false
  */
 async function isSystemNameInUse(systemName) {
-    const backendSystems = await new store_1.SystemService(logger_helper_1.default.logger).getAll();
+    const backendSystems = await new store_1.SystemService(logger_helper_1.default.logger).getAll({ includeSensitiveData: false });
     return !!backendSystems.find((system) => system.name === systemName);
 }
 /**

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.5.6",
+  "version": "2.5.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,15 +30,15 @@
     "os-name": "4.0.1",
     "@sap-ux/axios-extension": "1.22.3",
     "@sap-ux/btp-utils": "1.1.0",
-    "@sap-ux/fiori-generator-shared": "0.12.10",
+    "@sap-ux/fiori-generator-shared": "0.12.12",
     "@sap-ux/guided-answers-helper": "0.3.0",
-    "@sap-ux/telemetry": "0.6.4",
-    "@sap-ux/inquirer-common": "0.7.15",
+    "@sap-ux/telemetry": "0.6.6",
+    "@sap-ux/inquirer-common": "0.7.17",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/nodejs-utils": "0.2.1",
-    "@sap-ux/project-access": "1.30.3",
-    "@sap-ux/project-input-validator": "0.6.5",
-    "@sap-ux/store": "1.1.0"
+    "@sap-ux/project-access": "1.30.4",
+    "@sap-ux/project-input-validator": "0.6.6",
+    "@sap-ux/store": "1.1.1"
   },
   "devDependencies": {
     "@sap-ux/vocabularies-types": "0.13.0",
@@ -47,12 +47,12 @@
     "@types/inquirer": "8.2.6",
     "@types/lodash": "4.14.202",
     "jest-extended": "3.2.4",
-    "@sap-ux/fiori-generator-shared": "0.12.10",
-    "@sap-ux/fiori-elements-writer": "2.5.4",
-    "@sap-ux/fiori-freestyle-writer": "2.4.15",
+    "@sap-ux/fiori-generator-shared": "0.12.12",
+    "@sap-ux/fiori-elements-writer": "2.5.6",
+    "@sap-ux/fiori-freestyle-writer": "2.4.17",
     "@sap-ux/feature-toggle": "0.3.0",
-    "@sap-ux/odata-service-writer": "0.27.6",
-    "@sap-ux/cap-config-writer": "0.10.11"
+    "@sap-ux/odata-service-writer": "0.27.7",
+    "@sap-ux/cap-config-writer": "0.10.13"
   },
   "engines": {
     "node": ">=20.x"