@sap-ux/axios-extension 1.21.0 → 1.21.2

package/README.adoc

@@ -120,21 +120,20 @@ See more examples in link:./test/factory.test.ts[/test/factory.test.ts]
 
 ## Proxy Support
 
-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;
+To enable support for TLS (Transport Layer Security), enable the `HTTPS_PROXY` environment variable, 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>
 ```
 
-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:
-
+Sample Configuration
 ```bash
-export TOOLSUITE_FEATURES=sap.ux.enablePatchProxy
 export HTTPS_PROXY=http://user:password@proxy.domain.com:3128
 ```
 
-Ensure you restart any running processes to apply the changes.
+Ensure you restart any running processes or applications to apply the changes.
 
 Example Scenario
 

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

@@ -111,6 +111,13 @@ export declare class AbapServiceProvider extends ServiceProvider {
      * @returns the service URL
      */
     private getServiceUrlFromConfig;
+    /**
+     * Get the content type from the generator config.
+     *
+     * @param config - generator config
+     * @returns the type of the content link from service generator config
+     */
+    private getContentType;
     /**
      * Create a service provider to lock a binding path.
      *

package/dist/abap/abap-service-provider.js

@@ -204,7 +204,7 @@ class AbapServiceProvider extends service_provider_1.ServiceProvider {
         }
         const config = await generatorService.getUIServiceGeneratorConfig(referencedObject.uri);
         const gen = this.createService(this.getServiceUrlFromConfig(config), ui_service_generator_1.UiServiceGenerator);
-        gen.configure(config, referencedObject);
+        gen.configure(config, referencedObject, this.getContentType(config));
         return gen;
     }
     /**
@@ -221,6 +221,16 @@ class AbapServiceProvider extends service_provider_1.ServiceProvider {
         const endIndex = config.link[0].href.indexOf(config.id) + config.id.length;
         return config.link[0].href.substring(0, endIndex);
     }
+    /**
+     * Get the content type from the generator config.
+     *
+     * @param config - generator config
+     * @returns the type of the content link from service generator config
+     */
+    getContentType(config) {
+        const contentEndpoint = config.link?.find((link) => typeof link.href === 'string' && link.href.includes('/content'));
+        return contentEndpoint.type;
+    }
     /**
      * Create a service provider to lock a binding path.
      *

package/dist/abap/adt-catalog/generators/ui-service-generator.d.ts

@@ -6,13 +6,15 @@ import { AdtService } from '../services';
  */
 export declare class UiServiceGenerator extends AdtService {
     protected referencedObject: BusinessObject | AbapCDSView;
+    protected contentType: string;
     /**
      * Configure the UI service generator.
      *
      * @param _config - The generator configuration.
      * @param referencedObject - The referenced object (business object or abap cds view).
+     * @param contentType - The header accept type for content.
      */
-    configure(_config: GeneratorEntry, referencedObject: BusinessObject | AbapCDSView): void;
+    configure(_config: GeneratorEntry, referencedObject: BusinessObject | AbapCDSView, contentType: string): void;
     /**
      * Get the schema of the service binding.
      *

package/dist/abap/adt-catalog/generators/ui-service-generator.js

@@ -7,14 +7,17 @@ const services_1 = require("../services");
  */
 class UiServiceGenerator extends services_1.AdtService {
     referencedObject;
+    contentType;
     /**
      * Configure the UI service generator.
      *
      * @param _config - The generator configuration.
      * @param referencedObject - The referenced object (business object or abap cds view).
+     * @param contentType - The header accept type for content.
      */
-    configure(_config, referencedObject) {
+    configure(_config, referencedObject, contentType) {
         this.referencedObject = referencedObject;
+        this.contentType = contentType;
     }
     /**
      * Get the schema of the service binding.
@@ -41,7 +44,7 @@ class UiServiceGenerator extends services_1.AdtService {
     async getContent(pckg) {
         const response = await this.get('/content', {
             headers: {
-                Accept: 'application/vnd.sap.adt.repository.generator.content.v1+json'
+                Accept: this.contentType
             },
             params: {
                 referencedObject: this.referencedObject.uri,
@@ -85,7 +88,7 @@ class UiServiceGenerator extends services_1.AdtService {
     async validateContent(content) {
         const response = await this.post('/validation', content, {
             headers: {
-                'Content-Type': 'application/vnd.sap.adt.repository.generator.content.v1+json',
+                'Content-Type': this.contentType,
                 Accept: 'application/vnd.sap.adt.validationMessages.v1+xml'
             },
             params: {
@@ -106,7 +109,7 @@ class UiServiceGenerator extends services_1.AdtService {
     async generate(content, transport) {
         const response = await this.post('', content, {
             headers: {
-                'Content-Type': 'application/vnd.sap.adt.repository.generator.content.v1+json',
+                'Content-Type': this.contentType,
                 Accept: 'application/vnd.sap.adt.repository.generator.v1+json, application/vnd.sap.as+xml;charset=UTF-8;dataname=com.sap.adt.StatusMessage'
             },
             params: {

package/dist/factory.js

@@ -20,7 +20,6 @@ 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
  */
@@ -62,8 +61,7 @@ function createInstance(ProviderType, config) {
         rejectUnauthorized: !providerConfig.ignoreCertErrors
     };
     const localProxy = (0, proxy_from_env_1.getProxyForUrl)(config.baseURL);
-    const isPatchProxyEnabled = (0, feature_toggle_1.isFeatureEnabled)('sap.ux.enablePatchProxy');
-    if (isPatchProxyEnabled && localProxy) {
+    if (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.0",
+  "version": "1.21.2",
   "description": "Extension of the Axios module adding convenience methods to interact with SAP systems especially with OData services.",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "nock": "13.4.0",
     "supertest": "6.3.3",
     "@types/proxy-from-env": "1.0.1",
-    "@sap-ux/project-access": "1.30.0"
+    "@sap-ux/project-access": "1.30.2"
   },
   "files": [
     "dist",