diff --git a/CHANGELOG.md b/CHANGELOG.md index 72c3af78..bbfc0873 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,24 @@ +## [5.23.3](https://github.com/commercelayer/commercelayer-sdk/compare/v5.23.2...v5.23.3) (2023-12-13) + + +### Bug Fixes + +* remove default custom user agent ([750f695](https://github.com/commercelayer/commercelayer-sdk/commit/750f695dc7ec29b9a696a47b39f29bf7df31a1e4)) + +## [5.23.2](https://github.com/commercelayer/commercelayer-sdk/compare/v5.23.1...v5.23.2) (2023-11-30) + + +### Bug Fixes + +* resource list can be sorted ([702fefa](https://github.com/commercelayer/commercelayer-sdk/commit/702fefa041fbf14b904348cddcea61ab3c8667e3)) + +## [5.23.1](https://github.com/commercelayer/commercelayer-sdk/compare/v5.23.0...v5.23.1) (2023-11-30) + + +### Bug Fixes + +* update resources to schema v4.21.0 ([5f63700](https://github.com/commercelayer/commercelayer-sdk/commit/5f63700393efcf2d2e7f2457dc897d658a4d9665)) + # [5.23.0](https://github.com/commercelayer/commercelayer-sdk/compare/v5.22.1...v5.23.0) (2023-11-29) diff --git a/gen/schema.ts b/gen/schema.ts index 468ced3a..8a1f1a9c 100644 --- a/gen/schema.ts +++ b/gen/schema.ts @@ -307,7 +307,6 @@ type Resource = { operations: OperationMap } - type ResourceMap = { [resource: string]: Resource } diff --git a/package.json b/package.json index 26f3cefb..516efefa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@commercelayer/sdk", - "version": "5.23.0", + "version": "5.23.3", "main": "lib/cjs/index.js", "types": "lib/cjs/index.d.ts", "module": "lib/esm/index.js", diff --git a/src/client.ts b/src/client.ts index 5933d776..02bf0df7 100644 --- a/src/client.ts +++ b/src/client.ts @@ -80,21 +80,25 @@ class ApiClient { // Set custom headers const customHeaders = this.customHeaders(options.headers) + // Set headers + const headers: any = { + ...customHeaders, + 'Accept': 'application/vnd.api+json', + 'Content-Type': 'application/vnd.api+json', + 'Authorization': 'Bearer ' + this.#accessToken + } + // Set User-Agent - // const userAgentData = packageInfo(['version', 'dependencies.axios'], { nestedName: true }) - let userAgent = options.userAgent || `SDK-core axios/${axios.VERSION}` - if (!userAgent.includes('axios/')) userAgent += ` axios/${axios.VERSION}` + let userAgent = options.userAgent // || `SDK-core axios/${axios.VERSION}` + if (userAgent) { + if (!userAgent.includes('axios/')) userAgent += ` axios/${axios.VERSION}` + headers['User-Agent'] = userAgent + } const axiosOptions: CreateAxiosDefaults = { baseURL: this.baseUrl, timeout: config.client.timeout, - headers: { - ...customHeaders, - 'Accept': 'application/vnd.api+json', - 'Content-Type': 'application/vnd.api+json', - 'Authorization': 'Bearer ' + this.#accessToken, - 'User-Agent': userAgent - }, + headers, ...axiosConfig } diff --git a/src/static.ts b/src/static.ts index 26ff8b31..7b0690d4 100644 --- a/src/static.ts +++ b/src/static.ts @@ -8,8 +8,8 @@ import type { CommerceLayerClient, CommerceLayerInitConfig } from './commercelay /* Static functions */ export const CommerceLayerStatic = { - resources: (): readonly string[] => { - return api.resourceList + resources: (sort?: boolean): readonly string[] => { + return sort? [ ...api.resourceList ].sort() : api.resourceList }, isSdkError: (error: unknown): error is SdkError => {