@sap-ux/axios-extension 1.21.2 → 1.21.4

package/README.adoc

@@ -120,20 +120,21 @@ See more examples in link:./test/factory.test.ts[/test/factory.test.ts]
 
 ## Proxy Support
 
-To enable support for TLS (Transport Layer Security), enable the `HTTPS_PROXY` environment variable, as shown;
+To enable support for TLS (Transport Layer Security) connections when using `HTTPS_PROXY`, update your environment by setting the `TOOLSUITE_FEATURES` environment variable with `sap.ux.enablePatchProxy`, as shown;
 
 ```bash
+export TOOLSUITE_FEATURES=sap.ux.enablePatchProxy
 export HTTPS_PROXY=<YOUR-PROXY:PORT>
-# With Credentials
-export HTTPS_PROXY=<USERNAME>:<PASSWORD>@<YOUR-PROXY:PORT>
 ```
 
-Sample Configuration
+In order to support credentials in the proxy URL, you can set the `HTTPS_PROXY` environment variable to include the username and password in the URL. For example:
+
 ```bash
+export TOOLSUITE_FEATURES=sap.ux.enablePatchProxy
 export HTTPS_PROXY=http://user:password@proxy.domain.com:3128
 ```
 
-Ensure you restart any running processes or applications to apply the changes.
+Ensure you restart any running processes to apply the changes.
 
 Example Scenario
 

package/dist/abap/lrep-service.d.ts

@@ -1,8 +1,8 @@
-import type { Service } from '../base/service-provider';
 import type { AxiosResponse } from 'axios';
 import { Axios } from 'axios';
 import type { Logger } from '@sap-ux/logger';
 import type { ManifestNamespace } from '@sap-ux/project-access';
+import type { Service } from '../base/service-provider';
 import type { TransportConfig } from './ui5-abap-repository-service';
 export type Manifest = ManifestNamespace.SAPJSONSchemaForWebApplicationManifestFile & {
     [key: string]: unknown;

package/dist/abap/lrep-service.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LayeredRepositoryService = exports.AdaptationProjectType = void 0;
 const axios_1 = require("axios");
-const logger_1 = require("@sap-ux/logger");
 const fs_1 = require("fs");
+const url_1 = require("url");
+const logger_1 = require("@sap-ux/logger");
 const odata_request_error_1 = require("../base/odata-request-error");
 const message_1 = require("./message");
 /**
@@ -32,6 +33,13 @@ function getNamespaceAsString(namespace) {
 function isBuffer(input) {
     return input.BYTES_PER_ELEMENT !== undefined;
 }
+/**
+ * Decodes url parameters.
+ *
+ * @param params An object containing the parameters to be decoded.
+ * @returns The decoded parameters as a string.
+ */
+const decodeUrlParams = (params) => decodeURIComponent(params.toString());
 /**
  * Path suffix for all DTA actions.
  */
@@ -67,13 +75,13 @@ class LayeredRepositoryService extends axios_1.Axios {
      */
     async mergeAppDescriptorVariant(appDescriptorVariant, workspacePath) {
         const path = '/appdescr_variant_preview/';
-        const params = new URLSearchParams(this.defaults?.params);
+        const params = new url_1.URLSearchParams(this.defaults?.params);
         if (workspacePath) {
             params.append('workspacePath', workspacePath);
         }
         try {
             const response = await this.put(path, appDescriptorVariant, {
-                paramsSerializer: (params) => decodeURIComponent(params.toString()),
+                paramsSerializer: decodeUrlParams,
                 params,
                 headers: {
                     'Content-Type': 'application/zip'
@@ -194,13 +202,16 @@ class LayeredRepositoryService extends axios_1.Axios {
      */
     async getSystemInfo(language = 'EN', cloudPackage) {
         try {
-            const params = {
+            const params = new url_1.URLSearchParams({
                 'sap-language': language
-            };
+            });
             if (cloudPackage) {
-                params['package'] = cloudPackage;
+                params.append('package', cloudPackage);
             }
-            const response = await this.get(`${DTA_PATH_SUFFIX}system_info`, { params });
+            const response = await this.get(`${DTA_PATH_SUFFIX}system_info`, {
+                params,
+                paramsSerializer: decodeUrlParams
+            });
             this.tryLogResponse(response, 'Successful getting system info.');
             return JSON.parse(response.data);
         }

package/dist/factory.js

@@ -20,6 +20,7 @@ const patchTls_1 = require("./base/patchTls");
 const proxy_from_env_1 = require("proxy-from-env");
 const https_proxy_agent_1 = require("https-proxy-agent");
 const http_proxy_agent_1 = require("http-proxy-agent");
+const feature_toggle_1 = require("@sap-ux/feature-toggle");
 /**
  * PatchedHttpsProxyAgent is a custom implementation of HttpsProxyAgent that allows to pass additional options, currently not supported by the original implementation when calling tls.connect
  */
@@ -61,7 +62,8 @@ function createInstance(ProviderType, config) {
         rejectUnauthorized: !providerConfig.ignoreCertErrors
     };
     const localProxy = (0, proxy_from_env_1.getProxyForUrl)(config.baseURL);
-    if (localProxy) {
+    const isPatchProxyEnabled = (0, feature_toggle_1.isFeatureEnabled)('sap.ux.enablePatchProxy');
+    if (isPatchProxyEnabled && localProxy) {
         // axios doesn't handle proxies correctly, instead use a custom agent with axios proxy disabled
         providerConfig.httpsAgent = new PatchedHttpsProxyAgent(localProxy, agentOptions);
         providerConfig.httpAgent = new http_proxy_agent_1.HttpProxyAgent(localProxy);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/axios-extension",
-  "version": "1.21.2",
+  "version": "1.21.4",
   "description": "Extension of the Axios module adding convenience methods to interact with SAP systems especially with OData services.",
   "repository": {
     "type": "git",