@sap-ux/axios-extension 1.26.1 → 2.0.1

package/dist/cacerts/sap-global-root-ca.js

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sapGlobalRootCaCert = void 0;
 /**
  * SAP Global Root CA certificate is publicly available from:
  * https://github.com/SAP/SapMachine/blob/sapmachine/src/java.base/share/data/cacerts/sapglobalrootca
  *
  */
-exports.sapGlobalRootCaCert = `
+export const sapGlobalRootCaCert = `
 Owner: CN=SAP Global Root CA, O=SAP AG, L=Walldorf, C=DE
 Issuer: CN=SAP Global Root CA, O=SAP AG, L=Walldorf, C=DE
 Serial number: 5d03d93d31615d8f488b3970c78f1b99

package/dist/factory.d.ts

@@ -1,11 +1,11 @@
 import { type Destination } from '@sap-ux/btp-utils';
 import type { AxiosRequestConfig } from 'axios';
 import { type HttpsProxyAgentOptions, HttpsProxyAgent } from 'https-proxy-agent';
-import { AbapServiceProvider } from './abap';
-import type { RefreshTokenChanged, ServiceInfo } from './auth';
-import type { ODataService } from './base/odata-service';
-import type { ProviderConfiguration } from './base/service-provider';
-import { ServiceProvider } from './base/service-provider';
+import { AbapServiceProvider } from './abap/index.js';
+import type { RefreshTokenChanged, ServiceInfo } from './auth/index.js';
+import type { ODataService } from './base/odata-service.js';
+import type { ProviderConfiguration } from './base/service-provider.js';
+import { ServiceProvider } from './base/service-provider.js';
 /**
  * PatchedHttpsProxyAgent is a custom implementation of HttpsProxyAgent that allows to pass additional options, currently not supported by the original implementation when calling tls.connect
  */

package/dist/factory.js

@@ -1,29 +1,18 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbapCloudEnvironment = exports.PatchedHttpsProxyAgent = void 0;
-exports.create = create;
-exports.createForAbap = createForAbap;
-exports.createForAbapOnCloud = createForAbapOnCloud;
-exports.createForDestination = createForDestination;
-exports.createServiceForUrl = createServiceForUrl;
-const btp_utils_1 = require("@sap-ux/btp-utils");
-const http_proxy_agent_1 = require("http-proxy-agent");
-const node_https_1 = require("node:https");
-const https_proxy_agent_1 = require("https-proxy-agent");
-const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
-const proxy_from_env_1 = require("proxy-from-env");
-const node_util_1 = require("node:util");
-const abap_1 = require("./abap");
-const auth_1 = require("./auth");
-const patchTls_1 = require("./base/patchTls");
-const service_provider_1 = require("./base/service-provider");
+import { BAS_DEST_INSTANCE_CRED_HEADER, getCredentialsForDestinationService, getDestinationUrlForAppStudio, isAbapSystem, isAppStudio } from '@sap-ux/btp-utils';
+import { HttpProxyAgent } from 'http-proxy-agent';
+import { Agent as HttpsAgent } from 'node:https';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+import cloneDeep from 'lodash/cloneDeep.js';
+import { getProxyForUrl } from 'proxy-from-env';
+import { inspect } from 'node:util';
+import { AbapServiceProvider } from './abap/index.js';
+import { attachBasicAuthInterceptor, attachConnectionHandler, attachReentranceTicketAuthInterceptor, attachUaaAuthInterceptor } from './auth/index.js';
+import { TlsPatch } from './base/patchTls.js';
+import { ServiceProvider } from './base/service-provider.js';
 /**
  * PatchedHttpsProxyAgent is a custom implementation of HttpsProxyAgent that allows to pass additional options, currently not supported by the original implementation when calling tls.connect
  */
