@sap-ux/system-access 0.3.28 → 0.3.30

package/dist/base/connect.d.ts

@@ -1,13 +1,20 @@
 import type { Logger } from '@sap-ux/logger';
-import type { AbapTarget, UrlAbapTarget } from '../types';
+import type { AbapTarget, DestinationAbapTarget, UrlAbapTarget } from '../types';
 import type { AbapServiceProvider, AxiosRequestConfig, ProviderConfiguration } from '@sap-ux/axios-extension';
 /**
- * Check if it is a url or destination target.
+ * Check if it is a url target.
  *
  * @param target target configuration
- * @returns true is it is a UrlAbapTarget
+ * @returns true if it is a UrlAbapTarget
  */
 export declare function isUrlTarget(target: AbapTarget): target is UrlAbapTarget;
+/**
+ * Check if it is a destination target.
+ *
+ * @param target target configuration
+ * @returns true if it is a DestinationAbapTarget
+ */
+export declare function isDestinationTarget(target: AbapTarget): target is DestinationAbapTarget;
 /**
  * Create an instance of an ABAP service provider connected to the given target configuration.
  *

package/dist/base/connect.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAbapServiceProvider = exports.isUrlTarget = void 0;
+exports.createAbapServiceProvider = exports.isDestinationTarget = exports.isUrlTarget = void 0;
 const axios_extension_1 = require("@sap-ux/axios-extension");
 const credentials_1 = require("./credentials");
 const btp_utils_1 = require("@sap-ux/btp-utils");
@@ -21,15 +21,25 @@ const prompts_2 = __importDefault(require("prompts"));
 const fs_1 = require("fs");
 const store_1 = require("@sap-ux/store");
 /**
- * Check if it is a url or destination target.
+ * Check if it is a url target.
  *
  * @param target target configuration
- * @returns true is it is a UrlAbapTarget
+ * @returns true if it is a UrlAbapTarget
  */
 function isUrlTarget(target) {
     return target.url !== undefined;
 }
 exports.isUrlTarget = isUrlTarget;
+/**
+ * Check if it is a destination target.
+ *
+ * @param target target configuration
+ * @returns true if it is a DestinationAbapTarget
+ */
+function isDestinationTarget(target) {
+    return target.destination !== undefined;
+}
+exports.isDestinationTarget = isDestinationTarget;
 /**
  * Enhance axios options and create a service provider instance for an ABAP Cloud system.
  *
@@ -75,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)) {
@@ -92,16 +98,60 @@ 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;
+                    }
                 }
             }
         }
         return (0, axios_extension_1.createForAbap)(options);
     });
 }
+/**
+ * Enhance axios options and create a service provider instance for a destination.
+ *
+ * @param options predefined axios options
+ * @param target url target configuration
+ * @param prompt - prompt the user for missing information
+ * @returns an ABAPServiceProvider instance
+ */
+function createAbapDestinationServiceProvider(options, target, prompt) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // Need additional properties to determine the type of destination we are dealing with
+        const destinations = yield (0, btp_utils_1.listDestinations)();
+        const destination = destinations === null || destinations === void 0 ? void 0 : destinations[target.destination];
+        if (!destination) {
+            throw new Error(`Destination ${target.destination} not found on subaccount`);
+        }
+        const provider = (0, axios_extension_1.createForDestination)(options, destination);
+        // if prompting is enabled, check if the destination works or basic auth is required
+        if (prompt) {
+            const id = provider.interceptors.response.use(undefined, (error) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                provider.interceptors.response.eject(id);
+                if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401) {
+                    const credentials = yield (0, credentials_1.getCredentialsWithPrompts)();
+                    provider.defaults.auth = credentials;
+                    process.env.FIORI_TOOLS_USER = credentials.username;
+                    process.env.FIORI_TOOLS_PASSWORD = credentials.password;
+                    return provider.request(error.config);
+                }
+                else {
+                    throw error;
+                }
+            }));
+        }
+        return provider;
+    });
+}
 /**
  * Create an instance of an ABAP service provider connected to the given target configuration.
  *
@@ -116,28 +166,22 @@ function createAbapServiceProvider(target, requestOptions, prompt, logger) {
     return __awaiter(this, void 0, void 0, function* () {
         let provider;
         const options = Object.assign({ params: (_a = target.params) !== null && _a !== void 0 ? _a : {} }, requestOptions);
-        // Destination only supported on Business Application studio
-        if ((0, btp_utils_1.isAppStudio)() && target.destination) {
-            // Need additional properties to determine the type of destination we are dealing with
-            const destinations = yield (0, btp_utils_1.listDestinations)();
-            const destination = destinations === null || destinations === void 0 ? void 0 : destinations[target.destination];
-            if (!destination) {
-                throw new Error(`Destination ${target.destination} not found on subaccount`);
-            }
-            provider = (0, axios_extension_1.createForDestination)(options, destination);
+        // Destination only supported in Business Application Studio
+        if ((0, btp_utils_1.isAppStudio)() && isDestinationTarget(target)) {
+            provider = yield createAbapDestinationServiceProvider(options, target, prompt);
         }
         else if (isUrlTarget(target)) {
             if (target.scp) {
                 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.28",
+  "version": "0.3.30",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -30,6 +30,7 @@
   },
   "devDependencies": {
     "@types/prompts": "2.4.4",
+    "nock": "13.4.0",
     "rimraf": "5.0.5",
     "@sap-ux/project-access": "1.20.0"
   },