@sap-ux/axios-extension 1.12.5 → 1.13.0

package/dist/abap/catalog/v2-catalog-service.js

@@ -99,7 +99,8 @@ class V2CatalogService extends base_1.CatalogService {
                 $format: 'json',
                 $filter: `Title eq '${title}' and TechnicalServiceVersion eq ${version}`
             };
-            const response = yield this.get(`/${this.entitySet}`, { params });
+            const requestPath = this.entitySet ? `/${this.entitySet}` : '/ServiceCollection';
+            const response = yield this.get(requestPath, { params });
             const services = response.odata();
             if (services.length > 1) {
                 // #14793: Fix for user created multi namespaces for the same service
@@ -126,9 +127,6 @@ class V2CatalogService extends base_1.CatalogService {
      */
     getServiceAnnotations({ id, title, path }) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.entitySet) {
-                yield this.determineEntitySet();
-            }
             if (!id) {
                 const ServiceConfig = yield this.findService({ title, path });
                 if (ServiceConfig) {
@@ -136,7 +134,7 @@ class V2CatalogService extends base_1.CatalogService {
                 }
             }
             if (id) {
-                const response = yield this.get(`/${this.entitySet}('${encodeURIComponent(id)}')/Annotations`, {
+                const response = yield this.get(`/ServiceCollection('${encodeURIComponent(id)}')/Annotations`, {
                     params: { $format: 'json' }
                 });
                 return response.odata();

package/dist/abap/ui5-abap-repository-service.js

@@ -119,7 +119,7 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
         return __awaiter(this, void 0, void 0, function* () {
             const info = yield this.getInfo(bsp.name);
             const payload = this.createPayload(archive, bsp.name, bsp.description || 'Deployed with SAP Fiori tools', info ? info.Package : bsp.package);
-            this.log.debug(`Payload:\n${payload}`);
+            this.log.debug(`Payload:\n ID: ${this.publicUrl}/Repositories('${bsp.name}') \n ABAP Package: ${info ? info.Package : bsp.package}`);
             const config = this.createConfig(bsp.transport, testMode, safeMode);
             const frontendUrl = this.getAbapFrontendUrl();
             try {

package/dist/base/patchTls.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Test for sap domains and patching to trust SAPs root certificate
+ *
+ */
+export declare class TlsPatch {
+    private static _patched;
+    /**
+     * Test if the patch is already applied.
+     *
+     * @returns true if the patch is already applied
+     */
+    static get isPatched(): boolean;
+    /**
+     * Test if the patch is required.
+     *
+     * @param url the url to test
+     * @returns true if the patch is required
+     */
+    static isPatchRequired(url: string): boolean;
+    /**
+     * Monkey patching the secure context to also support SAPs root CA.
+     */
+    static apply(): void;
+}
+//# sourceMappingURL=patchTls.d.ts.map

package/dist/base/patchTls.js

@@ -0,0 +1,52 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TlsPatch = void 0;
+const tls_1 = __importDefault(require("tls"));
+const sap_global_root_ca_1 = require("../cacerts/sap-global-root-ca");
+/**
+ * Test for sap domains and patching to trust SAPs root certificate
+ *
+ */
+class TlsPatch {
+    /**
+     * Test if the patch is already applied.
+     *
+     * @returns true if the patch is already applied
+     */
+    static get isPatched() {
+        return TlsPatch._patched;
+    }
+    /**
+     * Test if the patch is required.
+     *
+     * @param url the url to test
+     * @returns true if the patch is required
+     */
+    static isPatchRequired(url) {
+        return !TlsPatch.isPatched && url && (url.includes('.sap.corp') || url.includes('.net.sap'));
+    }
+    /**
+     * Monkey patching the secure context to also support SAPs root CA.
+     */
+    static apply() {
+        if (TlsPatch.isPatched) {
+            return;
+        }
+        const origCreateSecureContext = tls_1.default.createSecureContext;
+        tls_1.default.createSecureContext = (options) => {
+            const context = origCreateSecureContext(options);
+            const pem = sap_global_root_ca_1.sapGlobalRootCaCert.replace(/\r\n/g, '\n');
+            const certs = pem.match(/-----BEGIN CERTIFICATE-----\n[\s\S]+?\n-----END CERTIFICATE-----/g);
+            certs.forEach((cert) => {
+                context.context.addCACert(cert.trim());
+            });
+            return context;
+        };
+        TlsPatch._patched = true;
+    }
+}
+exports.TlsPatch = TlsPatch;
+//# sourceMappingURL=patchTls.js.map

package/dist/cacerts/sap-global-root-ca.d.ts

@@ -0,0 +1,7 @@
+/**
+ * SAP Global Root CA certificate is publicly available from:
+ * https://github.com/SAP/SapMachine/blob/sapmachine/src/java.base/share/data/cacerts/sapglobalrootca
+ *
+ */
+export declare const sapGlobalRootCaCert = "\nOwner: CN=SAP Global Root CA, O=SAP AG, L=Walldorf, C=DE\nIssuer: CN=SAP Global Root CA, O=SAP AG, L=Walldorf, C=DE\nSerial number: 5d03d93d31615d8f488b3970c78f1b99\nValid from: Thu Apr 26 15:41:55 GMT 2012 until: Mon Apr 26 15:46:27 GMT 2032\nSignature algorithm name: SHA256withRSA\nSubject Public Key Algorithm: 4096-bit RSA key\nVersion: 3\n-----BEGIN CERTIFICATE-----\n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\n-----END CERTIFICATE-----\n";
+//# sourceMappingURL=sap-global-root-ca.d.ts.map

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

@@ -0,0 +1,54 @@
+"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 = `
+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
+Valid from: Thu Apr 26 15:41:55 GMT 2012 until: Mon Apr 26 15:46:27 GMT 2032
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+`;
+//# sourceMappingURL=sap-global-root-ca.js.map

package/dist/factory.js

@@ -31,6 +31,7 @@ const auth_1 = require("./auth");
 const service_provider_1 = require("./base/service-provider");
 const abap_1 = require("./abap");
 const util_1 = require("util");
+const patchTls_1 = require("./base/patchTls");
 /**
  * Create a new instance of given type and set default configuration merged with the given config.
  *
@@ -72,6 +73,9 @@ function createInstance(ProviderType, config) {
             instance.cookies.addCookie(singleCookieStr.trim());
         });
     }
+    if (patchTls_1.TlsPatch.isPatchRequired(config.baseURL)) {
+        patchTls_1.TlsPatch.apply();
+    }
     return instance;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/axios-extension",
-  "version": "1.12.5",
+  "version": "1.13.0",
   "description": "Extension of the Axios module adding convenience methods to interact with SAP systems especially with OData services.",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "@types/lodash": "4.14.202",
     "nock": "13.4.0",
     "supertest": "6.3.3",
-    "@sap-ux/project-access": "1.20.1"
+    "@sap-ux/project-access": "1.21.0"
   },
   "files": [
     "dist",