-class PatchedHttpsProxyAgent extends https_proxy_agent_1.HttpsProxyAgent {
+export class PatchedHttpsProxyAgent extends HttpsProxyAgent {
     extraOptions;
     /**
      * Extension of the base constructor.
@@ -46,7 +35,6 @@ class PatchedHttpsProxyAgent extends https_proxy_agent_1.HttpsProxyAgent {
         return super.connect(req, { ...this.extraOptions, ...opts });
     }
 }
-exports.PatchedHttpsProxyAgent = PatchedHttpsProxyAgent;
 /**
  * Create a new instance of given type and set default configuration merged with the given config.
  *
@@ -55,13 +43,13 @@ exports.PatchedHttpsProxyAgent = PatchedHttpsProxyAgent;
  * @returns instance of the provided class
  */
 function createInstance(ProviderType, config) {
-    const providerConfig = (0, cloneDeep_1.default)(config);
+    const providerConfig = cloneDeep(config);
     const agentOptions = {
         rejectUnauthorized: !providerConfig.ignoreCertErrors
     };
     // Default httpsAgent with optional parameters passed to the agent
     if (!providerConfig.httpsAgent) {
-        providerConfig.httpsAgent = new node_https_1.Agent(agentOptions);
+        providerConfig.httpsAgent = new HttpsAgent(agentOptions);
     }
     delete providerConfig.ignoreCertErrors;
     providerConfig.withCredentials = providerConfig?.auth && Object.keys(providerConfig.auth).length > 0;
@@ -77,11 +65,11 @@ function createInstance(ProviderType, config) {
     // NO_PROXY hostname matching works correctly against the actual target URL.
     instance.interceptors.request.use((request) => {
         const fullUrl = instance.getUri(request);
-        const localProxy = (0, proxy_from_env_1.getProxyForUrl)(fullUrl);
-        if (localProxy && !(0, btp_utils_1.isAppStudio)()) {
+        const localProxy = getProxyForUrl(fullUrl);
+        if (localProxy && !isAppStudio()) {
             // axios doesn't handle proxies correctly, instead use a custom agent with axios proxy disabled
             request.httpsAgent = new PatchedHttpsProxyAgent(localProxy, agentOptions);
-            request.httpAgent = new http_proxy_agent_1.HttpProxyAgent(localProxy);
+            request.httpAgent = new HttpProxyAgent(localProxy);
             request.proxy = false;
         }
         return request;
@@ -95,17 +83,17 @@ function createInstance(ProviderType, config) {
         head: {},
         patch: {}
     };
-    (0, auth_1.attachConnectionHandler)(instance);
+    attachConnectionHandler(instance);
     if (providerConfig.auth?.password) {
-        (0, auth_1.attachBasicAuthInterceptor)(instance);
+        attachBasicAuthInterceptor(instance);
     }
     if (config.cookies) {
         config.cookies.split(';').forEach((singleCookieStr) => {
             instance.cookies.addCookie(singleCookieStr.trim());
         });
     }
-    if (patchTls_1.TlsPatch.isPatchRequired(config.baseURL)) {
-        patchTls_1.TlsPatch.apply();
+    if (TlsPatch.isPatchRequired(config.baseURL)) {
+        TlsPatch.apply();
     }
     return instance;
 }
@@ -115,14 +103,14 @@ function createInstance(ProviderType, config) {
  * @param config axios config with additional extension specific properties
  * @returns instance of the basic service provider
  */
-function create(config) {
+export function create(config) {
     if (typeof config === 'string') {
-        return createInstance(service_provider_1.ServiceProvider, {
+        return createInstance(ServiceProvider, {
             baseURL: config
         });
     }
     else {
-        return createInstance(service_provider_1.ServiceProvider, config);
+        return createInstance(ServiceProvider, config);
     }
 }
 /**
@@ -131,27 +119,27 @@ function create(config) {
  * @param config axios config with additional extension specific properties
  * @returns instance of an ABAP service provider
  */
-function createForAbap(config) {
-    return createInstance(abap_1.AbapServiceProvider, config);
+export function createForAbap(config) {
+    return createInstance(AbapServiceProvider, config);
 }
 /** Supported ABAP environments on the cloud */
-var AbapCloudEnvironment;
+export var AbapCloudEnvironment;
 (function (AbapCloudEnvironment) {
     AbapCloudEnvironment["Standalone"] = "Standalone";
     AbapCloudEnvironment["EmbeddedSteampunk"] = "EmbeddedSteampunk";
-})(AbapCloudEnvironment || (exports.AbapCloudEnvironment = AbapCloudEnvironment = {}));
+})(AbapCloudEnvironment || (AbapCloudEnvironment = {}));
 /**
  * Create an instance of an ABAP service provider for a Cloud ABAP system.
  *
  * @param options {@link AbapCloudOptions}
  * @returns instance of an {@link AbapServiceProvider}
  */
-function createForAbapOnCloud(options) {
+export function createForAbapOnCloud(options) {
     let provider;
     switch (options.environment) {
         case AbapCloudEnvironment.Standalone: {
             const { service, refreshToken, refreshTokenChangedCb, cookies, ...config } = options;
-            provider = createInstance(abap_1.AbapServiceProvider, {
+            provider = createInstance(AbapServiceProvider, {
                 baseURL: service.url,
                 cookies,
                 ...config
@@ -160,30 +148,30 @@ function createForAbapOnCloud(options) {
                 // Only in the case where a username and password are provided use UAA otherwise use re-entrance
                 // This is to support unattended authentication for now.
                 if (options.service?.uaa?.username && options.service.uaa.password) {
-                    (0, auth_1.attachUaaAuthInterceptor)(provider, service, refreshToken, refreshTokenChangedCb);
+                    attachUaaAuthInterceptor(provider, service, refreshToken, refreshTokenChangedCb);
                 }
                 else {
                     // Always use re-entrance tickets regardless of the ABAP Cloud environment where credentials are not provided
-                    (0, auth_1.attachReentranceTicketAuthInterceptor)({ provider });
+                    attachReentranceTicketAuthInterceptor({ provider });
                 }
             }
             break;
         }
         case AbapCloudEnvironment.EmbeddedSteampunk: {
             const { url, cookies, ...config } = options;
-            provider = createInstance(abap_1.AbapServiceProvider, {
+            provider = createInstance(AbapServiceProvider, {
                 baseURL: url,
                 cookies,
                 ...config
             });
             if (!cookies) {
-                (0, auth_1.attachReentranceTicketAuthInterceptor)({ provider });
+                attachReentranceTicketAuthInterceptor({ provider });
             }
             break;
         }
         default: {
             const opts = options;
-            throw new Error(`Unknown environment type supplied: ${(0, node_util_1.inspect)(opts)}`);
+            throw new Error(`Unknown environment type supplied: ${inspect(opts)}`);
         }
     }
     return provider;
@@ -196,30 +184,30 @@ function createForAbapOnCloud(options) {
  * @param destinationServiceInstance optional id of a destination service instance providing the destination
  * @returns instance of a service provider
  */
-function createForDestination(options, destination, destinationServiceInstance) {
+export function createForDestination(options, destination, destinationServiceInstance) {
     const { cookies, ...config } = options;
     const providerConfig = {
         ...config,
-        baseURL: (0, btp_utils_1.getDestinationUrlForAppStudio)(destination.Name, destination.Host ? new URL(destination.Host).pathname : undefined),
+        baseURL: getDestinationUrlForAppStudio(destination.Name, destination.Host ? new URL(destination.Host).pathname : undefined),
         cookies: cookies
     };
     // SAML in AppStudio is not yet supported
     providerConfig.params = providerConfig.params ?? {};
     providerConfig.params.saml2 = 'disabled';
     let provider;
-    if ((0, btp_utils_1.isAbapSystem)(destination)) {
-        provider = createInstance(abap_1.AbapServiceProvider, providerConfig);
+    if (isAbapSystem(destination)) {
+        provider = createInstance(AbapServiceProvider, providerConfig);
         // For an ABAP destination flow, need to show the destination host URL property instead of the BAS host URL i.e. https://mydest.dest
         provider.publicUrl = destination.Host;
     }
     else {
-        provider = createInstance(service_provider_1.ServiceProvider, providerConfig);
+        provider = createInstance(ServiceProvider, providerConfig);
     }
     // resolve destination service user on first request if required
     if (destinationServiceInstance) {
         const oneTimeReqInterceptorId = provider.interceptors.request.use(async (request) => {
-            const credentials = await (0, btp_utils_1.getCredentialsForDestinationService)(destinationServiceInstance);
-            provider.defaults.headers.common[btp_utils_1.BAS_DEST_INSTANCE_CRED_HEADER] = credentials;
+            const credentials = await getCredentialsForDestinationService(destinationServiceInstance);
+            provider.defaults.headers.common[BAS_DEST_INSTANCE_CRED_HEADER] = credentials;
             provider.interceptors.request.eject(oneTimeReqInterceptorId);
             return request;
         });
@@ -233,7 +221,7 @@ function createForDestination(options, destination, destinationServiceInstance)
  * @param config axios config with additional extension specific properties
  * @returns instance of a service
  */
-function createServiceForUrl(url, config = {}) {
+export function createServiceForUrl(url, config = {}) {
     const urlObject = new URL(url);
     config.baseURL = urlObject.origin;
     const searchParams = new URLSearchParams(config.params);
@@ -241,7 +229,7 @@ function createServiceForUrl(url, config = {}) {
         searchParams.append(key, val);
     }
     config.params = searchParams;
-    const provider = createInstance(service_provider_1.ServiceProvider, config);
+    const provider = createInstance(ServiceProvider, config);
     return provider.service(urlObject.pathname);
 }
 //# sourceMappingURL=factory.js.map

package/dist/index.d.ts

@@ -1,12 +1,12 @@
 import type { AxiosError, AxiosRequestConfig } from 'axios';
-import { isAxiosError } from './base/odata-request-error';
-export * from './base/odata-service';
-export * from './base/service-provider';
-export * from './base/patchTls';
-export * from './abap';
-export * from './factory';
-export * from './auth';
-export * from './abap/message';
-export { ServiceType } from './abap/catalog/base';
+import { isAxiosError } from './base/odata-request-error.js';
+export * from './base/odata-service.js';
+export * from './base/service-provider.js';
+export * from './base/patchTls.js';
+export * from './abap/index.js';
+export * from './factory.js';
+export * from './auth/index.js';
+export * from './abap/message.js';
+export { ServiceType } from './abap/catalog/base.js';
 export { AxiosError, AxiosRequestConfig, isAxiosError };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,29 +1,11 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAxiosError = exports.ServiceType = void 0;
-const odata_request_error_1 = require("./base/odata-request-error");
-Object.defineProperty(exports, "isAxiosError", { enumerable: true, get: function () { return odata_request_error_1.isAxiosError; } });
-__exportStar(require("./base/odata-service"), exports);
-__exportStar(require("./base/service-provider"), exports);
-__exportStar(require("./base/patchTls"), exports);
-__exportStar(require("./abap"), exports);
-__exportStar(require("./factory"), exports);
-__exportStar(require("./auth"), exports);
-__exportStar(require("./abap/message"), exports);
-var base_1 = require("./abap/catalog/base");
-Object.defineProperty(exports, "ServiceType", { enumerable: true, get: function () { return base_1.ServiceType; } });
+import { isAxiosError } from './base/odata-request-error.js';
+export * from './base/odata-service.js';
+export * from './base/service-provider.js';
+export * from './base/patchTls.js';
+export * from './abap/index.js';
+export * from './factory.js';
+export * from './auth/index.js';
+export * from './abap/message.js';
+export { ServiceType } from './abap/catalog/base.js';
+export { isAxiosError };
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@sap-ux/axios-extension",
-  "version": "1.26.1",
+  "version": "2.0.1",
   "description": "Extension of the Axios module adding convenience methods to interact with SAP systems especially with OData services.",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -25,17 +26,18 @@
     "https-proxy-agent": "7.0.6",
     "http-proxy-agent": "7.0.2",
     "proxy-from-env": "1.1.0",
-    "@sap-ux/btp-utils": "1.2.1",
-    "@sap-ux/logger": "0.9.0",
-    "@sap-ux/feature-toggle": "0.4.0"
+    "@sap-ux/btp-utils": "2.0.1",
+    "@sap-ux/logger": "1.0.1",
+    "@sap-ux/feature-toggle": "1.0.1"
   },
   "devDependencies": {
+    "@jest/globals": "30.3.0",
     "@sap-ux/vocabularies-types": "0.15.0",
     "@types/lodash": "4.17.24",
     "nock": "14.0.11",
     "supertest": "7.2.2",
     "@types/proxy-from-env": "1.0.4",
-    "@sap-ux/project-access": "1.38.1"
+    "@sap-ux/project-access": "2.1.0"
   },
   "files": [
     "dist",
@@ -53,8 +55,8 @@
     "format": "prettier --write '**/*.{js,json,ts,yaml,yml}' --ignore-path ../../.prettierignore",
     "lint": "eslint",
     "lint:fix": "eslint --fix",
-    "test": "jest --ci --forceExit --detectOpenHandles --colors",
-    "test-u": "jest --forceExit --detectOpenHandles --colors -u",
+    "test": "cross-env NODE_OPTIONS='--experimental-vm-modules' jest --ci --forceExit --detectOpenHandles --colors",
+    "test-u": "cross-env NODE_OPTIONS='--experimental-vm-modules' jest --forceExit --detectOpenHandles --colors -u",
     "link": "pnpm link --global",
     "unlink": "pnpm unlink --global"
   }