@sap-ux/odata-service-inquirer 2.3.2 → 2.3.4

package/dist/index.d.ts

@@ -7,9 +7,9 @@ import type { ServiceAnswer } from './prompts/datasources/sap-system/service-sel
 import { type SystemSelectionAnswers } from './prompts/datasources/sap-system/system-selection';
 import type { CfAbapEnvServiceChoice, NewSystemChoice, SystemSelectionAnswerType } from './prompts/datasources/sap-system/system-selection/prompt-helpers';
 import type { Annotations } from '@sap-ux/axios-extension';
+import type { CapRuntime, CapService } from '@sap-ux/cap-config-writer';
 import type { TemplateType } from '@sap-ux/fiori-elements-writer';
-import { DatasourceType, promptNames, type OdataServiceAnswers, type OdataServicePromptOptions, type OdataServiceQuestion, type SapSystemType, type EntityPromptOptions, EntityRelatedAnswers } from './types';
-import type { CapService, CapRuntime } from '@sap-ux/cap-config-writer';
+import { type EntityPromptOptions, type OdataServiceAnswers, type OdataServicePromptOptions, type OdataServiceQuestion, type SapSystemType, type ConnectedSystem, DatasourceType, EntityRelatedAnswers, promptNames } from './types';
 /**
  * Get the inquirer prompts for odata service.
  *
@@ -18,9 +18,10 @@ import type { CapService, CapRuntime } from '@sap-ux/cap-config-writer';
  * @param enableGuidedAnswers - if true, the prompts will use guided answers to help users with validation errors
  * @param telemetryClient - the telemetry client to use for sending telemetry data
  * @param isYUI - if true, the prompt is being called from the Yeoman UI extension host
+ * @param connectedSystem - if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns the prompts used to provide input for odata service generation and a reference to the answers object which will be populated with the user's responses once `inquirer.prompt` returns
  */
