@shapediver/sdk.geometry-api-sdk-v2 3.3.2 → 3.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/UtilsApi.d.ts +2 -0
- package/dist/UtilsApi.d.ts.map +1 -1
- package/dist/UtilsApi.js +72 -33
- package/dist/UtilsApi.js.map +1 -1
- package/dist/configuration.d.ts +1 -1
- package/dist/configuration.js +1 -1
- package/package.json +4 -4
- package/src/UtilsApi.ts +90 -17
- package/src/configuration.ts +1 -1
package/dist/UtilsApi.d.ts
CHANGED
|
@@ -30,6 +30,8 @@ export declare class UtilsApi extends BaseAPI {
|
|
|
30
30
|
private getMaxOutputDelay;
|
|
31
31
|
private getMaxExportDelay;
|
|
32
32
|
private buildRequest;
|
|
33
|
+
private buildRequestOptions;
|
|
34
|
+
private isTargetingInternalOrNoCdnServer;
|
|
33
35
|
private serializeDataSafely;
|
|
34
36
|
private disableAuthHeaderForShapeDiverUris;
|
|
35
37
|
}
|
package/dist/UtilsApi.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UtilsApi.d.ts","sourceRoot":"","sources":["../src/UtilsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,qBAAqB,EAA0B,MAAM,OAAO,CAAC;AACnG,OAAO,EAEH,aAAa,EAIb,gBAAgB,EAChB,SAAS,EACT,qBAAqB,EACrB,iBAAiB,EACjB,iBAAiB,EAKpB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,OAAO,EAAe,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"UtilsApi.d.ts","sourceRoot":"","sources":["../src/UtilsApi.ts"],"names":[],"mappings":"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"}
|
package/dist/UtilsApi.js
CHANGED
|
@@ -23,6 +23,7 @@ const cdnAssetExportUri = /.+\/cdn-asset-exports\/.+/;
|
|
|
23
23
|
const cdnAssetOutputUri = /.+\/cdn-asset-outputs\/.+/;
|
|
24
24
|
const cdnAssetTextureUri = /.+\/cdn-asset-textures\/.+/;
|
|
25
25
|
const directDownloadUri = /^(http[s]?:\/\/)?(viewer|textures|downloads)\.shapediver\.com(\/.*)?$/;
|
|
26
|
+
const sdNoCdnOrigin = /-nocdn.[\w-]+.shapediver.com$/;
|
|
26
27
|
class UtilsApi extends base_1.BaseAPI {
|
|
27
28
|
constructor(configuration, basePath, axios) {
|
|
28
29
|
super(configuration, basePath, axios);
|
|
@@ -62,37 +63,40 @@ class UtilsApi extends base_1.BaseAPI {
|
|
|
62
63
|
return request();
|
|
63
64
|
}
|
|
64
65
|
download(url, options) {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
data
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
66
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
const localRequestOptions = yield this.buildRequestOptions(url, options !== null && options !== void 0 ? options : {});
|
|
68
|
+
this.disableAuthHeaderForShapeDiverUris(url, localRequestOptions);
|
|
69
|
+
const request = this.buildRequest('GET', url, undefined, localRequestOptions)();
|
|
70
|
+
const res = request();
|
|
71
|
+
if ((options === null || options === void 0 ? void 0 : options.responseType) === 'arraybuffer') {
|
|
72
|
+
return res.then((response) => {
|
|
73
|
+
const data = response.data;
|
|
74
|
+
if (typeof Buffer !== 'undefined' && Buffer.isBuffer(data)) {
|
|
75
|
+
const uint8Array = new Uint8Array(data);
|
|
76
|
+
response.data = uint8Array.buffer;
|
|
77
|
+
}
|
|
78
|
+
return response;
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
if ((options === null || options === void 0 ? void 0 : options.responseType) === 'json') {
|
|
82
|
+
return res.then((response) => {
|
|
83
|
+
const data = response.data;
|
|
84
|
+
if (data === null ||
|
|
85
|
+
data === undefined ||
|
|
86
|
+
typeof data === 'string' ||
|
|
87
|
+
data instanceof ArrayBuffer ||
|
|
88
|
+
(typeof Buffer !== 'undefined' && Buffer.isBuffer(data)) ||
|
|
89
|
+
(typeof Blob !== 'undefined' && data instanceof Blob)) {
|
|
90
|
+
throw new error_1.ResponseError(response.status, 'Invalid JSON response: Could not parse response as JSON', 'Expected valid JSON but received incompatible response');
|
|
91
|
+
}
|
|
92
|
+
return response;
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
return res;
|
|
96
|
+
});
|
|
92
97
|
}
|
|
93
98
|
downloadAsset(url, options) {
|
|
94
99
|
let type;
|
|
95
|
-
this.disableAuthHeaderForShapeDiverUris(url, options);
|
|
96
100
|
if (apiAssetExportUri.test(url) || cdnAssetExportUri.test(url))
|
|
97
101
|
type = 'export';
|
|
98
102
|
else if (apiAssetOutputUri.test(url) || cdnAssetOutputUri.test(url))
|
|
@@ -105,17 +109,18 @@ class UtilsApi extends base_1.BaseAPI {
|
|
|
105
109
|
return [this.download(url, options), type];
|
|
106
110
|
}
|
|
107
111
|
downloadImage(sessionId, url, options) {
|
|
108
|
-
this.disableAuthHeaderForShapeDiverUris(url, options);
|
|
109
112
|
if (apiAssetTextureUri.test(url) ||
|
|
110
113
|
cdnAssetTextureUri.test(url) ||
|
|
111
114
|
directDownloadUri.test(url)) {
|
|
112
115
|
return this.download(url, options);
|
|
113
116
|
}
|
|
114
117
|
else {
|
|
118
|
+
const localOptions = options !== null && options !== void 0 ? options : {};
|
|
119
|
+
this.disableAuthHeaderForShapeDiverUris(url, localOptions);
|
|
115
120
|
const encodedUrl = typeof window !== 'undefined' && window.btoa
|
|
116
121
|
? window.btoa(encodeURIComponent(url).replace(/%([0-9A-F]{2})/g, (_, p1) => String.fromCharCode(parseInt(p1, 16))))
|
|
117
122
|
: Buffer.from(url, 'utf-8').toString('base64');
|
|
118
|
-
return new client_1.AssetsApi(this.configuration).downloadImage(sessionId, encodedUrl,
|
|
123
|
+
return new client_1.AssetsApi(this.configuration).downloadImage(sessionId, encodedUrl, localOptions);
|
|
119
124
|
}
|
|
120
125
|
}
|
|
121
126
|
submitAndWaitForOutput(sessionId_1, body_1) {
|
|
@@ -214,6 +219,33 @@ class UtilsApi extends base_1.BaseAPI {
|
|
|
214
219
|
return (0, common_1.createRequestFunction)(axiosArgs, this.axios, basePath, configuration).bind(this.axios);
|
|
215
220
|
};
|
|
216
221
|
}
|
|
222
|
+
buildRequestOptions(url, options) {
|
|
223
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
224
|
+
let baseOptions;
|
|
225
|
+
if (this.configuration)
|
|
226
|
+
baseOptions = this.configuration.baseOptions;
|
|
227
|
+
const localRequestOptions = Object.assign(Object.assign({}, baseOptions), options), localHeaderParameter = {};
|
|
228
|
+
if (this.isTargetingInternalOrNoCdnServer(url))
|
|
229
|
+
yield (0, common_1.setBearerAuthToObject)(localHeaderParameter, this.configuration);
|
|
230
|
+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
|
|
231
|
+
localRequestOptions.headers = Object.assign(Object.assign(Object.assign({}, localHeaderParameter), headersFromBaseOptions), options.headers);
|
|
232
|
+
return localRequestOptions;
|
|
233
|
+
});
|
|
234
|
+
}
|
|
235
|
+
isTargetingInternalOrNoCdnServer(url) {
|
|
236
|
+
var _a;
|
|
237
|
+
const basePath = (_a = this.configuration) === null || _a === void 0 ? void 0 : _a.basePath;
|
|
238
|
+
if (!basePath)
|
|
239
|
+
return false;
|
|
240
|
+
try {
|
|
241
|
+
const targetUrl = new URL(url, basePath);
|
|
242
|
+
const baseUrl = new URL(basePath);
|
|
243
|
+
return targetUrl.origin === baseUrl.origin || sdNoCdnOrigin.test(targetUrl.origin);
|
|
244
|
+
}
|
|
245
|
+
catch (_b) {
|
|
246
|
+
return false;
|
|
247
|
+
}
|
|
248
|
+
}
|
|
217
249
|
serializeDataSafely(value, requestOptions, configuration) {
|
|
218
250
|
function isStream(val) {
|
|
219
251
|
return val !== null && typeof val === 'object' && typeof val.pipe === 'function';
|
|
@@ -232,9 +264,16 @@ class UtilsApi extends base_1.BaseAPI {
|
|
|
232
264
|
}
|
|
233
265
|
disableAuthHeaderForShapeDiverUris(url, options) {
|
|
234
266
|
var _a;
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
267
|
+
if ((_a = options.headers) === null || _a === void 0 ? void 0 : _a.Authorization)
|
|
268
|
+
return;
|
|
269
|
+
let targetUrl;
|
|
270
|
+
try {
|
|
271
|
+
targetUrl = new URL(url);
|
|
272
|
+
}
|
|
273
|
+
catch (_b) {
|
|
274
|
+
return;
|
|
275
|
+
}
|
|
276
|
+
if (directDownloadUri.test(targetUrl.origin) || cdnAssetUri.test(url))
|
|
238
277
|
options.headers = Object.assign({ Authorization: undefined }, options.headers);
|
|
239
278
|
}
|
|
240
279
|
}
|
package/dist/UtilsApi.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UtilsApi.js","sourceRoot":"","sources":["../src/UtilsApi.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"UtilsApi.js","sourceRoot":"","sources":["../src/UtilsApi.ts"],"names":[],"mappings":"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"}
|
package/dist/configuration.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ export interface ConfigurationParameters extends Pick<ClientConfigParams, 'acces
|
|
|
6
6
|
maxRetries?: number;
|
|
7
7
|
}
|
|
8
8
|
export declare class Configuration extends ClientConfig {
|
|
9
|
-
protected readonly sdkVersion = "3.
|
|
9
|
+
protected readonly sdkVersion = "3.4.1";
|
|
10
10
|
readonly useCustomAxios: boolean;
|
|
11
11
|
readonly maxRetries: number;
|
|
12
12
|
constructor(param?: ConfigurationParameters);
|
package/dist/configuration.js
CHANGED
|
@@ -6,7 +6,7 @@ class Configuration extends configuration_1.Configuration {
|
|
|
6
6
|
constructor(param = {}) {
|
|
7
7
|
var _a, _b, _c, _d;
|
|
8
8
|
super(param);
|
|
9
|
-
this.sdkVersion = '3.
|
|
9
|
+
this.sdkVersion = '3.4.1';
|
|
10
10
|
this.useCustomAxios = (_a = param.useCustomAxios) !== null && _a !== void 0 ? _a : true;
|
|
11
11
|
this.maxRetries = (_b = param.maxRetries) !== null && _b !== void 0 ? _b : 5;
|
|
12
12
|
this.baseOptions = (_c = this.baseOptions) !== null && _c !== void 0 ? _c : {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/sdk.geometry-api-sdk-v2",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.4.1",
|
|
4
4
|
"description": "SDK to communicate with the Geometry API version 2",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"shapediver",
|
|
@@ -45,17 +45,17 @@
|
|
|
45
45
|
]
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"axios": "1.15.
|
|
48
|
+
"axios": "1.15.2"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@types/uuid": "10.0.0",
|
|
52
52
|
"axios-mock-adapter": "2.1.0",
|
|
53
53
|
"jest": "29.7.0",
|
|
54
|
-
"jest-environment-jsdom": "^30.
|
|
54
|
+
"jest-environment-jsdom": "^30.3.0",
|
|
55
55
|
"lerna": "8.2.4",
|
|
56
56
|
"typescript": "5.9.3",
|
|
57
57
|
"uuid": "10.0.0",
|
|
58
|
-
"webpack": "5.
|
|
58
|
+
"webpack": "5.106.2",
|
|
59
59
|
"webpack-cli": "5.1.4",
|
|
60
60
|
"webpack-dev-server": "5.2.3"
|
|
61
61
|
}
|
package/src/UtilsApi.ts
CHANGED
|
@@ -16,7 +16,11 @@ import {
|
|
|
16
16
|
ResOutput,
|
|
17
17
|
} from './client';
|
|
18
18
|
import { BaseAPI, RequestArgs } from './client/base';
|
|
19
|
-
import {
|
|
19
|
+
import {
|
|
20
|
+
createRequestFunction,
|
|
21
|
+
serializeDataIfNeeded,
|
|
22
|
+
setBearerAuthToObject,
|
|
23
|
+
} from './client/common';
|
|
20
24
|
import { IllegalArgumentError, ResponseError, TimeoutError } from './error';
|
|
21
25
|
import { contentDispositionFromFilename, sleep } from './utils';
|
|
22
26
|
|
|
@@ -34,6 +38,9 @@ const cdnAssetTextureUri = /.+\/cdn-asset-textures\/.+/;
|
|
|
34
38
|
/* Regex patterns for direct download URIs. */
|
|
35
39
|
const directDownloadUri = /^(http[s]?:\/\/)?(viewer|textures|downloads)\.shapediver\.com(\/.*)?$/;
|
|
36
40
|
|
|
41
|
+
/* Regex pattern for ShapeDiver no-CDN servers. */
|
|
42
|
+
const sdNoCdnOrigin = /-nocdn.[\w-]+.shapediver.com$/;
|
|
43
|
+
|
|
37
44
|
export class UtilsApi extends BaseAPI {
|
|
38
45
|
constructor(configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
|
|
39
46
|
super(configuration, basePath, axios);
|
|
@@ -41,6 +48,8 @@ export class UtilsApi extends BaseAPI {
|
|
|
41
48
|
|
|
42
49
|
/**
|
|
43
50
|
* Upload the given file to the specified URL.
|
|
51
|
+
*
|
|
52
|
+
* _Note: This method does not use the `UtilsApi`'s base configuration._
|
|
44
53
|
* @param {string} url The target URL of the upload request.
|
|
45
54
|
* @param {*} data The data that should be uploaded.
|
|
46
55
|
* @param {string} contentType Indicate the original media type of the resource.
|
|
@@ -76,6 +85,8 @@ export class UtilsApi extends BaseAPI {
|
|
|
76
85
|
|
|
77
86
|
/**
|
|
78
87
|
* Upload the given asset to the specified ShapeDiver URL.
|
|
88
|
+
*
|
|
89
|
+
* _Note: This method does not use the `UtilsApi`'s base configuration._
|
|
79
90
|
* @param {string} url The target URL of the upload request.
|
|
80
91
|
* @param {*} data The data that should be uploaded.
|
|
81
92
|
* @param {ResAssetUploadHeaders} headers The headers object that was returned from the request-upload call.
|
|
@@ -130,8 +141,11 @@ export class UtilsApi extends BaseAPI {
|
|
|
130
141
|
options: { responseType: 'text' } & RawAxiosRequestConfig
|
|
131
142
|
): AxiosPromise<string>;
|
|
132
143
|
public download(url: string, options?: RawAxiosRequestConfig): AxiosPromise<any>;
|
|
133
|
-
public download(url: string, options?: RawAxiosRequestConfig): AxiosPromise<any> {
|
|
134
|
-
const
|
|
144
|
+
public async download(url: string, options?: RawAxiosRequestConfig): AxiosPromise<any> {
|
|
145
|
+
const localRequestOptions = await this.buildRequestOptions(url, options ?? {});
|
|
146
|
+
this.disableAuthHeaderForShapeDiverUris(url, localRequestOptions);
|
|
147
|
+
|
|
148
|
+
const request = this.buildRequest('GET', url, undefined, localRequestOptions)();
|
|
135
149
|
const res = request();
|
|
136
150
|
|
|
137
151
|
// Convert Buffer to ArrayBuffer in Node.js when responseType is 'arraybuffer'
|
|
@@ -201,7 +215,6 @@ export class UtilsApi extends BaseAPI {
|
|
|
201
215
|
options?: RawAxiosRequestConfig
|
|
202
216
|
): [AxiosPromise<any>, 'export' | 'output' | 'texture'] {
|
|
203
217
|
let type: 'output' | 'export' | 'texture';
|
|
204
|
-
this.disableAuthHeaderForShapeDiverUris(url, options);
|
|
205
218
|
|
|
206
219
|
// Check if the given URL is a valid API or CDN asset URL
|
|
207
220
|
if (apiAssetExportUri.test(url) || cdnAssetExportUri.test(url)) type = 'export';
|
|
@@ -240,8 +253,6 @@ export class UtilsApi extends BaseAPI {
|
|
|
240
253
|
url: string,
|
|
241
254
|
options?: RawAxiosRequestConfig
|
|
242
255
|
): AxiosPromise<any> {
|
|
243
|
-
this.disableAuthHeaderForShapeDiverUris(url, options);
|
|
244
|
-
|
|
245
256
|
if (
|
|
246
257
|
apiAssetTextureUri.test(url) ||
|
|
247
258
|
cdnAssetTextureUri.test(url) ||
|
|
@@ -250,7 +261,10 @@ export class UtilsApi extends BaseAPI {
|
|
|
250
261
|
// Call ShapeDiver texture-asset URLs directly
|
|
251
262
|
return this.download(url, options) as any;
|
|
252
263
|
} else {
|
|
253
|
-
|
|
264
|
+
/* All other source URLs are called via the download-image endpoint */
|
|
265
|
+
|
|
266
|
+
const localOptions: RawAxiosRequestConfig = options ?? {};
|
|
267
|
+
this.disableAuthHeaderForShapeDiverUris(url, localOptions);
|
|
254
268
|
|
|
255
269
|
// Use a universal base64 encoder for browser and Node.js environments
|
|
256
270
|
const encodedUrl =
|
|
@@ -262,7 +276,11 @@ export class UtilsApi extends BaseAPI {
|
|
|
262
276
|
)
|
|
263
277
|
: Buffer.from(url, 'utf-8').toString('base64');
|
|
264
278
|
|
|
265
|
-
return new AssetsApi(this.configuration).downloadImage(
|
|
279
|
+
return new AssetsApi(this.configuration).downloadImage(
|
|
280
|
+
sessionId,
|
|
281
|
+
encodedUrl,
|
|
282
|
+
localOptions
|
|
283
|
+
);
|
|
266
284
|
}
|
|
267
285
|
}
|
|
268
286
|
|
|
@@ -508,6 +526,58 @@ export class UtilsApi extends BaseAPI {
|
|
|
508
526
|
};
|
|
509
527
|
}
|
|
510
528
|
|
|
529
|
+
/**
|
|
530
|
+
* Builds the Axios request options by merging the API's base configuration with the given
|
|
531
|
+
* options, and conditionally setting or overrides the Authorization header.
|
|
532
|
+
*
|
|
533
|
+
* The authorization header is set, when the URL is targeting the same server as the one
|
|
534
|
+
* specified in the API's base path configuration, or if it is a ShapeDiver no-CDN server. In
|
|
535
|
+
* this case, the Bearer token from the API configuration will be used.
|
|
536
|
+
* @param url The URL to send the request to.
|
|
537
|
+
* @param options The Axios request options.
|
|
538
|
+
* @returns The merged Axios request options.
|
|
539
|
+
*/
|
|
540
|
+
private async buildRequestOptions(
|
|
541
|
+
url: string,
|
|
542
|
+
options: RawAxiosRequestConfig
|
|
543
|
+
): Promise<RawAxiosRequestConfig> {
|
|
544
|
+
let baseOptions;
|
|
545
|
+
if (this.configuration) baseOptions = this.configuration.baseOptions;
|
|
546
|
+
|
|
547
|
+
const localRequestOptions = { ...baseOptions, ...options },
|
|
548
|
+
localHeaderParameter = {} as any;
|
|
549
|
+
|
|
550
|
+
if (this.isTargetingInternalOrNoCdnServer(url))
|
|
551
|
+
await setBearerAuthToObject(localHeaderParameter, this.configuration);
|
|
552
|
+
|
|
553
|
+
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
|
|
554
|
+
localRequestOptions.headers = {
|
|
555
|
+
...localHeaderParameter,
|
|
556
|
+
...headersFromBaseOptions,
|
|
557
|
+
...options.headers,
|
|
558
|
+
};
|
|
559
|
+
|
|
560
|
+
return localRequestOptions;
|
|
561
|
+
}
|
|
562
|
+
|
|
563
|
+
/**
|
|
564
|
+
* Checks whether the given URL is targeting the same server as the one specified in the API's
|
|
565
|
+
* base path configuration or if it is a ShapeDiver no-CDN server.
|
|
566
|
+
*/
|
|
567
|
+
private isTargetingInternalOrNoCdnServer(url: string): boolean {
|
|
568
|
+
const basePath = this.configuration?.basePath;
|
|
569
|
+
if (!basePath) return false;
|
|
570
|
+
|
|
571
|
+
try {
|
|
572
|
+
const targetUrl = new URL(url, basePath);
|
|
573
|
+
const baseUrl = new URL(basePath);
|
|
574
|
+
|
|
575
|
+
return targetUrl.origin === baseUrl.origin || sdNoCdnOrigin.test(targetUrl.origin);
|
|
576
|
+
} catch {
|
|
577
|
+
return false;
|
|
578
|
+
}
|
|
579
|
+
}
|
|
580
|
+
|
|
511
581
|
/**
|
|
512
582
|
* A wrapper around the auto-generated `serializeDataIfNeeded` that safely serializes data for
|
|
513
583
|
* Axios. The idea of the base function is to stringify objects for application-json requests.
|
|
@@ -547,15 +617,18 @@ export class UtilsApi extends BaseAPI {
|
|
|
547
617
|
}
|
|
548
618
|
|
|
549
619
|
/** Disable the Authorization header for ShapeDiver URIs if not explicitly set. */
|
|
550
|
-
private disableAuthHeaderForShapeDiverUris(
|
|
551
|
-
|
|
552
|
-
options
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
620
|
+
private disableAuthHeaderForShapeDiverUris(url: string, options: RawAxiosRequestConfig): void {
|
|
621
|
+
// When an authorization header is set, it will override anything that is set later
|
|
622
|
+
if (options.headers?.Authorization) return;
|
|
623
|
+
|
|
624
|
+
let targetUrl: URL;
|
|
625
|
+
try {
|
|
626
|
+
targetUrl = new URL(url);
|
|
627
|
+
} catch {
|
|
628
|
+
return;
|
|
629
|
+
}
|
|
630
|
+
|
|
631
|
+
if (directDownloadUri.test(targetUrl.origin) || cdnAssetUri.test(url))
|
|
559
632
|
options.headers = { Authorization: undefined, ...options.headers };
|
|
560
633
|
}
|
|
561
634
|
}
|
package/src/configuration.ts
CHANGED
|
@@ -34,7 +34,7 @@ export interface ConfigurationParameters
|
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
export class Configuration extends ClientConfig {
|
|
37
|
-
protected readonly sdkVersion = '3.
|
|
37
|
+
protected readonly sdkVersion = '3.4.1'; // WARNING: This value is updated automatically!
|
|
38
38
|
|
|
39
39
|
public readonly useCustomAxios: boolean;
|
|
40
40
|
public readonly maxRetries: number;
|