@sinch/sdk-client 1.1.0 → 1.2.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/api/api-client-options-helper.d.ts +2 -2
- package/dist/api/api-client-options-helper.js +16 -23
- package/dist/api/api-client-options-helper.js.map +1 -1
- package/dist/api/api-client.d.ts +5 -12
- package/dist/api/api-client.js +5 -14
- package/dist/api/api-client.js.map +1 -1
- package/dist/client/api-client-helpers.d.ts +1 -1
- package/dist/client/api-client-helpers.js +18 -8
- package/dist/client/api-client-helpers.js.map +1 -1
- package/dist/client/api-client-pagination-helper.js +21 -3
- package/dist/client/api-client-pagination-helper.js.map +1 -1
- package/dist/client/api-fetch-client.d.ts +1 -6
- package/dist/client/api-fetch-client.js +20 -47
- package/dist/client/api-fetch-client.js.map +1 -1
- package/dist/domain/domain-interface.d.ts +2 -2
- package/dist/plugins/exception/exception.response.js +3 -1
- package/dist/plugins/exception/exception.response.js.map +1 -1
- package/dist/plugins/index.d.ts +0 -1
- package/dist/plugins/index.js +0 -1
- package/dist/plugins/index.js.map +1 -1
- package/dist/utils/date.d.ts +8 -0
- package/dist/utils/date.js +58 -0
- package/dist/utils/date.js.map +1 -0
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -1
- package/package.json +3 -2
- package/dist/plugins/timezone/index.d.ts +0 -1
- package/dist/plugins/timezone/index.js +0 -18
- package/dist/plugins/timezone/index.js.map +0 -1
- package/dist/plugins/timezone/timezone.response.d.ts +0 -5
- package/dist/plugins/timezone/timezone.response.js +0 -50
- package/dist/plugins/timezone/timezone.response.js.map +0 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { SinchClientParameters } from '../domain';
|
|
2
2
|
import { ApiClientOptions } from './api-client-options';
|
|
3
3
|
export declare const buildOAuth2ApiClientOptions: (params: SinchClientParameters, apiName: string) => ApiClientOptions;
|
|
4
4
|
export declare const buildApplicationSignedApiClientOptions: (params: SinchClientParameters, apiName: string) => ApiClientOptions;
|
|
5
|
-
export declare const buildFlexibleOAuth2OrApiTokenApiClientOptions: (params: SinchClientParameters
|
|
5
|
+
export declare const buildFlexibleOAuth2OrApiTokenApiClientOptions: (params: SinchClientParameters) => ApiClientOptions;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.buildFlexibleOAuth2OrApiTokenApiClientOptions = exports.buildApplicationSignedApiClientOptions = exports.buildOAuth2ApiClientOptions = void 0;
|
|
4
|
-
const domain_1 = require("../domain");
|
|
5
4
|
const plugins_1 = require("../plugins");
|
|
6
5
|
const buildOAuth2ApiClientOptions = (params, apiName) => {
|
|
7
6
|
if (!params.projectId || !params.keyId || !params.keySecret) {
|
|
@@ -30,33 +29,27 @@ const buildApplicationSignedApiClientOptions = (params, apiName) => {
|
|
|
30
29
|
return apiClientOptions;
|
|
31
30
|
};
|
|
32
31
|
exports.buildApplicationSignedApiClientOptions = buildApplicationSignedApiClientOptions;
|
|
33
|
-
const buildFlexibleOAuth2OrApiTokenApiClientOptions = (params
|
|
32
|
+
const buildFlexibleOAuth2OrApiTokenApiClientOptions = (params) => {
|
|
34
33
|
let apiClientOptions;
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
useServicePlanId: false,
|
|
44
|
-
};
|
|
34
|
+
if (params.servicePlanId && params.apiToken) {
|
|
35
|
+
apiClientOptions = {
|
|
36
|
+
projectId: params.servicePlanId,
|
|
37
|
+
requestPlugins: [new plugins_1.ApiTokenRequest(params.apiToken)],
|
|
38
|
+
useServicePlanId: true,
|
|
39
|
+
};
|
|
40
|
+
if (params.projectId || params.keyId || params.keySecret) {
|
|
41
|
+
console.warn('As the servicePlanId and the apiToken are provided, all other credentials will be disregarded.');
|
|
45
42
|
}
|
|
46
43
|
}
|
|
47
|
-
if (
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
requestPlugins: [new plugins_1.ApiTokenRequest(params.apiToken)],
|
|
54
|
-
useServicePlanId: true,
|
|
55
|
-
};
|
|
56
|
-
}
|
|
44
|
+
else if (params.projectId && params.keyId && params.keySecret) {
|
|
45
|
+
apiClientOptions = {
|
|
46
|
+
projectId: params.projectId,
|
|
47
|
+
requestPlugins: [new plugins_1.Oauth2TokenRequest(params.keyId, params.keySecret, params.authHostname)],
|
|
48
|
+
useServicePlanId: false,
|
|
49
|
+
};
|
|
57
50
|
}
|
|
58
51
|
if (!apiClientOptions) {
|
|
59
|
-
throw new Error(
|
|
52
|
+
throw new Error('Invalid parameters for the SMS API: check your configuration');
|
|
60
53
|
}
|
|
61
54
|
addPlugins(apiClientOptions, params);
|
|
62
55
|
return apiClientOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client-options-helper.js","sourceRoot":"","sources":["../../src/api/api-client-options-helper.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"api-client-options-helper.js","sourceRoot":"","sources":["../../src/api/api-client-options-helper.ts"],"names":[],"mappings":"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"}
|
package/dist/api/api-client.d.ts
CHANGED
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { RequestBody, RequestOptions } from '../plugins/core/request-plugin';
|
|
3
3
|
import { ApiClientOptions } from './api-client-options';
|
|
4
|
-
import FormData = require('form-data');
|
|
5
4
|
export declare enum PaginationEnum {
|
|
6
5
|
NONE = 0,
|
|
7
6
|
/** Used by the Numbers API */
|
|
8
7
|
TOKEN = 1,
|
|
8
|
+
/** Used by the Conversation API */
|
|
9
|
+
TOKEN2 = 2,
|
|
9
10
|
/** used by the SMS API */
|
|
10
|
-
PAGE =
|
|
11
|
+
PAGE = 3,
|
|
11
12
|
/** used by the Elastic SIP Trunking API */
|
|
12
|
-
PAGE2 =
|
|
13
|
+
PAGE2 = 4,
|
|
13
14
|
/** used by the Fax API */
|
|
14
|
-
PAGE3 =
|
|
15
|
+
PAGE3 = 5
|
|
15
16
|
}
|
|
16
17
|
export interface ApiListPromise<T> extends Promise<PageResult<T>>, AsyncIterableIterator<T> {
|
|
17
18
|
}
|
|
@@ -132,12 +133,4 @@ export declare class ApiClient {
|
|
|
132
133
|
* @return {Promise<T>} A promise that resolves to the result of the HTTP call.
|
|
133
134
|
*/
|
|
134
135
|
processFileCall(_httpCallParameters: ApiCallParameters): Promise<FileBuffer>;
|
|
135
|
-
/**
|
|
136
|
-
* Receives an object containing key/value pairs
|
|
137
|
-
* Encodes this object to match application/x-www-urlencoded or multipart/form-data
|
|
138
|
-
* @abstract
|
|
139
|
-
* @param {any} _data
|
|
140
|
-
* @param {string} _type
|
|
141
|
-
*/
|
|
142
|
-
processFormData(_data: any, _type: string): FormData | string;
|
|
143
136
|
}
|
package/dist/api/api-client.js
CHANGED
|
@@ -7,12 +7,14 @@ var PaginationEnum;
|
|
|
7
7
|
PaginationEnum[PaginationEnum["NONE"] = 0] = "NONE";
|
|
8
8
|
/** Used by the Numbers API */
|
|
9
9
|
PaginationEnum[PaginationEnum["TOKEN"] = 1] = "TOKEN";
|
|
10
|
+
/** Used by the Conversation API */
|
|
11
|
+
PaginationEnum[PaginationEnum["TOKEN2"] = 2] = "TOKEN2";
|
|
10
12
|
/** used by the SMS API */
|
|
11
|
-
PaginationEnum[PaginationEnum["PAGE"] =
|
|
13
|
+
PaginationEnum[PaginationEnum["PAGE"] = 3] = "PAGE";
|
|
12
14
|
/** used by the Elastic SIP Trunking API */
|
|
13
|
-
PaginationEnum[PaginationEnum["PAGE2"] =
|
|
15
|
+
PaginationEnum[PaginationEnum["PAGE2"] = 4] = "PAGE2";
|
|
14
16
|
/** used by the Fax API */
|
|
15
|
-
PaginationEnum[PaginationEnum["PAGE3"] =
|
|
17
|
+
PaginationEnum[PaginationEnum["PAGE3"] = 5] = "PAGE3";
|
|
16
18
|
})(PaginationEnum || (exports.PaginationEnum = PaginationEnum = {}));
|
|
17
19
|
/**
|
|
18
20
|
* API Client used to call the server
|
|
@@ -138,17 +140,6 @@ class ApiClient {
|
|
|
138
140
|
processFileCall(_httpCallParameters) {
|
|
139
141
|
throw new Error('Abstract method must be implemented');
|
|
140
142
|
}
|
|
141
|
-
/**
|
|
142
|
-
* Receives an object containing key/value pairs
|
|
143
|
-
* Encodes this object to match application/x-www-urlencoded or multipart/form-data
|
|
144
|
-
* @abstract
|
|
145
|
-
* @param {any} _data
|
|
146
|
-
* @param {string} _type
|
|
147
|
-
*/
|
|
148
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
149
|
-
processFormData(_data, _type) {
|
|
150
|
-
throw new Error('Abstract method must be implemented');
|
|
151
|
-
}
|
|
152
143
|
}
|
|
153
144
|
exports.ApiClient = ApiClient;
|
|
154
145
|
// ----- INTERNAL ------ \\
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../src/api/api-client.ts"],"names":[],"mappings":";;;AAEA,2CAAqC;
|
|
1
|
+
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../src/api/api-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { RequestOptions, RequestPlugin } from '../plugins/core/request-plugin';
|
|
2
2
|
import { ApiCallParameters, ApiCallParametersWithPagination } from '../api/api-client';
|
|
3
3
|
import { ErrorContext } from '../api/api-errors';
|
|
4
|
-
export declare const manageExpiredToken: (apiCallParameters: ApiCallParameters | ApiCallParametersWithPagination, errorContext: ErrorContext, requestPlugins: RequestPlugin[] | undefined, requestOptions: RequestOptions
|
|
4
|
+
export declare const manageExpiredToken: (apiCallParameters: ApiCallParameters | ApiCallParametersWithPagination, errorContext: ErrorContext, requestPlugins: RequestPlugin[] | undefined, requestOptions: RequestOptions) => Promise<RequestOptions>;
|
|
5
5
|
export declare function buildErrorContext(apiCallParameters: ApiCallParameters, origin: string | null): ErrorContext;
|
|
6
6
|
export declare function invalidateAndRegenerateJwt(requestPlugins: RequestPlugin[] | undefined, options: RequestOptions, errorContext: ErrorContext): Promise<RequestOptions>;
|
|
7
7
|
/**
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.reviveDates = exports.invalidateAndRegenerateJwt = exports.buildErrorContext = exports.manageExpiredToken = void 0;
|
|
4
4
|
const request_plugin_1 = require("../plugins/core/request-plugin");
|
|
5
5
|
const api_errors_1 = require("../api/api-errors");
|
|
6
|
-
const manageExpiredToken = async (apiCallParameters, errorContext, requestPlugins, requestOptions
|
|
6
|
+
const manageExpiredToken = async (apiCallParameters, errorContext, requestPlugins, requestOptions) => {
|
|
7
7
|
// Use the circuitBreaker variable to try to regenerate a valid JWT only 3 times
|
|
8
8
|
if (!apiCallParameters.circuitBreaker) {
|
|
9
9
|
apiCallParameters.circuitBreaker = 1;
|
|
@@ -15,12 +15,7 @@ const manageExpiredToken = async (apiCallParameters, errorContext, requestPlugin
|
|
|
15
15
|
throw new api_errors_1.GenericError('Tried to generate a new JWT with no success', errorContext);
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
|
-
|
|
19
|
-
const newApiCallParameters = {
|
|
20
|
-
...apiCallParameters,
|
|
21
|
-
requestOptions: optionsWithNewJwt,
|
|
22
|
-
};
|
|
23
|
-
return callback(newApiCallParameters);
|
|
18
|
+
return await invalidateAndRegenerateJwt(requestPlugins, requestOptions, errorContext);
|
|
24
19
|
};
|
|
25
20
|
exports.manageExpiredToken = manageExpiredToken;
|
|
26
21
|
function buildErrorContext(apiCallParameters, origin) {
|
|
@@ -66,7 +61,7 @@ const reviveDates = (input) => {
|
|
|
66
61
|
}
|
|
67
62
|
else if (isDateString(input)) {
|
|
68
63
|
// Convert string date to Date object
|
|
69
|
-
return new Date(input);
|
|
64
|
+
return new Date(addTimezoneIfMissing(input));
|
|
70
65
|
}
|
|
71
66
|
else {
|
|
72
67
|
// Return other types as-is
|
|
@@ -81,4 +76,19 @@ const isDateString = (value) => {
|
|
|
81
76
|
}
|
|
82
77
|
return false;
|
|
83
78
|
};
|
|
79
|
+
const addTimezoneIfMissing = (timestampValue) => {
|
|
80
|
+
// Check the formats +XX:XX, +XX, +XXXX and Z
|
|
81
|
+
const timeZoneRegex = /([+-]\d{2}(:\d{2})|[+-]\d{4}|Z)$/;
|
|
82
|
+
if (!timeZoneRegex.test(timestampValue)) {
|
|
83
|
+
const hourMinutesTimezoneRegex = /([+-]\d{2})$/;
|
|
84
|
+
// A timestamp with no minutes in the timezone cannot be converted into a Date => assume it's :00
|
|
85
|
+
if (hourMinutesTimezoneRegex.test(timestampValue)) {
|
|
86
|
+
timestampValue = timestampValue + ':00';
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
timestampValue = timestampValue + 'Z';
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
return timestampValue;
|
|
93
|
+
};
|
|
84
94
|
//# sourceMappingURL=api-client-helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client-helpers.js","sourceRoot":"","sources":["../../src/client/api-client-helpers.ts"],"names":[],"mappings":";;;AAAA,mEAIwC;AAExC,kDAA+D;AAExD,MAAM,kBAAkB,GAAG,KAAK,EACrC,iBAAsE,EACtE,YAA0B,EAC1B,cAA2C,EAC3C,cAA8B,
|
|
1
|
+
{"version":3,"file":"api-client-helpers.js","sourceRoot":"","sources":["../../src/client/api-client-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,14 @@ class SinchIterator {
|
|
|
38
38
|
};
|
|
39
39
|
return updateQueryParamsAndSendRequest(this.apiClient, newParams, requestOptions, this.paginatedOperationProperties);
|
|
40
40
|
}
|
|
41
|
+
if (this.paginatedOperationProperties.pagination === api_client_1.PaginationEnum.TOKEN2) {
|
|
42
|
+
const newParams = {
|
|
43
|
+
page_token: pageResult.nextPageValue,
|
|
44
|
+
};
|
|
45
|
+
return updateQueryParamsAndSendRequest(this.apiClient, newParams, requestOptions, this.paginatedOperationProperties);
|
|
46
|
+
}
|
|
41
47
|
if (this.paginatedOperationProperties.pagination === api_client_1.PaginationEnum.PAGE
|
|
48
|
+
|| this.paginatedOperationProperties.pagination === api_client_1.PaginationEnum.PAGE2
|
|
42
49
|
|| this.paginatedOperationProperties.pagination === api_client_1.PaginationEnum.PAGE3) {
|
|
43
50
|
const newParams = {
|
|
44
51
|
page: pageResult.nextPageValue,
|
|
@@ -91,6 +98,11 @@ const createNextPageMethod = (apiClient, context, requestOptions, nextPageValue)
|
|
|
91
98
|
pageToken: nextPageValue,
|
|
92
99
|
};
|
|
93
100
|
break;
|
|
101
|
+
case api_client_1.PaginationEnum.TOKEN2:
|
|
102
|
+
newParams = {
|
|
103
|
+
page_token: nextPageValue,
|
|
104
|
+
};
|
|
105
|
+
break;
|
|
94
106
|
case api_client_1.PaginationEnum.PAGE:
|
|
95
107
|
case api_client_1.PaginationEnum.PAGE2:
|
|
96
108
|
case api_client_1.PaginationEnum.PAGE3:
|
|
@@ -112,7 +124,10 @@ const createNextPageMethod = (apiClient, context, requestOptions, nextPageValue)
|
|
|
112
124
|
exports.createNextPageMethod = createNextPageMethod;
|
|
113
125
|
function hasMore(response, context) {
|
|
114
126
|
if (context.pagination === api_client_1.PaginationEnum.TOKEN) {
|
|
115
|
-
return !!response['nextPageToken']
|
|
127
|
+
return !!response['nextPageToken'];
|
|
128
|
+
}
|
|
129
|
+
if (context.pagination === api_client_1.PaginationEnum.TOKEN2) {
|
|
130
|
+
return !!response['next_page_token'];
|
|
116
131
|
}
|
|
117
132
|
if (context.pagination === api_client_1.PaginationEnum.PAGE) {
|
|
118
133
|
const requestedPageSize = context.requestOptions.queryParams?.page_size;
|
|
@@ -132,7 +147,10 @@ function hasMore(response, context) {
|
|
|
132
147
|
exports.hasMore = hasMore;
|
|
133
148
|
function calculateNextPage(response, context) {
|
|
134
149
|
if (context.pagination === api_client_1.PaginationEnum.TOKEN) {
|
|
135
|
-
return response['nextPageToken']
|
|
150
|
+
return response['nextPageToken'];
|
|
151
|
+
}
|
|
152
|
+
if (context.pagination === api_client_1.PaginationEnum.TOKEN2) {
|
|
153
|
+
return response['next_page_token'];
|
|
136
154
|
}
|
|
137
155
|
if (context.pagination === api_client_1.PaginationEnum.PAGE) {
|
|
138
156
|
const currentPage = response.page || 0;
|
|
@@ -190,7 +208,7 @@ const calculateLastPageValue = (response, pageSize, paginationType) => {
|
|
|
190
208
|
case api_client_1.PaginationEnum.PAGE:
|
|
191
209
|
return Math.ceil(response.count / pageSize) - 1;
|
|
192
210
|
case api_client_1.PaginationEnum.PAGE2:
|
|
193
|
-
return Math.ceil(response.totalItems / pageSize)
|
|
211
|
+
return Math.ceil(response.totalItems / pageSize);
|
|
194
212
|
}
|
|
195
213
|
};
|
|
196
214
|
const invalidatePaginationDataFromResponse = (response, paginationType) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client-pagination-helper.js","sourceRoot":"","sources":["../../src/client/api-client-pagination-helper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"api-client-pagination-helper.js","sourceRoot":"","sources":["../../src/client/api-client-pagination-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { ApiClient, ApiCallParameters, ApiCallParametersWithPagination, PageResult, FileBuffer } from '../api/api-client';
|
|
2
2
|
import { ApiClientOptions } from '../api/api-client-options';
|
|
3
|
-
import FormData = require('form-data');
|
|
4
3
|
/** Client to process the call to the API using Fetch API */
|
|
5
4
|
export declare class ApiFetchClient extends ApiClient {
|
|
6
5
|
/**
|
|
@@ -13,14 +12,10 @@ export declare class ApiFetchClient extends ApiClient {
|
|
|
13
12
|
constructor(options: ApiClientOptions);
|
|
14
13
|
/** @inheritdoc */
|
|
15
14
|
processCall<T>(props: ApiCallParameters): Promise<T>;
|
|
16
|
-
|
|
17
|
-
processCallWithPagination<T>(props: ApiCallParametersWithPagination): Promise<PageResult<T>>;
|
|
18
|
-
private sinchFetchWithPagination;
|
|
15
|
+
processCallWithPagination<T>(apiCallParameters: ApiCallParametersWithPagination): Promise<PageResult<T>>;
|
|
19
16
|
private buildFetchError;
|
|
20
17
|
private loadResponsePlugins;
|
|
21
18
|
/** @inheritdoc */
|
|
22
19
|
processFileCall(props: ApiCallParameters): Promise<FileBuffer>;
|
|
23
20
|
private extractFileName;
|
|
24
|
-
/** @inheritDoc */
|
|
25
|
-
processFormData(data: any, type: string): FormData | string;
|
|
26
21
|
}
|
|
@@ -6,11 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.ApiFetchClient = void 0;
|
|
7
7
|
const version_1 = require("../plugins/version");
|
|
8
8
|
const exception_1 = require("../plugins/exception");
|
|
9
|
-
const timezone_1 = require("../plugins/timezone");
|
|
10
9
|
const api_client_1 = require("../api/api-client");
|
|
11
10
|
const api_errors_1 = require("../api/api-errors");
|
|
12
11
|
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
13
|
-
const FormData = require("form-data");
|
|
14
12
|
const api_client_helpers_1 = require("./api-client-helpers");
|
|
15
13
|
const api_client_pagination_helper_1 = require("./api-client-pagination-helper");
|
|
16
14
|
/** Client to process the call to the API using Fetch API */
|
|
@@ -27,7 +25,6 @@ class ApiFetchClient extends api_client_1.ApiClient {
|
|
|
27
25
|
...options,
|
|
28
26
|
requestPlugins: [new version_1.VersionRequest(), ...(options.requestPlugins || [])],
|
|
29
27
|
responsePlugins: [
|
|
30
|
-
new timezone_1.TimezoneResponse(),
|
|
31
28
|
new exception_1.ExceptionResponse(),
|
|
32
29
|
...(options.responsePlugins || []),
|
|
33
30
|
],
|
|
@@ -44,8 +41,12 @@ class ApiFetchClient extends api_client_1.ApiClient {
|
|
|
44
41
|
let exception;
|
|
45
42
|
// Execute call
|
|
46
43
|
try {
|
|
47
|
-
|
|
48
|
-
response
|
|
44
|
+
response = await (0, node_fetch_1.default)(props.url, props.requestOptions);
|
|
45
|
+
if (response.status === 401
|
|
46
|
+
&& response.headers.get('www-authenticate')?.includes('expired')) {
|
|
47
|
+
const requestOptions = await (0, api_client_helpers_1.manageExpiredToken)(props, errorContext, this.apiClientOptions.requestPlugins, props.requestOptions);
|
|
48
|
+
response = await (0, node_fetch_1.default)(props.url, requestOptions);
|
|
49
|
+
}
|
|
49
50
|
body = await response.text();
|
|
50
51
|
}
|
|
51
52
|
catch (error) {
|
|
@@ -72,28 +73,17 @@ class ApiFetchClient extends api_client_1.ApiClient {
|
|
|
72
73
|
// If everything went fine, we apply a last transformation to revive the dates, and we return the transformed API response
|
|
73
74
|
return (0, api_client_helpers_1.reviveDates)(transformedResponse);
|
|
74
75
|
}
|
|
75
|
-
async
|
|
76
|
-
const response = await (0, node_fetch_1.default)(apiCallParameters.url, apiCallParameters.requestOptions);
|
|
77
|
-
if (response.status === 401
|
|
78
|
-
&& response.headers.get('www-authenticate')?.includes('expired')) {
|
|
79
|
-
return (0, api_client_helpers_1.manageExpiredToken)(apiCallParameters, errorContext, this.apiClientOptions.requestPlugins, apiCallParameters.requestOptions, this.processCall);
|
|
80
|
-
}
|
|
81
|
-
return response;
|
|
82
|
-
}
|
|
83
|
-
processCallWithPagination(props) {
|
|
76
|
+
async processCallWithPagination(apiCallParameters) {
|
|
84
77
|
// Read the "Origin" header if existing, for logging purposes
|
|
85
|
-
const origin =
|
|
86
|
-
const errorContext = (0, api_client_helpers_1.buildErrorContext)(
|
|
87
|
-
// Execute call
|
|
88
|
-
return this.sinchFetchWithPagination(props, errorContext, origin);
|
|
89
|
-
}
|
|
90
|
-
;
|
|
91
|
-
async sinchFetchWithPagination(apiCallParameters, errorContext, origin) {
|
|
78
|
+
const origin = apiCallParameters.requestOptions.headers.get('Origin');
|
|
79
|
+
const errorContext = (0, api_client_helpers_1.buildErrorContext)(apiCallParameters, origin);
|
|
92
80
|
let exception;
|
|
93
|
-
|
|
81
|
+
// Execute call
|
|
82
|
+
let response = await (0, node_fetch_1.default)(apiCallParameters.url, apiCallParameters.requestOptions);
|
|
94
83
|
if (response.status === 401
|
|
95
84
|
&& response.headers.get('www-authenticate')?.includes('expired')) {
|
|
96
|
-
|
|
85
|
+
const requestOptions = await (0, api_client_helpers_1.manageExpiredToken)(apiCallParameters, errorContext, this.apiClientOptions.requestPlugins, apiCallParameters.requestOptions);
|
|
86
|
+
response = await (0, node_fetch_1.default)(apiCallParameters.url, requestOptions);
|
|
97
87
|
}
|
|
98
88
|
// When handling pagination, we won't return the raw response but a PageResult
|
|
99
89
|
const body = await response.text();
|
|
@@ -128,6 +118,7 @@ class ApiFetchClient extends api_client_1.ApiClient {
|
|
|
128
118
|
nextPage: () => (0, api_client_pagination_helper_1.createNextPageMethod)(this, (0, api_client_pagination_helper_1.buildPaginationContext)(apiCallParameters), apiCallParameters.requestOptions, nextPage),
|
|
129
119
|
};
|
|
130
120
|
}
|
|
121
|
+
;
|
|
131
122
|
buildFetchError(error, errorContext) {
|
|
132
123
|
if (error instanceof api_errors_1.GenericError) {
|
|
133
124
|
return new api_errors_1.GenericError(error.message, errorContext);
|
|
@@ -161,7 +152,12 @@ class ApiFetchClient extends api_client_1.ApiClient {
|
|
|
161
152
|
// Execute call
|
|
162
153
|
try {
|
|
163
154
|
// Send the request with the refresh token mechanism
|
|
164
|
-
response = await
|
|
155
|
+
response = await (0, node_fetch_1.default)(props.url, props.requestOptions);
|
|
156
|
+
if (response.status === 401
|
|
157
|
+
&& response.headers.get('www-authenticate')?.includes('expired')) {
|
|
158
|
+
const requestOptions = await (0, api_client_helpers_1.manageExpiredToken)(props, errorContext, this.apiClientOptions.requestPlugins, props.requestOptions);
|
|
159
|
+
response = await (0, node_fetch_1.default)(props.url, requestOptions);
|
|
160
|
+
}
|
|
165
161
|
body = await response.buffer();
|
|
166
162
|
fileName = this.extractFileName(response.headers);
|
|
167
163
|
}
|
|
@@ -187,29 +183,6 @@ class ApiFetchClient extends api_client_1.ApiClient {
|
|
|
187
183
|
}
|
|
188
184
|
return fileName;
|
|
189
185
|
}
|
|
190
|
-
/** @inheritDoc */
|
|
191
|
-
processFormData(data, type) {
|
|
192
|
-
let encodedData;
|
|
193
|
-
if (type === 'multipart/form-data') {
|
|
194
|
-
const formData = new FormData();
|
|
195
|
-
for (const key in data) {
|
|
196
|
-
if (Object.prototype.hasOwnProperty.call(data, key)) {
|
|
197
|
-
formData.append(key, data[key]);
|
|
198
|
-
}
|
|
199
|
-
}
|
|
200
|
-
encodedData = formData;
|
|
201
|
-
}
|
|
202
|
-
else {
|
|
203
|
-
const formData = [];
|
|
204
|
-
for (const key in data) {
|
|
205
|
-
if (Object.prototype.hasOwnProperty.call(data, key)) {
|
|
206
|
-
formData.push(`${key}=${encodeURIComponent(data[key])}`);
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
encodedData = formData.join('&');
|
|
210
|
-
}
|
|
211
|
-
return encodedData;
|
|
212
|
-
}
|
|
213
186
|
}
|
|
214
187
|
exports.ApiFetchClient = ApiFetchClient;
|
|
215
188
|
//# sourceMappingURL=api-fetch-client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-fetch-client.js","sourceRoot":"","sources":["../../src/client/api-fetch-client.ts"],"names":[],"mappings":";;;;;;AACA,gDAAoD;AACpD,oDAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"api-fetch-client.js","sourceRoot":"","sources":["../../src/client/api-fetch-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ export interface UnifiedCredentials {
|
|
|
18
18
|
keySecret: string;
|
|
19
19
|
/** The region for the SMS API. Default region is US */
|
|
20
20
|
smsRegion?: SmsRegion;
|
|
21
|
-
/** boolean to force the usage of the OAuth2 authentication for the SMS API - to be used when a region other of US and EU supports OAuth2 but the SDK doesn't by default */
|
|
21
|
+
/** @deprecated boolean to force the usage of the OAuth2 authentication for the SMS API - to be used when a region other of US and EU supports OAuth2 but the SDK doesn't by default */
|
|
22
22
|
forceOAuth2ForSmsApi?: boolean;
|
|
23
23
|
/** The region for the Fax API. Default is auto-routing */
|
|
24
24
|
faxRegion?: FaxRegion;
|
|
@@ -30,7 +30,7 @@ export interface ServicePlanIdCredentials {
|
|
|
30
30
|
servicePlanId: string;
|
|
31
31
|
/** Your API token. You can find this on your [Dashboard](https://dashboard.sinch.com/sms/api/rest). */
|
|
32
32
|
apiToken: string;
|
|
33
|
-
/** boolean to force the usage of the service plan Id + API token as credentials for the SMS API */
|
|
33
|
+
/** @deprecated boolean to force the usage of the service plan Id + API token as credentials for the SMS API */
|
|
34
34
|
forceServicePlanIdUsageForSmsApi?: boolean;
|
|
35
35
|
/** The region for the SMS API. Default region is US */
|
|
36
36
|
smsRegion?: SmsRegion;
|
|
@@ -35,7 +35,9 @@ class ExceptionResponse {
|
|
|
35
35
|
}
|
|
36
36
|
else if (!res) {
|
|
37
37
|
res = {};
|
|
38
|
-
if (context.response.status !== 204
|
|
38
|
+
if (context.response.status !== 204
|
|
39
|
+
&& context.response.status !== 200
|
|
40
|
+
&& context.response.status !== 202) {
|
|
39
41
|
res = {};
|
|
40
42
|
error = new api_errors_1.EmptyResponseError(context.response.statusText, errorContext, res);
|
|
41
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exception.response.js","sourceRoot":"","sources":["../../../src/plugins/exception/exception.response.ts"],"names":[],"mappings":";;;AAAA,qDAA8E;AAI9E;;GAEG;AACH,MAAa,iBAAiB;IAI9B;;;;OAIG;IACD,YAAoB,QAAkD;QAAlD,aAAQ,GAAR,QAAQ,CAA0C;IAAG,CAAC;IAEnE,IAAI,CACT,OAA8B;QAE9B,OAAO;YACL,SAAS,EAAE,CAAC,GAAM,EAAE,EAAE;gBACpB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;oBACtB,OAAO,GAAG,CAAC;gBACb,CAAC;gBAED,MAAM,YAAY,GAAG;oBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,MAAM,EAAE,OAAO,CAAC,MAAM;iBACvB,CAAC;gBACF,IAAI,KAAwB,CAAC;gBAE7B,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;oBACtB,KAAK,GAAG,IAAI,+BAAkB,CAC5B,eAAe,EACf,YAAY,EACZ,SAAS,CACV,CAAC;gBACJ,CAAC;qBAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;oBAChC,KAAK,GAAG,IAAI,+BAAkB,CAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,EAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,EACvB,YAAY,EACZ,GAAG,CACJ,CAAC;gBACJ,CAAC;qBAAM,IAAI,CAAC,GAAG,EAAE,CAAC;oBAChB,GAAG,GAAG,EAAO,CAAC;oBACd,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"exception.response.js","sourceRoot":"","sources":["../../../src/plugins/exception/exception.response.ts"],"names":[],"mappings":";;;AAAA,qDAA8E;AAI9E;;GAEG;AACH,MAAa,iBAAiB;IAI9B;;;;OAIG;IACD,YAAoB,QAAkD;QAAlD,aAAQ,GAAR,QAAQ,CAA0C;IAAG,CAAC;IAEnE,IAAI,CACT,OAA8B;QAE9B,OAAO;YACL,SAAS,EAAE,CAAC,GAAM,EAAE,EAAE;gBACpB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;oBACtB,OAAO,GAAG,CAAC;gBACb,CAAC;gBAED,MAAM,YAAY,GAAG;oBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,MAAM,EAAE,OAAO,CAAC,MAAM;iBACvB,CAAC;gBACF,IAAI,KAAwB,CAAC;gBAE7B,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;oBACtB,KAAK,GAAG,IAAI,+BAAkB,CAC5B,eAAe,EACf,YAAY,EACZ,SAAS,CACV,CAAC;gBACJ,CAAC;qBAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;oBAChC,KAAK,GAAG,IAAI,+BAAkB,CAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,EAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,EACvB,YAAY,EACZ,GAAG,CACJ,CAAC;gBACJ,CAAC;qBAAM,IAAI,CAAC,GAAG,EAAE,CAAC;oBAChB,GAAG,GAAG,EAAO,CAAC;oBACd,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG;2BAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG;2BAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAClC,CAAC;wBACD,GAAG,GAAG,EAAO,CAAC;wBACd,KAAK,GAAG,IAAI,+BAAkB,CAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,EAC3B,YAAY,EACZ,GAAG,CACJ,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAED,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;wBAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;oBACnC,CAAC;yBAAM,CAAC;wBACN,MAAM,KAAK,CAAC;oBACd,CAAC;gBACH,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC;SACF,CAAC;IACJ,CAAC;CACF;AAnED,8CAmEC"}
|
package/dist/plugins/index.d.ts
CHANGED
package/dist/plugins/index.js
CHANGED
|
@@ -21,7 +21,6 @@ __exportStar(require("./basicAuthentication"), exports);
|
|
|
21
21
|
__exportStar(require("./exception"), exports);
|
|
22
22
|
__exportStar(require("./oauth2"), exports);
|
|
23
23
|
__exportStar(require("./signing"), exports);
|
|
24
|
-
__exportStar(require("./timezone"), exports);
|
|
25
24
|
__exportStar(require("./version"), exports);
|
|
26
25
|
__exportStar(require("./x-timestamp"), exports);
|
|
27
26
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,uDAAqC;AACrC,8CAA4B;AAC5B,wDAAsC;AACtC,8CAA4B;AAC5B,2CAAyB;AACzB,4CAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,uDAAqC;AACrC,8CAA4B;AAC5B,wDAAsC;AACtC,8CAA4B;AAC5B,2CAAyB;AACzB,4CAA0B;AAC1B,4CAA0B;AAC1B,gDAA8B"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export interface DateFormat {
|
|
2
|
+
date: Date;
|
|
3
|
+
unit?: ChronoUnit;
|
|
4
|
+
}
|
|
5
|
+
export type ChronoUnit = 'year' | 'month' | 'day' | 'hour' | 'minute' | 'second';
|
|
6
|
+
export declare const formatDate: (date: Date, unit?: ChronoUnit) => string;
|
|
7
|
+
export declare const formatCreateTimeFilter: (createTime: string | Date | undefined) => string | undefined;
|
|
8
|
+
export declare const formatCreateTimeRangeFilter: (timeBoundary: string | Date | DateFormat | undefined) => string | undefined;
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatCreateTimeRangeFilter = exports.formatCreateTimeFilter = exports.formatDate = void 0;
|
|
4
|
+
const formatDate = (date, unit) => {
|
|
5
|
+
const year = date.getUTCFullYear();
|
|
6
|
+
const month = String(date.getUTCMonth() + 1).padStart(2, '0');
|
|
7
|
+
const day = String(date.getUTCDate()).padStart(2, '0');
|
|
8
|
+
const hours = String(date.getUTCHours()).padStart(2, '0');
|
|
9
|
+
const minutes = String(date.getUTCMinutes()).padStart(2, '0');
|
|
10
|
+
const seconds = String(date.getUTCSeconds()).padStart(2, '0');
|
|
11
|
+
switch (unit) {
|
|
12
|
+
case 'year':
|
|
13
|
+
return `${year}`;
|
|
14
|
+
case 'month':
|
|
15
|
+
return `${year}-${month}`;
|
|
16
|
+
case 'day':
|
|
17
|
+
return `${year}-${month}-${day}`;
|
|
18
|
+
case 'hour':
|
|
19
|
+
return `${year}-${month}-${day}T${hours}:00:00Z`;
|
|
20
|
+
case 'minute':
|
|
21
|
+
return `${year}-${month}-${day}T${hours}:${minutes}:00Z`;
|
|
22
|
+
case 'second':
|
|
23
|
+
default:
|
|
24
|
+
return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}Z`;
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
exports.formatDate = formatDate;
|
|
28
|
+
const formatCreateTimeFilter = (createTime) => {
|
|
29
|
+
if (createTime !== undefined) {
|
|
30
|
+
if (typeof createTime === 'string') {
|
|
31
|
+
if (createTime.indexOf('T') > -1) {
|
|
32
|
+
return createTime.substring(0, createTime.indexOf('T'));
|
|
33
|
+
}
|
|
34
|
+
return createTime;
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
return (0, exports.formatDate)(createTime, 'day');
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
return undefined;
|
|
41
|
+
};
|
|
42
|
+
exports.formatCreateTimeFilter = formatCreateTimeFilter;
|
|
43
|
+
const formatCreateTimeRangeFilter = (timeBoundary) => {
|
|
44
|
+
if (timeBoundary !== undefined) {
|
|
45
|
+
if (typeof timeBoundary === 'string') {
|
|
46
|
+
return timeBoundary;
|
|
47
|
+
}
|
|
48
|
+
else if (timeBoundary instanceof Date) {
|
|
49
|
+
return (0, exports.formatDate)(timeBoundary);
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
return (0, exports.formatDate)(timeBoundary.date, timeBoundary.unit);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return undefined;
|
|
56
|
+
};
|
|
57
|
+
exports.formatCreateTimeRangeFilter = formatCreateTimeRangeFilter;
|
|
58
|
+
//# sourceMappingURL=date.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"date.js","sourceRoot":"","sources":["../../src/utils/date.ts"],"names":[],"mappings":";;;AAOO,MAAM,UAAU,GAAG,CAAC,IAAU,EAAE,IAAiB,EAAU,EAAE;IAClE,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC9D,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACvD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAE9D,QAAQ,IAAI,EAAE,CAAC;QACf,KAAK,MAAM;YACT,OAAO,GAAG,IAAI,EAAE,CAAC;QACnB,KAAK,OAAO;YACV,OAAO,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;QAC5B,KAAK,KAAK;YACR,OAAO,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG,EAAE,CAAC;QACnC,KAAK,MAAM;YACT,OAAO,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG,IAAI,KAAK,SAAS,CAAC;QACnD,KAAK,QAAQ;YACX,OAAO,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG,IAAI,KAAK,IAAI,OAAO,MAAM,CAAC;QAC3D,KAAK,QAAQ,CAAC;QACd;YACE,OAAO,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG,IAAI,KAAK,IAAI,OAAO,IAAI,OAAO,GAAG,CAAC;IACnE,CAAC;AACH,CAAC,CAAC;AAvBW,QAAA,UAAU,cAuBrB;AAEK,MAAM,sBAAsB,GAAG,CAAC,UAAqC,EAAsB,EAAE;IAClG,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnC,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBACjC,OAAO,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1D,CAAC;YACD,OAAO,UAAU,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAZW,QAAA,sBAAsB,0BAYjC;AAEK,MAAM,2BAA2B,GAAG,CACzC,YAAoD,EAChC,EAAE;IACtB,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;YACrC,OAAO,YAAY,CAAC;QACtB,CAAC;aAAM,IAAI,YAAY,YAAY,IAAI,EAAE,CAAC;YACxC,OAAO,IAAA,kBAAU,EAAC,YAAY,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,OAAO,IAAA,kBAAU,EAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAbW,QAAA,2BAA2B,+BAatC"}
|
package/dist/utils/index.d.ts
CHANGED
package/dist/utils/index.js
CHANGED
|
@@ -15,5 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./authorization.helper"), exports);
|
|
18
|
+
__exportStar(require("./date"), exports);
|
|
18
19
|
__exportStar(require("./text-to-hex"), exports);
|
|
19
20
|
//# sourceMappingURL=index.js.map
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,gDAA8B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,yCAAuB;AACvB,gDAA8B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sinch/sdk-client",
|
|
3
|
-
"version": "1.1
|
|
3
|
+
"version": "1.2.1",
|
|
4
4
|
"description": "Core services related to interacting with Sinch API",
|
|
5
5
|
"homepage": "",
|
|
6
6
|
"repository": {
|
|
@@ -38,6 +38,7 @@
|
|
|
38
38
|
"typescript": "^5.2.2"
|
|
39
39
|
},
|
|
40
40
|
"publishConfig": {
|
|
41
|
-
"directory": "dist"
|
|
41
|
+
"directory": "dist",
|
|
42
|
+
"access": "public"
|
|
42
43
|
}
|
|
43
44
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export * from './timezone.response';
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./timezone.response"), exports);
|
|
18
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/timezone/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC"}
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
import { ResponsePlugin, ResponsePluginContext } from '../core/response-plugin';
|
|
2
|
-
import { PluginRunner } from '../core';
|
|
3
|
-
export declare class TimezoneResponse<V extends Record<string, any> | undefined = Record<string, any>> implements ResponsePlugin<V | Record<string, any>> {
|
|
4
|
-
load(context: ResponsePluginContext): PluginRunner<V | Record<string, unknown>, V>;
|
|
5
|
-
}
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.TimezoneResponse = void 0;
|
|
4
|
-
const buggyOperationIds = [
|
|
5
|
-
'GetCallResult',
|
|
6
|
-
'VerificationStatusById',
|
|
7
|
-
'VerificationStatusByIdentity',
|
|
8
|
-
'VerificationStatusByReference',
|
|
9
|
-
];
|
|
10
|
-
const buggyFields = {
|
|
11
|
-
'GetCallResult': 'timestamp',
|
|
12
|
-
'VerificationStatusById': 'verificationTimestamp',
|
|
13
|
-
'VerificationStatusByIdentity': 'verificationTimestamp',
|
|
14
|
-
'VerificationStatusByReference': 'verificationTimestamp',
|
|
15
|
-
};
|
|
16
|
-
class TimezoneResponse {
|
|
17
|
-
load(context) {
|
|
18
|
-
return {
|
|
19
|
-
transform(res) {
|
|
20
|
-
// HACK to fix a server-side bug: the timestamp is returned without the timezone
|
|
21
|
-
if (res && buggyOperationIds.includes(context.operationId)) {
|
|
22
|
-
for (const key in res) {
|
|
23
|
-
if (Object.prototype.hasOwnProperty.call(res, key)) {
|
|
24
|
-
const buggyKey = buggyFields[context.operationId];
|
|
25
|
-
if (key === buggyKey && typeof res[buggyKey] === 'string') {
|
|
26
|
-
let timestampValue = res[key];
|
|
27
|
-
// Check the formats +XX:XX, +XX and Z
|
|
28
|
-
const timeZoneRegex = /([+-]\d{2}(:\d{2})|Z)$/;
|
|
29
|
-
if (!timeZoneRegex.test(timestampValue)) {
|
|
30
|
-
const hourMinutesTimezoneRegex = /([+-]\d{2})$/;
|
|
31
|
-
// A timestamp with no minutes in the timezone cannot be converted into a Date => assume it's :00
|
|
32
|
-
if (hourMinutesTimezoneRegex.test(timestampValue)) {
|
|
33
|
-
timestampValue = timestampValue + ':00';
|
|
34
|
-
}
|
|
35
|
-
else {
|
|
36
|
-
timestampValue = timestampValue + 'Z';
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
res[key] = timestampValue;
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
return res;
|
|
45
|
-
},
|
|
46
|
-
};
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
exports.TimezoneResponse = TimezoneResponse;
|
|
50
|
-
//# sourceMappingURL=timezone.response.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"timezone.response.js","sourceRoot":"","sources":["../../../src/plugins/timezone/timezone.response.ts"],"names":[],"mappings":";;;AAGA,MAAM,iBAAiB,GAAa;IAClC,eAAe;IACf,wBAAwB;IACxB,8BAA8B;IAC9B,+BAA+B;CAChC,CAAC;AAEF,MAAM,WAAW,GAA4B;IAC3C,eAAe,EAAE,WAAW;IAC5B,wBAAwB,EAAE,uBAAuB;IACjD,8BAA8B,EAAE,uBAAuB;IACvD,+BAA+B,EAAE,uBAAuB;CACzD,CAAC;AAEF,MAAa,gBAAgB;IAGpB,IAAI,CACT,OAA8B;QAE9B,OAAO;YACL,SAAS,CAAC,GAAM;gBACd,gFAAgF;gBAChF,IAAI,GAAG,IAAI,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,EAAG,CAAC;oBAC5D,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;wBACtB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;4BACnD,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;4BAClD,IAAI,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE,CAAC;gCAC1D,IAAI,cAAc,GAAG,GAAG,CAAC,GAAG,CAAW,CAAC;gCACxC,sCAAsC;gCACtC,MAAM,aAAa,GAAG,wBAAwB,CAAC;gCAC/C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;oCACxC,MAAM,wBAAwB,GAAG,cAAc,CAAC;oCAChD,iGAAiG;oCACjG,IAAI,wBAAwB,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;wCAClD,cAAc,GAAG,cAAc,GAAG,KAAK,CAAC;oCAC1C,CAAC;yCAAM,CAAC;wCACN,cAAc,GAAG,cAAc,GAAG,GAAG,CAAC;oCACxC,CAAC;gCACH,CAAC;gCACD,GAAG,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC;4BAC5B,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC;SACF,CAAC;IACJ,CAAC;CAEF;AApCD,4CAoCC"}
|