-declare function getPrompts(promptOptions?: OdataServicePromptOptions, logger?: Logger, enableGuidedAnswers?: boolean, telemetryClient?: ToolsSuiteTelemetryClient, isYUI?: boolean): Promise<{
+declare function getPrompts(promptOptions?: OdataServicePromptOptions, logger?: Logger, enableGuidedAnswers?: boolean, telemetryClient?: ToolsSuiteTelemetryClient, isYUI?: boolean, connectedSystem?: ConnectedSystem): Promise<{
     prompts: OdataServiceQuestion[];
     answers: Partial<OdataServiceAnswers>;
 }>;
@@ -58,8 +59,9 @@ declare function getEntityRelatedPrompts(metadata: string, templateType: Templat
  * @param enableGuidedAnswers - if true, the prompts will use guided answers to help users with validation errors
  * @param telemetryClient - the telemetry client to use for sending telemetry data
  * @param isYUI - if true, the prompt is being called from the Yeoman UI extension host
+ * @param connectedSystem - if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns the prompt answers
  */
-declare function prompt(adapter: InquirerAdapter, promptOptions?: OdataServicePromptOptions, logger?: Logger, enableGuidedAnswers?: boolean, telemetryClient?: ToolsSuiteTelemetryClient, isYUI?: boolean): Promise<OdataServiceAnswers>;
-export { CfAbapEnvServiceChoice, DatasourceType, EntityRelatedAnswers, ERROR_TYPE, ErrorHandler, getEntityRelatedPrompts, getPrompts, getSystemSelectionQuestions, NewSystemChoice, OdataVersion, prompt, promptNames, SystemSelectionAnswerType, type CapRuntime, type CapService, type InquirerAdapter, type OdataServiceAnswers, type OdataServicePromptOptions, type SapSystemType };
+declare function prompt(adapter: InquirerAdapter, promptOptions?: OdataServicePromptOptions, logger?: Logger, enableGuidedAnswers?: boolean, telemetryClient?: ToolsSuiteTelemetryClient, isYUI?: boolean, connectedSystem?: ConnectedSystem): Promise<OdataServiceAnswers>;
+export { CfAbapEnvServiceChoice, DatasourceType, EntityRelatedAnswers, ERROR_TYPE, ErrorHandler, getEntityRelatedPrompts, getPrompts, getSystemSelectionQuestions, NewSystemChoice, OdataVersion, prompt, promptNames, SystemSelectionAnswerType, type CapRuntime, type CapService, type InquirerAdapter, type OdataServiceAnswers, type OdataServicePromptOptions, type SapSystemType, type ConnectedSystem };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -31,9 +31,10 @@ const utils_1 = require("./utils");
  * @param enableGuidedAnswers - if true, the prompts will use guided answers to help users with validation errors
  * @param telemetryClient - the telemetry client to use for sending telemetry data
  * @param isYUI - if true, the prompt is being called from the Yeoman UI extension host
+ * @param connectedSystem - if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns the prompts used to provide input for odata service generation and a reference to the answers object which will be populated with the user's responses once `inquirer.prompt` returns
  */
-async function getPrompts(promptOptions, logger, enableGuidedAnswers = false, telemetryClient, isYUI = false) {
+async function getPrompts(promptOptions, logger, enableGuidedAnswers = false, telemetryClient, isYUI = false, connectedSystem) {
     // prompt texts must be loaded before the prompts are created, wait for the i18n bundle to be initialized
     await (0, i18n_1.initI18nOdataServiceInquirer)();
     if (logger) {
@@ -47,7 +48,7 @@ async function getPrompts(promptOptions, logger, enableGuidedAnswers = false, te
     utils_1.PromptState.isYUI = isYUI;
     (0, inquirer_common_1.setTelemetryClient)(telemetryClient);
     return {
-        prompts: await (0, prompts_1.getQuestions)(promptOptions),
+        prompts: await (0, prompts_1.getQuestions)(promptOptions, connectedSystem),
         // Return reference to derived answers object that will be populated with user responses (after prompting is complete)
         answers: utils_1.PromptState.odataService
     };
@@ -97,15 +98,15 @@ function getEntityRelatedPrompts(metadata, templateType, isCapService = false, p
  * @param enableGuidedAnswers - if true, the prompts will use guided answers to help users with validation errors
  * @param telemetryClient - the telemetry client to use for sending telemetry data
  * @param isYUI - if true, the prompt is being called from the Yeoman UI extension host
+ * @param connectedSystem - if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns the prompt answers
  */
-async function prompt(adapter, promptOptions, logger, enableGuidedAnswers, telemetryClient, isYUI = false) {
+async function prompt(adapter, promptOptions, logger, enableGuidedAnswers, telemetryClient, isYUI = false, connectedSystem) {
     if (adapter?.promptModule && promptOptions?.serviceSelection?.useAutoComplete) {
         const pm = adapter.promptModule;
         pm.registerPrompt('autocomplete', inquirer_autocomplete_prompt_1.default);
     }
-    const odataServicePrompts = (await getPrompts(promptOptions, logger, enableGuidedAnswers, telemetryClient, isYUI))
-        .prompts;
+    const odataServicePrompts = (await getPrompts(promptOptions, logger, enableGuidedAnswers, telemetryClient, isYUI, connectedSystem)).prompts;
     const answers = await adapter.prompt(odataServicePrompts);
     // Add dervied service answers to the answers object
     Object.assign(answers, utils_1.PromptState.odataService);

package/dist/prompts/connectionValidator.d.ts

@@ -2,6 +2,7 @@ import type { AxiosRequestConfig, CatalogService, ODataService, ServiceInfo, Ser
 import { ODataVersion } from '@sap-ux/axios-extension';
 import { type Destination } from '@sap-ux/btp-utils';
 import { ERROR_TYPE } from '@sap-ux/inquirer-common';
+import type { ConnectedSystem } from '../types';
 import type { ValidationResult } from './types';
 /**
  * Structure to store validity information about url to be validated.
@@ -131,6 +132,16 @@ export declare class ConnectionValidator {
      *
      */
     set connectedSystemName(value: string | undefined);
+    /**
+     * 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.
+     *
+     * @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 }: ConnectedSystem): void;
     /**
      * Calls a given service or system url to test its reachability and authentication requirements.
      * If the url is a system url, it will attempt to use the catalog service to get the service info.

package/dist/prompts/connectionValidator.js

@@ -176,6 +176,39 @@ class ConnectionValidator {
     set connectedSystemName(value) {
         this._connectedSystemName = value;
     }
+    /**
+     * 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.
+     *
+     * @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
+        this._serviceProvider = serviceProvider;
+        this._catalogV2 = this._serviceProvider.catalog(axios_extension_1.ODataVersion.v2);
+        this._catalogV4 = this._serviceProvider.catalog(axios_extension_1.ODataVersion.v4);
+        this._validatedUrl = backendSystem?.serviceKeys?.url ?? backendSystem?.url;
+        this._connectedUserName = backendSystem?.userDisplayName;
+        this._validatedClient = backendSystem?.client;
+        this._refreshToken = backendSystem?.refreshToken;
+        this._serviceInfo = backendSystem?.serviceKeys;
+        this.validity.authenticated = true;
+        this.validity.reachable = true;
+        this.validity.urlFormat = true;
+        this.validity.authRequired = true;
+        if (backendSystem?.authenticationType === 'reentranceTicket') {
+            this.systemAuthType = 'reentranceTicket';
+        }
+        else if (backendSystem?.serviceKeys) {
+            this.systemAuthType = 'serviceKey';
+        }
+        else {
+            this.systemAuthType = 'basic';
+        }
+    }
     /**
      * Calls a given service or system url to test its reachability and authentication requirements.
      * If the url is a system url, it will attempt to use the catalog service to get the service info.
@@ -424,6 +457,11 @@ class ConnectionValidator {
         if (!serviceInfo) {
             return false;
         }
+        // If we are already authenticated and the url is the same, no need to re-authenticate as this may result in a browser based authentication
+        if (serviceInfo.url === this.validatedUrl &&
+            JSON.stringify(serviceInfo.uaa) === JSON.stringify(this.serviceInfo?.uaa)) {
+            return this.getValidationResultFromStatusCode(200);
+        }
         try {
             this.systemAuthType = 'serviceKey';
             await this.createSystemConnection({ serviceInfo, odataVersion, refreshToken });

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

@@ -1,7 +1,7 @@
 import type { OdataVersion } from '@sap-ux/odata-service-writer';
 import { type ServiceInstanceInfo } from '@sap/cf-tools';
 import type { Question } from 'inquirer';
-import { type OdataServiceAnswers, type OdataServicePromptOptions } from '../../../../types';
+import type { ConnectedSystem, OdataServiceAnswers, OdataServicePromptOptions } from '../../../../types';
 import { ConnectionValidator } from '../../../connectionValidator';
 import { type ServiceAnswer } from '../service-selection';
 declare const systemUrlPromptName: "abapOnBtp:newSystemUrl";
@@ -21,9 +21,10 @@ interface AbapOnBtpAnswers extends Partial<OdataServiceAnswers> {
  * Get the questions for the ABAP on BTP system within the VSCode platform. The questions will prompt the user for the system type (Cloud Foundry, Service Key, Re-entrance Ticket).
  *
  * @param promptOptions The prompt options which control the service selection and system name]
+ * @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 list of questions for the ABAP on BTP system
  */
-export declare function getAbapOnBTPSystemQuestions(promptOptions?: OdataServicePromptOptions): Question<AbapOnBtpAnswers & ServiceAnswer>[];
+export declare function getAbapOnBTPSystemQuestions(promptOptions?: OdataServicePromptOptions, cachedConnectedSystem?: ConnectedSystem): Question<AbapOnBtpAnswers & ServiceAnswer>[];
 /**
  * Get the Cloud Foundry Abap system discovery prompt. This prompt will list all available ABAP environments in the connected Cloud Foundry space.
  * If the Cloud Foundry connection fails, a warning message will be displayed.
@@ -31,8 +32,9 @@ export declare function getAbapOnBTPSystemQuestions(promptOptions?: OdataService
  * @param connectionValidator The connection validator
  * @param promptNamespace
  * @param requiredOdataVersion
+ * @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 Cloud Foundry ABAP system discovery prompt
  */
-export declare function getCFDiscoverPrompts(connectionValidator: ConnectionValidator, promptNamespace?: string, requiredOdataVersion?: OdataVersion): Question[];
+export declare function getCFDiscoverPrompts(connectionValidator: ConnectionValidator, promptNamespace?: string, requiredOdataVersion?: OdataVersion, cachedConnectedSystem?: ConnectedSystem): Question[];
 export {};
 //# sourceMappingURL=questions.d.ts.map

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

@@ -14,9 +14,9 @@ const utils_1 = require("../../../../utils");
 const connectionValidator_1 = require("../../../connectionValidator");
 const logger_helper_1 = __importDefault(require("../../../logger-helper"));
 const prompt_helpers_1 = require("../../../prompt-helpers");
-const shared_prompts_1 = require("../shared-prompts/shared-prompts");
 const types_1 = require("../new-system/types");
 const service_selection_1 = require("../service-selection");
+const shared_prompts_1 = require("../shared-prompts/shared-prompts");
 const prompt_helpers_2 = require("../system-selection/prompt-helpers");
 const validators_1 = require("../validators");
 const abapOnBtpPromptNamespace = 'abapOnBtp';
@@ -31,9 +31,10 @@ const abapOnBtpPromptNames = {
  * Get the questions for the ABAP on BTP system within the VSCode platform. The questions will prompt the user for the system type (Cloud Foundry, Service Key, Re-entrance Ticket).
  *
  * @param promptOptions The prompt options which control the service selection and system name]
+ * @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 list of questions for the ABAP on BTP system
  */
-function getAbapOnBTPSystemQuestions(promptOptions) {
+function getAbapOnBTPSystemQuestions(promptOptions, cachedConnectedSystem) {
     utils_1.PromptState.reset();
     const connectValidator = new connectionValidator_1.ConnectionValidator();
     const questions = [];
@@ -54,7 +55,7 @@ function getAbapOnBTPSystemQuestions(promptOptions) {
     });
     // Re-entrance ticket system prompt
     questions.push((0, inquirer_common_1.withCondition)([
-        (0, shared_prompts_1.getSystemUrlQuestion)(connectValidator, abapOnBtpPromptNamespace, promptOptions?.serviceSelection?.requiredOdataVersion)
+        (0, shared_prompts_1.getSystemUrlQuestion)(connectValidator, abapOnBtpPromptNamespace, promptOptions?.serviceSelection?.requiredOdataVersion, cachedConnectedSystem)
     ], (answers) => {
         if (answers?.abapOnBtpAuthType === 'reentranceTicket') {
             connectValidator.systemAuthType = answers.abapOnBtpAuthType;
@@ -63,8 +64,8 @@ function getAbapOnBTPSystemQuestions(promptOptions) {
         return false;
     })[0]);
     // Service Key file prompt
-    questions.push((0, inquirer_common_1.withCondition)([getServiceKeyPrompt(connectValidator)], (answers) => answers?.abapOnBtpAuthType === 'serviceKey')[0]);
-    questions.push(...(0, inquirer_common_1.withCondition)([...getCFDiscoverPrompts(connectValidator)], (answers) => answers?.abapOnBtpAuthType === 'cloudFoundry'));
+    questions.push((0, inquirer_common_1.withCondition)([getServiceKeyPrompt(connectValidator, cachedConnectedSystem)], (answers) => answers?.abapOnBtpAuthType === 'serviceKey')[0]);
+    questions.push(...(0, inquirer_common_1.withCondition)([...getCFDiscoverPrompts(connectValidator, undefined, undefined, cachedConnectedSystem)], (answers) => answers?.abapOnBtpAuthType === 'cloudFoundry'));
     // New system store name propmt
     if (promptOptions?.userSystemName?.hide !== true) {
         // New system question will allow user to give the system a user friendly name
@@ -84,9 +85,10 @@ function getAbapOnBTPSystemQuestions(promptOptions) {
  * @param connectionValidator connection validator instance
  * @param requiredOdataVersion
  * @param isCli validation on CLI ill throw rather than returning a validation message as users cannot change previous answers on CLI
+ * @param cachedConnectedSystem
  * @returns true if the service info is valid, a validation message if the service info is invalid, or a validation link if the service info is not validated but some help is available
  */
-async function validateCFServiceInfo(abapService, connectionValidator, requiredOdataVersion, isCli = false) {
+async function validateCFServiceInfo(abapService, connectionValidator, requiredOdataVersion, isCli = false, cachedConnectedSystem) {
     utils_1.PromptState.resetConnectedSystem();
     const cfAbapServiceName = abapService.label;
     const uaaCreds = await (0, cf_tools_1.apiGetInstanceCredentials)(cfAbapServiceName); // should be abapService.serviceName in BAS?
@@ -109,6 +111,14 @@ async function validateCFServiceInfo(abapService, connectionValidator, requiredO
         }
     }
     else {
+        // Backend systems validation supports using a cached connections from a previous step execution to prevent re-authentication (e.g. re-opening a browser window)
+        // In case the user has changed the URL, do not use the cached connection.
+        if (cachedConnectedSystem &&
+            cachedConnectedSystem.backendSystem?.url === uaaCreds.credentials.url &&
+            JSON.stringify(cachedConnectedSystem.backendSystem.serviceKeys.uaa) ===
+                JSON.stringify(uaaCreds.credentials.uaa)) {
+            connectionValidator.setConnectedSystem(cachedConnectedSystem);
+        }
         valResult = await connectionValidator.validateServiceInfo(uaaCreds.credentials);
     }
     if (!isCli && valResult !== true) {
@@ -142,9 +152,10 @@ async function validateCFServiceInfo(abapService, connectionValidator, requiredO
  * @param connectionValidator The connection validator
  * @param promptNamespace
  * @param requiredOdataVersion
+ * @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 Cloud Foundry ABAP system discovery prompt
  */
-function getCFDiscoverPrompts(connectionValidator, promptNamespace, requiredOdataVersion) {
+function getCFDiscoverPrompts(connectionValidator, promptNamespace, requiredOdataVersion, cachedConnectedSystem) {
     let choices = [];
     const promptName = `${promptNamespace ? promptNamespace + ':' : ''}${abapOnBtpPromptNames.cloudFoundryAbapSystem}`;
     const questions = [
@@ -169,7 +180,7 @@ function getCFDiscoverPrompts(connectionValidator, promptNamespace, requiredOdat
             message: (0, i18n_1.t)('prompts.cloudFoundryAbapSystem.message'),
             validate: async (abapService) => {
                 if (abapService) {
-                    return await validateCFServiceInfo(abapService, connectionValidator, requiredOdataVersion, (0, utils_1.getPromptHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli);
+                    return await validateCFServiceInfo(abapService, connectionValidator, requiredOdataVersion, (0, utils_1.getPromptHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli, cachedConnectedSystem);
                 }
                 const errorType = prompt_helpers_1.errorHandler.getCurrentErrorType();
                 if (errorType === inquirer_common_1.ERROR_TYPE.NO_ABAP_ENVS) {
@@ -200,9 +211,10 @@ function getCFDiscoverPrompts(connectionValidator, promptNamespace, requiredOdat
  * Get the service key prompt for the ABAP on BTP system. This prompt will allow the user to select a service key file from the file system.
  *
  * @param connectionValidator a connection validator instance
+ * @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 service key prompt
  */
-function getServiceKeyPrompt(connectionValidator) {
+function getServiceKeyPrompt(connectionValidator, cachedConnectedSystem) {
     const question = {
         type: 'input',
         name: abapOnBtpPromptNames.serviceKey,
@@ -218,6 +230,14 @@ function getServiceKeyPrompt(connectionValidator) {
             if (typeof serviceKeyValResult === 'string' || typeof serviceKeyValResult === 'boolean') {
                 return serviceKeyValResult;
             }
+            // Backend systems validation supports using a cached connections from a previous step execution to prevent re-authentication (e.g. re-opening a browser window)
+            // In case the user has changed the URL, do not use the cached connection.
+            if (cachedConnectedSystem &&
+                cachedConnectedSystem.backendSystem?.url === serviceKeyValResult.url &&
+                JSON.stringify(cachedConnectedSystem.backendSystem.serviceKeys.uaa) ===
+                    JSON.stringify(serviceKeyValResult.uaa)) {
+                connectionValidator.setConnectedSystem(cachedConnectedSystem);
+            }
             const connectValResult = await connectionValidator.validateServiceInfo(serviceKeyValResult);
             if (connectValResult === true && connectionValidator.serviceProvider) {
                 utils_1.PromptState.odataService.connectedSystem = {

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

@@ -101,7 +101,7 @@ function getCredentialsPrompts(connectionValidator, promptNamespace, sapClient)
  */
 function updatePromptStateWithConnectedSystem(serviceProvider, selectedSystem, { username, password }) {
     utils_1.PromptState.odataService.connectedSystem = {
-        serviceProvider
+        serviceProvider: (0, utils_1.removeCircularFromServiceProvider)(serviceProvider)
     };
     // Update the existing backend system with the new credentials that may be used to update in the store.
     if (selectedSystem?.type === 'backendSystem') {

package/dist/prompts/datasources/sap-system/new-system/questions.d.ts

@@ -1,18 +1,12 @@
 import type { Question } from 'inquirer';
-import type { OdataServicePromptOptions, SapSystemType, promptNames } from '../../../../types';
-import { newSystemPromptNames } from './types';
-/**
- * Internal only answers to service URL prompting not returned with OdataServiceAnswers.
- */
-export interface NewSystemAnswers {
-    [newSystemPromptNames.newSystemType]?: SapSystemType;
-    [promptNames.userSystemName]?: string;
-}
+import type { ConnectedSystem, OdataServicePromptOptions } from '../../../../types';
+import { type NewSystemAnswers } from './types';
 /**
  * Provides prompts that allow the creation of a new system connection.
  *
  * @param promptOptions options for the new system prompts see {@link OdataServicePromptOptions}
+ * @param connectedSystem if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns questions for creating a new system connection
  */
-export declare function getNewSystemQuestions(promptOptions?: OdataServicePromptOptions): Question<NewSystemAnswers>[];
+export declare function getNewSystemQuestions(promptOptions?: OdataServicePromptOptions, connectedSystem?: ConnectedSystem): Question<NewSystemAnswers>[];
 //# sourceMappingURL=questions.d.ts.map

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

@@ -13,9 +13,10 @@ const types_1 = require("./types");
  * Provides prompts that allow the creation of a new system connection.
  *
  * @param promptOptions options for the new system prompts see {@link OdataServicePromptOptions}
+ * @param connectedSystem if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns questions for creating a new system connection
  */
-function getNewSystemQuestions(promptOptions) {
+function getNewSystemQuestions(promptOptions, connectedSystem) {
     const questions = [
         {
             type: 'list',
@@ -28,7 +29,7 @@ function getNewSystemQuestions(promptOptions) {
         }
     ];
     questions.push(...(0, inquirer_common_1.withCondition)((0, questions_2.getAbapOnPremQuestions)(promptOptions), (answers) => answers.newSystemType === 'abapOnPrem'));
-    questions.push(...(0, inquirer_common_1.withCondition)((0, questions_1.getAbapOnBTPSystemQuestions)(promptOptions), (answers) => answers.newSystemType === 'abapOnBtp'));
+    questions.push(...(0, inquirer_common_1.withCondition)((0, questions_1.getAbapOnBTPSystemQuestions)(promptOptions, connectedSystem), (answers) => answers.newSystemType === 'abapOnBtp'));
     return questions;
 }
 //# sourceMappingURL=questions.js.map

package/dist/prompts/datasources/sap-system/new-system/types.d.ts

@@ -1,6 +1,14 @@
+import { promptNames, type SapSystemType } from '../../../../types';
 export declare const newSystemPromptNames: {
     readonly newSystemType: "newSystemType";
     readonly newSystemUrl: "newSystemUrl";
     readonly newSystemAuthType: "newSystemAuthType";
 };
+/**
+ * Internal only answers to service URL prompting not returned with OdataServiceAnswers.
+ */
+export interface NewSystemAnswers {
+    [newSystemPromptNames.newSystemType]?: SapSystemType;
+    [promptNames.userSystemName]?: string;
+}
 //# sourceMappingURL=types.d.ts.map

package/dist/prompts/datasources/sap-system/new-system/types.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.newSystemPromptNames = void 0;
+// eslint-disable-next-line
+const types_1 = require("../../../../types");
 exports.newSystemPromptNames = {
     newSystemType: 'newSystemType',
     newSystemUrl: 'newSystemUrl',

package/dist/prompts/datasources/sap-system/service-selection/service-helper.d.ts

@@ -7,18 +7,6 @@ import type { ConnectionValidator } from '../../../connectionValidator';
 import type { ServiceAnswer } from './types';
 import type { ConvertedMetadata } from '@sap-ux/vocabularies-types';
 export declare const telemEventBASServiceSuccess = "SERVICE_INQUIRER_BAS_SUCCESS";
-/**
- * Refines the error type and logs based on the specified options. This should log more precise error messages based on inputs
- * and the platform making the call i.e. VSC | SBAS. Errors are mapped to GA links if the platform is SBAS.
- *
- * @param options Options
- * @param options.system - sap system used
- * @param options.catRequestErrorTypes - all catalog service request error types, used to do further root cause analysis
- * @param options.rootCauseErrorType - the error type as determined by the caller, will be used if a more precise error type cannot be determined by rca
- * @param options.logMsg - the log message that will be used if a better root cause is not determined
- * @param options.error - the original error, used to determine the error log message if otherwise not determined
- * @param option.reqVersion - specific odata version that is required by the template
- */
 /**
  * Get the service choices from the specified catalogs.
  *

package/dist/prompts/datasources/sap-system/service-selection/service-helper.js

@@ -77,18 +77,6 @@ function logServiceCatalogErrorsForHelp(requestErrors, numOfRequests) {
         prompt_helpers_1.errorHandler.logErrorMsgs((0, i18n_1.t)('errors.allCatalogServiceRequestsFailed', { version: Object.keys(requestErrors).join(', ') }));
     }
 }
-/**
- * Refines the error type and logs based on the specified options. This should log more precise error messages based on inputs
- * and the platform making the call i.e. VSC | SBAS. Errors are mapped to GA links if the platform is SBAS.
- *
- * @param options Options
- * @param options.system - sap system used
- * @param options.catRequestErrorTypes - all catalog service request error types, used to do further root cause analysis
- * @param options.rootCauseErrorType - the error type as determined by the caller, will be used if a more precise error type cannot be determined by rca
- * @param options.logMsg - the log message that will be used if a better root cause is not determined
- * @param options.error - the original error, used to determine the error log message if otherwise not determined
- * @param option.reqVersion - specific odata version that is required by the template
- */
 /**
  * Get the service choices from the specified catalogs.
  *

package/dist/prompts/datasources/sap-system/shared-prompts/shared-prompts.d.ts

@@ -4,17 +4,19 @@
 import { type InputQuestion } from '@sap-ux/inquirer-common';
 import type { OdataVersion } from '@sap-ux/odata-service-writer';
 import type { Answers } from 'inquirer';
+import type { ConnectedSystem } from '../../../../types';
 import type { ConnectionValidator } from '../../../connectionValidator';
-import type { NewSystemAnswers } from '../new-system/questions';
+import { type NewSystemAnswers } from '../new-system/types';
 /**
  * Get the system url prompt. The system url prompt is used to connect to a new system using the user input system url.
  *
  * @param connectValidator a connection validator instance used to validate the system url
  * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
  * @param requiredOdataVersion The required OData version for the system connection, only catalogs supporting the specifc odata version will be used.
+ * @param cachedConnectedSystem
  * @returns the system url prompt
  */
-export declare function getSystemUrlQuestion<T extends Answers>(connectValidator: ConnectionValidator, promptNamespace?: string, requiredOdataVersion?: OdataVersion): InputQuestion<T>;
+export declare function getSystemUrlQuestion<T extends Answers>(connectValidator: ConnectionValidator, promptNamespace?: string, requiredOdataVersion?: OdataVersion, cachedConnectedSystem?: ConnectedSystem): InputQuestion<T>;
 /**
  * Get a prompt for new system name.
  *

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

@@ -34,9 +34,10 @@ function systemAuthTypeToAuthenticationType(systemAuthType) {
  * @param connectValidator a connection validator instance used to validate the system url
  * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
  * @param requiredOdataVersion The required OData version for the system connection, only catalogs supporting the specifc odata version will be used.
+ * @param cachedConnectedSystem
  * @returns the system url prompt
  */
-function getSystemUrlQuestion(connectValidator, promptNamespace, requiredOdataVersion) {
+function getSystemUrlQuestion(connectValidator, promptNamespace, requiredOdataVersion, cachedConnectedSystem) {
     const promptName = `${promptNamespace ? promptNamespace + ':' : ''}${types_2.newSystemPromptNames.newSystemUrl}`;
     const newSystemUrlQuestion = {
         type: 'input',
@@ -49,6 +50,13 @@ function getSystemUrlQuestion(connectValidator, promptNamespace, requiredOdataVe
         },
         validate: async (url) => {
             utils_1.PromptState.resetConnectedSystem();
+            // Backend systems validation supports using a cached connections from a previous step execution to prevent re-authentication (e.g. re-opening a browser window)
+            // Only in the case or re-entrance tickets will we reuse an existing connection.
+            if (cachedConnectedSystem &&
+                cachedConnectedSystem.backendSystem?.url === url &&
+                cachedConnectedSystem.backendSystem?.authenticationType === 'reentranceTicket') {
+                connectValidator.setConnectedSystem(cachedConnectedSystem);
+            }
             const valResult = await connectValidator.validateUrl(url, {
                 isSystem: true,
                 odataVersion: (0, utils_1.convertODataVersionType)(requiredOdataVersion)

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

@@ -2,7 +2,7 @@ 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 { ListChoiceOptions } from 'inquirer';
-import { type DestinationFilters } from '../../../../types';
+import type { ConnectedSystem, DestinationFilters } from '../../../../types';
 import type { ConnectionValidator } from '../../../connectionValidator';
 import type { ValidationResult } from '../../../types';
 export declare const NewSystemChoice = "!@\u00A3*&937newSystem*X~qy^";
@@ -20,9 +20,10 @@ export type SystemSelectionAnswerType = {
  * @param backendSystem the backend system to connect to
  * @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): Promise<ValidationResult>;
+export declare function connectWithBackendSystem(backendSystem: BackendSystem, 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

@@ -10,8 +10,8 @@ exports.getBackendSystemDisplayName = getBackendSystemDisplayName;
 exports.createSystemChoices = createSystemChoices;
 exports.findDefaultSystemSelectionIndex = findDefaultSystemSelectionIndex;
 const btp_utils_1 = require("@sap-ux/btp-utils");
-const store_1 = require("@sap-ux/store");
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
+const store_1 = require("@sap-ux/store");
 const i18n_1 = require("../../../../i18n");
 const utils_1 = require("../../../../utils");
 const logger_helper_1 = __importDefault(require("../../../logger-helper"));
@@ -26,13 +26,19 @@ exports.CfAbapEnvServiceChoice = 'cfAbapEnvService';
  * @param backendSystem the backend system to connect to
  * @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) {
+async function connectWithBackendSystem(backendSystem, connectionValidator, requiredOdataVersion, cachedConnectedSystem) {
     // Create a new connection with the selected system
     utils_1.PromptState.resetConnectedSystem();
     let connectValResult = false;
     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.
+        if (cachedConnectedSystem && cachedConnectedSystem.backendSystem?.url === backendSystem.url) {
+            connectionValidator.setConnectedSystem(cachedConnectedSystem);
+        }
         // Assumption: non-BAS systems are BackendSystems
         if (backendSystem.authenticationType === 'reentranceTicket') {
             connectValResult = await connectionValidator.validateUrl(backendSystem.url, {

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

@@ -1,5 +1,5 @@
 import type { Question } from 'inquirer';
-import { type OdataServicePromptOptions, promptNames } from '../../../../types';
+import { type ConnectedSystem, type OdataServicePromptOptions, promptNames } from '../../../../types';
 import { ConnectionValidator } from '../../../connectionValidator';
 import type { ServiceAnswer } from '../service-selection';
 import { type SystemSelectionAnswerType } from './prompt-helpers';
@@ -16,9 +16,10 @@ export interface SystemSelectionAnswers extends SystemSelectionCredentialsAnswer
  * Returns a list of questions for creating a new system configuration or selecting an existing stored system.
  *
  * @param promptOptions prompt options that may be used to customize the questions
+ * @param connectedSystem - if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns a list of questions for creating a new system configuration or selecting an existing stored system
  */
-export declare function getSystemSelectionQuestions(promptOptions?: OdataServicePromptOptions): Promise<Question<SystemSelectionAnswers & ServiceAnswer>[]>;
+export declare function getSystemSelectionQuestions(promptOptions?: OdataServicePromptOptions, connectedSystem?: ConnectedSystem): Promise<Question<SystemSelectionAnswers & ServiceAnswer>[]>;
 /**
  * Returns a list of existing systems, either destinations or backend systems from persistent store, depending on the environment.
  * Note that destinations are only available in BAS environment and must include the destination attribute `WebIDEEnabled` to be listed.
@@ -26,8 +27,9 @@ export declare function getSystemSelectionQuestions(promptOptions?: OdataService
  *
  * @param connectionValidator A reference to the active connection validator, used to validate the service selection and retrieve service details.
  * @param promptOptions prompt options that may be used to customize the questions
+ * @param cachedConnectedSystem - if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns a list of existing systems
  */
-export declare function getSystemConnectionQuestions(connectionValidator: ConnectionValidator, promptOptions?: OdataServicePromptOptions): Promise<Question<SystemSelectionAnswers>[]>;
+export declare function getSystemConnectionQuestions(connectionValidator: ConnectionValidator, promptOptions?: OdataServicePromptOptions, cachedConnectedSystem?: ConnectedSystem): Promise<Question<SystemSelectionAnswers>[]>;
 export {};
 //# sourceMappingURL=questions.d.ts.map

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

@@ -14,15 +14,15 @@ const types_1 = require("../../../../types");
 const utils_1 = require("../../../../utils");
 const connectionValidator_1 = require("../../../connectionValidator");
 const logger_helper_1 = __importDefault(require("../../../logger-helper"));
-const questions_1 = require("../credentials/questions");
-const questions_2 = require("../new-system/questions");
-const questions_3 = require("../service-selection/questions");
-const questions_4 = require("../cf-abap/questions");
+const questions_1 = require("../cf-abap/questions");
+const questions_2 = require("../credentials/questions");
+const questions_3 = require("../new-system/questions");
+const questions_4 = require("../service-selection/questions");
 const validators_1 = require("../validators");
 const prompt_helpers_1 = require("./prompt-helpers");
 const systemSelectionPromptNamespace = 'systemSelection';
-const usernamePromptName = `${systemSelectionPromptNamespace}:${questions_1.BasicCredentialsPromptNames.systemUsername}`;
-const passwordPromptName = `${systemSelectionPromptNamespace}:${questions_1.BasicCredentialsPromptNames.systemPassword}`;
+const usernamePromptName = `${systemSelectionPromptNamespace}:${questions_2.BasicCredentialsPromptNames.systemUsername}`;
+const passwordPromptName = `${systemSelectionPromptNamespace}:${questions_2.BasicCredentialsPromptNames.systemPassword}`;
 const systemSelectionPromptNames = {
     systemSelectionCli: 'systemSelectionCli',
     destinationServicePath: 'destinationServicePath'
@@ -33,9 +33,10 @@ const systemSelectionPromptNames = {
  * @param systemSelection the selected system to validate
  * @param connectionValidator the active connection validator to use for the connection attempt
  * @param requiredOdataVersion the required OData version for the selected system, only the specified version will be used to request a service catalog
+ * @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 selected system connection attempt
  */
-async function validateSystemSelection(systemSelection, connectionValidator, requiredOdataVersion) {
+async function validateSystemSelection(systemSelection, connectionValidator, requiredOdataVersion, cachedConnectedSystem) {
     utils_1.PromptState.reset();
     if (systemSelection.type === 'newSystemChoice' || systemSelection.type === 'cfAbapEnvService') {
         // Reset the connection state
@@ -44,7 +45,7 @@ async function validateSystemSelection(systemSelection, connectionValidator, req
     }
     let connectValResult = false;
     if (systemSelection.type === 'backendSystem') {
-        connectValResult = await (0, prompt_helpers_1.connectWithBackendSystem)(systemSelection.system, connectionValidator, requiredOdataVersion);
+        connectValResult = await (0, prompt_helpers_1.connectWithBackendSystem)(systemSelection.system, 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
@@ -62,22 +63,23 @@ async function validateSystemSelection(systemSelection, connectionValidator, req
  * Returns a list of questions for creating a new system configuration or selecting an existing stored system.
  *
  * @param promptOptions prompt options that may be used to customize the questions
+ * @param connectedSystem - if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns a list of questions for creating a new system configuration or selecting an existing stored system
  */
-async function getSystemSelectionQuestions(promptOptions) {
+async function getSystemSelectionQuestions(promptOptions, connectedSystem) {
     utils_1.PromptState.reset();
     const connectValidator = new connectionValidator_1.ConnectionValidator();
-    const questions = await getSystemConnectionQuestions(connectValidator, promptOptions);
+    const questions = await getSystemConnectionQuestions(connectValidator, promptOptions, connectedSystem);
     // Existing system (BackendSystem or Destination) selected,
     if (!promptOptions?.serviceSelection?.hide) {
-        questions.push(...(0, inquirer_common_1.withCondition)((0, questions_3.getSystemServiceQuestion)(connectValidator, systemSelectionPromptNamespace, promptOptions?.serviceSelection), (answers) => answers.systemSelection?.type !== 'newSystemChoice'));
+        questions.push(...(0, inquirer_common_1.withCondition)((0, questions_4.getSystemServiceQuestion)(connectValidator, systemSelectionPromptNamespace, promptOptions?.serviceSelection), (answers) => answers.systemSelection?.type !== 'newSystemChoice'));
     }
     // Create new system connection for storage only supported on non-App Studio environments
     if (!(0, btp_utils_1.isAppStudio)()) {
-        questions.push(...(0, inquirer_common_1.withCondition)((0, questions_2.getNewSystemQuestions)(promptOptions), (answers) => answers.systemSelection?.type === 'newSystemChoice'));
+        questions.push(...(0, inquirer_common_1.withCondition)((0, questions_3.getNewSystemQuestions)(promptOptions, connectedSystem), (answers) => answers.systemSelection?.type === 'newSystemChoice'));
     }
     else {
-        questions.push(...(0, inquirer_common_1.withCondition)((0, questions_4.getCfAbapBASQuestions)(promptOptions?.serviceSelection), (answers) => answers.systemSelection?.type === 'cfAbapEnvService'));
+        questions.push(...(0, inquirer_common_1.withCondition)((0, questions_1.getCfAbapBASQuestions)(promptOptions?.serviceSelection), (answers) => answers.systemSelection?.type === 'cfAbapEnvService'));
     }
     return questions;
 }
@@ -88,9 +90,10 @@ async function getSystemSelectionQuestions(promptOptions) {
  *
  * @param connectionValidator A reference to the active connection validator, used to validate the service selection and retrieve service details.
  * @param promptOptions prompt options that may be used to customize the questions
+ * @param cachedConnectedSystem - if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns a list of existing systems
  */
-async function getSystemConnectionQuestions(connectionValidator, promptOptions) {
+async function getSystemConnectionQuestions(connectionValidator, promptOptions, cachedConnectedSystem) {
     const requiredOdataVersion = promptOptions?.serviceSelection?.requiredOdataVersion;
     const destinationFilters = promptOptions?.systemSelection?.destinationFilters;
     const systemChoices = await (0, prompt_helpers_1.createSystemChoices)(destinationFilters, promptOptions?.systemSelection?.includeCloudFoundryAbapEnvChoice);
@@ -117,7 +120,7 @@ async function getSystemConnectionQuestions(connectionValidator, promptOptions)
                 if (promptOptions?.systemSelection?.useAutoComplete && selectedSystem.value) {
                     selectedSystemAnswer = selectedSystem.value;
                 }
-                return (validateSystemSelection(selectedSystemAnswer, connectionValidator, requiredOdataVersion) ?? false);
+                return (validateSystemSelection(selectedSystemAnswer, connectionValidator, requiredOdataVersion, cachedConnectedSystem) ?? false);
             },
             additionalMessages: async (selectedSystem) => {
                 // Backend systems credentials may need to be updated
@@ -192,7 +195,7 @@ async function getSystemConnectionQuestions(connectionValidator, promptOptions)
             name: `${systemSelectionPromptNames.systemSelectionCli}`
         });
     }
-    questions.push(...(0, questions_1.getCredentialsPrompts)(connectionValidator, systemSelectionPromptNamespace));
+    questions.push(...(0, questions_2.getCredentialsPrompts)(connectionValidator, systemSelectionPromptNamespace));
     return questions;
 }
 //# sourceMappingURL=questions.js.map

package/dist/prompts/prompts.d.ts

@@ -1,9 +1,10 @@
-import { type OdataServicePromptOptions, type OdataServiceQuestion } from '../types';
+import { type ConnectedSystem, type OdataServicePromptOptions, type OdataServiceQuestion } from '../types';
 /**
  * Get the prompts for the OData service inquirer.
  *
  * @param promptOptions - options that can control some of the prompt behavior. See {@link OdataServicePromptOptions} for details
+ * @param connectedSystem - if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns the prompts used to provide input for OData service generation
  */
-export declare function getQuestions(promptOptions?: OdataServicePromptOptions): Promise<OdataServiceQuestion[]>;
+export declare function getQuestions(promptOptions?: OdataServicePromptOptions, connectedSystem?: ConnectedSystem): Promise<OdataServiceQuestion[]>;
 //# sourceMappingURL=prompts.d.ts.map

package/dist/prompts/prompts.js

@@ -13,12 +13,13 @@ const prompt_helpers_1 = require("./prompt-helpers");
  * Get the prompts for the OData service inquirer.
  *
  * @param promptOptions - options that can control some of the prompt behavior. See {@link OdataServicePromptOptions} for details
+ * @param connectedSystem - if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
  * @returns the prompts used to provide input for OData service generation
  */
-async function getQuestions(promptOptions) {
+async function getQuestions(promptOptions, connectedSystem) {
     const questions = [getDatasourceTypeQuestion(promptOptions?.datasourceType)];
     // Add conditional questions depending on the selected source
-    questions.push(...(await getDatasourceTypeConditionalQuestions(promptOptions)));
+    questions.push(...(await getDatasourceTypeConditionalQuestions(promptOptions, connectedSystem)));
     return questions;
 }
 /**
@@ -44,11 +45,12 @@ function getDatasourceTypeQuestion(options) {
  * Apply addiitonal when conditions based on the datasource type answer.
  *
  * @param promptOptions - options that can control some of the prompt behavior. See {@link OdataServicePromptOptions} for details
+ * @param connectedSystem
  * @returns the conditional questions based on the datasource type answer
  */
-async function getDatasourceTypeConditionalQuestions(promptOptions) {
+async function getDatasourceTypeConditionalQuestions(promptOptions, connectedSystem) {
     const conditionalQuestions = [];
-    conditionalQuestions.push(...(0, inquirer_common_1.withCondition)((await (0, system_selection_1.getSystemSelectionQuestions)(promptOptions)), (answers) => answers.datasourceType === types_1.DatasourceType.sapSystem));
+    conditionalQuestions.push(...(0, inquirer_common_1.withCondition)((await (0, system_selection_1.getSystemSelectionQuestions)(promptOptions, connectedSystem)), (answers) => answers.datasourceType === types_1.DatasourceType.sapSystem));
     conditionalQuestions.push(...(0, inquirer_common_1.withCondition)([(0, metadata_file_1.getMetadataFileQuestion)(promptOptions?.metadataFilePath)], (answers) => answers.datasourceType === types_1.DatasourceType.metadataFile));
     conditionalQuestions.push(...(0, inquirer_common_1.withCondition)((0, questions_1.getLocalCapProjectPrompts)(promptOptions), (answers) => answers.datasourceType === types_1.DatasourceType.capProject));
     conditionalQuestions.push(...(0, inquirer_common_1.withCondition)((0, questions_2.getServiceUrlQuestions)(promptOptions?.serviceUrl), (answers) => answers.datasourceType === types_1.DatasourceType.odataServiceUrl));

package/dist/types.d.ts

@@ -74,23 +74,24 @@ export interface OdataServiceAnswers {
      * The connected system will allow downstream consumers to access the connected system without creating new connections.
      *
      */
-    connectedSystem?: {
-        /**
-         * Convienence property to pass the connected system
-         */
-        serviceProvider: ServiceProvider;
-        /**
-         * The persistable backend system representation of the connected service provider
-         * `newOrUpdated` is set to true if the system was newly created or updated during the connection validation process and should be considered for storage.
-         */
-        backendSystem?: BackendSystem & {
-            newOrUpdated?: boolean;
-        };
-        /**
-         * The destination information for the connected system
-         */
-        destination?: Destination;
+    connectedSystem?: ConnectedSystem;
+}
+export interface ConnectedSystem {
+    /**
+     * Convienence property to pass the connected system
+     */
+    serviceProvider: ServiceProvider;
+    /**
+     * The persistable backend system representation of the connected service provider
+     * `newOrUpdated` is set to true if the system was newly created or updated during the connection validation process and should be considered for storage.
+     */
+    backendSystem?: BackendSystem & {
+        newOrUpdated?: boolean;
     };
+    /**
+     * The destination information for the connected system
+     */
+    destination?: Destination;
 }
 /**
  * Enumeration of prompt names used by OdataServiceInquirerPromptOptions

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.2",
+  "version": "2.3.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,13 +30,13 @@
     "os-name": "4.0.1",
     "@sap-ux/axios-extension": "1.20.0",
     "@sap-ux/btp-utils": "1.0.3",
-    "@sap-ux/fiori-generator-shared": "0.11.1",
+    "@sap-ux/fiori-generator-shared": "0.11.2",
     "@sap-ux/guided-answers-helper": "0.2.2",
-    "@sap-ux/telemetry": "0.5.76",
-    "@sap-ux/inquirer-common": "0.6.38",
+    "@sap-ux/telemetry": "0.5.77",
+    "@sap-ux/inquirer-common": "0.6.39",
     "@sap-ux/logger": "0.6.0",
-    "@sap-ux/project-access": "1.29.20",
-    "@sap-ux/project-input-validator": "0.5.3",
+    "@sap-ux/project-access": "1.29.21",
+    "@sap-ux/project-input-validator": "0.5.4",
     "@sap-ux/store": "1.0.0"
   },
   "devDependencies": {
@@ -46,12 +46,12 @@
     "@types/inquirer": "8.2.6",
     "@types/lodash": "4.14.202",
     "jest-extended": "3.2.4",
-    "@sap-ux/fiori-generator-shared": "0.11.1",
-    "@sap-ux/fiori-elements-writer": "2.3.1",
-    "@sap-ux/fiori-freestyle-writer": "2.3.1",
+    "@sap-ux/fiori-generator-shared": "0.11.2",
+    "@sap-ux/fiori-elements-writer": "2.3.2",
+    "@sap-ux/fiori-freestyle-writer": "2.3.2",
     "@sap-ux/feature-toggle": "0.2.3",
-    "@sap-ux/odata-service-writer": "0.26.15",
-    "@sap-ux/cap-config-writer": "0.9.27"
+    "@sap-ux/odata-service-writer": "0.26.16",
+    "@sap-ux/cap-config-writer": "0.9.28"
   },
   "engines": {
     "node": ">=18.x"