@sap-ux/axios-extension 1.17.6 → 1.17.7

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

@@ -49,17 +49,18 @@ class V4CatalogService extends base_1.CatalogService {
                 ? V4_RECOMMENDED_ENTITYSET
                 : V4_CLASSIC_ENTITYSET;
         }
-        const params = {
-            $count: true,
-            $expand: `DefaultSystem($expand=${this.entitySet})`
-        };
-        let response = await this.get('/ServiceGroups', { params });
-        const serviceGroups = response.odata() || [];
-        // paging required
-        while (response.data['@odata.nextLink']) {
-            const nextLink = new URL(response.data['@odata.nextLink']);
-            response = await super.get('/ServiceGroups', { params: { ...params, ...nextLink.searchParams } });
-            serviceGroups.push(...response.odata());
+        const params = new URLSearchParams([
+            ['$count', 'true'],
+            ['$expand', `DefaultSystem($expand=${this.entitySet})`]
+        ]);
+        const response = await this.get('/ServiceGroups', { params }, true);
+        let serviceGroupResponseOdata = response.odata();
+        const serviceGroups = serviceGroupResponseOdata.value;
+        // Page by using the backends nextLink search parameters for the next request
+        while (serviceGroupResponseOdata['@odata.nextLink']) {
+            const nextLink = new URL(serviceGroupResponseOdata['@odata.nextLink'], this.defaults.baseURL);
+            serviceGroupResponseOdata = (await this.get('/ServiceGroups', { params: nextLink.searchParams }, true)).odata();
+            serviceGroups.push(...serviceGroupResponseOdata.value);
         }
         // check if the service responded with an odata error
         if (odata_request_error_1.ODataRequestError.containsError(serviceGroups)) {

package/dist/base/odata-service.d.ts

@@ -55,8 +55,9 @@ export declare class ODataService extends Axios implements ODataServiceExtension
      *
      * @param url relative url to the service
      * @param config additional axios request config
+     * @param includeV4ControlData include the control information that is not part of the odata value but may be required e.g. `@odata.nextLink`
      * @returns a response enhanced with an OData parse method
      */
-    get<T = any, R = ODataResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>): Promise<R>;
+    get<T = any, R = ODataResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>, includeV4ControlData?: boolean): Promise<R>;
 }
 //# sourceMappingURL=odata-service.d.ts.map

package/dist/base/odata-service.js

@@ -13,9 +13,10 @@ var ODataVersion;
 /**
  * Parse a JSON based OData response and extract the content from the OData structure.
  *
+ * @param includeV4ControlData unless specified only the value of the parsed v4 odata response is returned, otherwise all additional data is included e.g. `@odata.nextLink`
  * @returns an object of the provided type
  */
-function parseODataResponse() {
+function parseODataResponse(includeV4ControlData = false) {
     const data = this.data ? JSON.parse(this.data) : {};
     if (data.d) {
         // v2
@@ -26,7 +27,7 @@ function parseODataResponse() {
             return data.d;
         }
     }
-    else if (data['@odata.context']) {
+    else if (!includeV4ControlData && data['@odata.context']) {
         // v4
         if (data.value) {
             return data.value;
@@ -82,19 +83,26 @@ class ODataService extends axios_1.Axios {
      *
      * @param url relative url to the service
      * @param config additional axios request config
+     * @param includeV4ControlData include the control information that is not part of the odata value but may be required e.g. `@odata.nextLink`
      * @returns a response enhanced with an OData parse method
      */
-    async get(url, config = {}) {
-        // request json if not otherwise specified
-        if (config.params?.['$format'] === undefined && !config.headers?.Accept) {
+    async get(url, config = {}, includeV4ControlData = false) {
+        // AxiosRequestConfig `params` property supports plain object or URLSearchParams
+        if (config.params instanceof URLSearchParams && !config.params.has('$format') && !config.headers?.Accept) {
+            config.params.set('$format', 'json');
+            config.headers = config.headers ?? {};
+            config.headers.Accept = 'application/json';
+        }
+        else if (config.params?.['$format'] === undefined && !config.headers?.Accept) {
             config.params = config.params ?? {};
             config.params['$format'] = 'json';
             config.headers = config.headers ?? {};
             config.headers.Accept = 'application/json';
         }
         const response = await super.get(url, config);
-        if (response.data && config.params?.['$format'] === 'json') {
-            response.odata = parseODataResponse.bind(response);
+        const contentType = response.headers['content-type'] ?? response.headers['Content-Type'];
+        if (response.data && (contentType?.includes('application/json') || config.params?.['$format'] === 'json')) {
+            response.odata = parseODataResponse.bind(response, includeV4ControlData);
         }
         return response;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/axios-extension",
-  "version": "1.17.6",
+  "version": "1.17.7",
   "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.28.8"
+    "@sap-ux/project-access": "1.28.9"
   },
   "files": [
     "dist",