@sap-ux/system-access 0.3.29 → 0.3.31

package/dist/base/connect.js

@@ -85,10 +85,6 @@ function createAbapCloudServiceProvider(options, target, prompt, logger) {
  */
 function createAbapOnPremServiceProvider(options, target, prompt, logger) {
     return __awaiter(this, void 0, void 0, function* () {
-        options.baseURL = target.url;
-        if (target.client) {
-            options.params['sap-client'] = target.client;
-        }
         if (!options.auth) {
             const storedOpts = yield (0, credentials_1.getCredentialsFromStore)(target, logger);
             if ((0, credentials_1.isBasicAuth)(storedOpts)) {
@@ -102,10 +98,17 @@ function createAbapOnPremServiceProvider(options, target, prompt, logger) {
                     throw new Error('This is an ABAP Cloud system, please correct your configuration.');
                 }
                 if (prompt) {
-                    const credentials = yield (0, credentials_1.getCredentialsWithPrompts)(storedOpts === null || storedOpts === void 0 ? void 0 : storedOpts.username);
-                    options.auth = credentials;
-                    process.env.FIORI_TOOLS_USER = credentials.username;
-                    process.env.FIORI_TOOLS_PASSWORD = credentials.password;
+                    const { authType } = yield (0, prompts_2.default)([prompts_1.questions.authType]);
+                    if (authType === store_1.AuthenticationType.ReentranceTicket) {
+                        target.authenticationType = store_1.AuthenticationType.ReentranceTicket;
+                        return (0, axios_extension_1.createForAbapOnCloud)(Object.assign(Object.assign(Object.assign({}, options), target), { environment: axios_extension_1.AbapCloudEnvironment.EmbeddedSteampunk }));
+                    }
+                    else {
+                        const credentials = yield (0, credentials_1.getCredentialsWithPrompts)(storedOpts === null || storedOpts === void 0 ? void 0 : storedOpts.username);
+                        options.auth = credentials;
+                        process.env.FIORI_TOOLS_USER = credentials.username;
+                        process.env.FIORI_TOOLS_PASSWORD = credentials.password;
+                    }
                 }
             }
         }
@@ -172,13 +175,13 @@ function createAbapServiceProvider(target, requestOptions, prompt, logger) {
                 provider = yield createAbapCloudServiceProvider(options, target, prompt, logger);
             }
             else if (target.authenticationType === store_1.AuthenticationType.ReentranceTicket) {
-                provider = (0, axios_extension_1.createForAbapOnCloud)({
-                    ignoreCertErrors: options.ignoreCertErrors,
-                    environment: axios_extension_1.AbapCloudEnvironment.EmbeddedSteampunk,
-                    url: target.url
-                });
+                provider = (0, axios_extension_1.createForAbapOnCloud)(Object.assign({ ignoreCertErrors: options.ignoreCertErrors, environment: axios_extension_1.AbapCloudEnvironment.EmbeddedSteampunk }, target));
             }
             else {
+                options.baseURL = target.url;
+                if (target.client) {
+                    options.params['sap-client'] = target.client;
+                }
                 provider = yield createAbapOnPremServiceProvider(options, target, prompt, logger);
             }
         }

package/dist/base/prompts.d.ts

@@ -3,6 +3,7 @@ import type { PromptObject } from 'prompts';
  * Export map of questions for usage with the prompts modules
  */
 export declare const questions: {
+    readonly authType: PromptObject<string>;
     readonly username: PromptObject<string>;
     readonly password: PromptObject<string>;
     readonly serviceKeysPath: PromptObject<string>;

package/dist/base/prompts.js

@@ -1,7 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inquirer = exports.questions = void 0;
+const store_1 = require("@sap-ux/store");
 const fs_1 = require("fs");
+const authType = {
+    type: 'autocomplete',
+    name: 'authType',
+    message: 'Type of authentication:',
+    choices: [
+        { title: 'Basic authentication', value: store_1.AuthenticationType.Basic },
+        { title: 'SAP reentrance tickets', value: store_1.AuthenticationType.ReentranceTicket }
+    ]
+};
 const username = {
     type: 'text',
     name: 'username',
@@ -34,6 +44,7 @@ const systemName = {
  * Export map of questions for usage with the prompts modules
  */
 exports.questions = {
+    authType,
     username,
     password,
     serviceKeysPath,

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Asystem-access"
   },
-  "version": "0.3.29",
+  "version": "0.3.31",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "prompts": "2.4.2",
-    "@sap-ux/axios-extension": "1.12.4",
+    "@sap-ux/axios-extension": "1.12.5",
     "@sap-ux/btp-utils": "0.14.4",
     "@sap-ux/logger": "0.5.1",
     "@sap-ux/store": "0.5.0"
@@ -32,7 +32,7 @@
     "@types/prompts": "2.4.4",
     "nock": "13.4.0",
     "rimraf": "5.0.5",
-    "@sap-ux/project-access": "1.20.0"
+    "@sap-ux/project-access": "1.20.1"
   },
   "engines": {
     "node": ">=18.x"