@emilgroup/payment-sdk 1.22.1-beta.73 → 1.22.1-beta.74
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/.openapi-generator/FILES +0 -4
- package/README.md +2 -2
- package/api/bank-accounts-api.ts +12 -24
- package/api/bank-orders-api.ts +10 -20
- package/api/bank-transaction-api.ts +20 -154
- package/api/billing-addresses-api.ts +10 -20
- package/api/credit-allocation-api.ts +6 -12
- package/api/exceeding-credits-api.ts +6 -12
- package/api/ibanvalidator-api.ts +2 -4
- package/api/payment-methods-api.ts +6 -12
- package/api/payment-receipts-api.ts +10 -20
- package/api/payment-reminders-api.ts +8 -16
- package/api/payment-requests-api.ts +10 -20
- package/api/payment-setup-api.ts +4 -8
- package/api/payments-api.ts +12 -24
- package/api/payout-methods-api.ts +12 -24
- package/api/policy-payment-methods-api.ts +6 -12
- package/api/refunds-api.ts +6 -12
- package/api/tenant-bank-account-api.ts +10 -20
- package/base.ts +41 -174
- package/common.ts +2 -3
- package/configuration.ts +0 -20
- package/dist/api/bank-accounts-api.d.ts +6 -6
- package/dist/api/bank-accounts-api.js +22 -36
- package/dist/api/bank-orders-api.d.ts +5 -5
- package/dist/api/bank-orders-api.js +18 -29
- package/dist/api/bank-transaction-api.d.ts +14 -80
- package/dist/api/bank-transaction-api.js +28 -144
- package/dist/api/billing-addresses-api.d.ts +5 -5
- package/dist/api/billing-addresses-api.js +19 -32
- package/dist/api/credit-allocation-api.d.ts +3 -3
- package/dist/api/credit-allocation-api.js +11 -18
- package/dist/api/exceeding-credits-api.d.ts +3 -3
- package/dist/api/exceeding-credits-api.js +11 -18
- package/dist/api/health-check-api.d.ts +1 -1
- package/dist/api/ibanvalidator-api.d.ts +1 -1
- package/dist/api/ibanvalidator-api.js +4 -7
- package/dist/api/payment-methods-api.d.ts +3 -3
- package/dist/api/payment-methods-api.js +11 -18
- package/dist/api/payment-receipts-api.d.ts +5 -5
- package/dist/api/payment-receipts-api.js +18 -29
- package/dist/api/payment-reminders-api.d.ts +4 -4
- package/dist/api/payment-reminders-api.js +15 -25
- package/dist/api/payment-requests-api.d.ts +5 -5
- package/dist/api/payment-requests-api.js +18 -29
- package/dist/api/payment-setup-api.d.ts +2 -2
- package/dist/api/payment-setup-api.js +8 -14
- package/dist/api/payments-api.d.ts +4 -4
- package/dist/api/payments-api.js +18 -28
- package/dist/api/payout-methods-api.d.ts +6 -6
- package/dist/api/payout-methods-api.js +22 -36
- package/dist/api/policy-payment-methods-api.d.ts +3 -3
- package/dist/api/policy-payment-methods-api.js +11 -18
- package/dist/api/refunds-api.d.ts +3 -3
- package/dist/api/refunds-api.js +10 -15
- package/dist/api/tenant-bank-account-api.d.ts +5 -5
- package/dist/api/tenant-bank-account-api.js +18 -29
- package/dist/api/webhooks-api.d.ts +2 -2
- package/dist/base.d.ts +0 -24
- package/dist/base.js +59 -178
- package/dist/common.d.ts +1 -1
- package/dist/common.js +0 -1
- package/dist/configuration.d.ts +0 -17
- package/dist/configuration.js +0 -2
- package/dist/models/bank-transaction-class.d.ts +0 -7
- package/dist/models/bank-transaction-entity.d.ts +0 -7
- package/dist/models/index.d.ts +0 -4
- package/dist/models/index.js +0 -4
- package/dist/models/payment-receipt-class.d.ts +0 -12
- package/dist/models/payment-request-class.d.ts +0 -1
- package/dist/models/payment-request-class.js +0 -1
- package/models/bank-transaction-class.ts +0 -7
- package/models/bank-transaction-entity.ts +0 -7
- package/models/index.ts +0 -4
- package/models/payment-receipt-class.ts +0 -12
- package/models/payment-request-class.ts +0 -1
- package/package.json +2 -2
- package/dist/models/link-bank-transaction-payment-requests-request-dto-rest.d.ts +0 -30
- package/dist/models/link-bank-transaction-payment-requests-request-dto-rest.js +0 -15
- package/dist/models/link-bank-transaction-payment-requests-response-class.d.ts +0 -25
- package/dist/models/link-bank-transaction-payment-requests-response-class.js +0 -15
- package/dist/models/payment-receipt-entity.d.ts +0 -139
- package/dist/models/payment-receipt-entity.js +0 -20
- package/dist/models/payment-request-entity.d.ts +0 -223
- package/dist/models/payment-request-entity.js +0 -39
- package/models/link-bank-transaction-payment-requests-request-dto-rest.ts +0 -36
- package/models/link-bank-transaction-payment-requests-response-class.ts +0 -31
- package/models/payment-receipt-entity.ts +0 -148
- package/models/payment-request-entity.ts +0 -233
|
@@ -67,10 +67,8 @@ export const TenantBankAccountApiAxiosParamCreator = function (configuration?: C
|
|
|
67
67
|
// http bearer authentication required
|
|
68
68
|
await setBearerAuthToObject(localVarHeaderParameter, configuration)
|
|
69
69
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
if (authorizationValue) {
|
|
73
|
-
localVarHeaderParameter['Authorization'] = String(authorizationValue);
|
|
70
|
+
if (authorization !== undefined && authorization !== null || baseAccessToken !== undefined && baseAccessToken !== null) {
|
|
71
|
+
localVarHeaderParameter['Authorization'] = String(authorization ? authorization : baseAccessToken);
|
|
74
72
|
}
|
|
75
73
|
|
|
76
74
|
|
|
@@ -117,10 +115,8 @@ export const TenantBankAccountApiAxiosParamCreator = function (configuration?: C
|
|
|
117
115
|
// http bearer authentication required
|
|
118
116
|
await setBearerAuthToObject(localVarHeaderParameter, configuration)
|
|
119
117
|
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
if (authorizationValue) {
|
|
123
|
-
localVarHeaderParameter['Authorization'] = String(authorizationValue);
|
|
118
|
+
if (authorization !== undefined && authorization !== null || baseAccessToken !== undefined && baseAccessToken !== null) {
|
|
119
|
+
localVarHeaderParameter['Authorization'] = String(authorization ? authorization : baseAccessToken);
|
|
124
120
|
}
|
|
125
121
|
|
|
126
122
|
|
|
@@ -169,10 +165,8 @@ export const TenantBankAccountApiAxiosParamCreator = function (configuration?: C
|
|
|
169
165
|
localVarQueryParameter['expand'] = expand;
|
|
170
166
|
}
|
|
171
167
|
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
if (authorizationValue) {
|
|
175
|
-
localVarHeaderParameter['Authorization'] = String(authorizationValue);
|
|
168
|
+
if (authorization !== undefined && authorization !== null || baseAccessToken !== undefined && baseAccessToken !== null) {
|
|
169
|
+
localVarHeaderParameter['Authorization'] = String(authorization ? authorization : baseAccessToken);
|
|
176
170
|
}
|
|
177
171
|
|
|
178
172
|
|
|
@@ -247,10 +241,8 @@ export const TenantBankAccountApiAxiosParamCreator = function (configuration?: C
|
|
|
247
241
|
localVarQueryParameter['filters'] = filters;
|
|
248
242
|
}
|
|
249
243
|
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
if (authorizationValue) {
|
|
253
|
-
localVarHeaderParameter['Authorization'] = String(authorizationValue);
|
|
244
|
+
if (authorization !== undefined && authorization !== null || baseAccessToken !== undefined && baseAccessToken !== null) {
|
|
245
|
+
localVarHeaderParameter['Authorization'] = String(authorization ? authorization : baseAccessToken);
|
|
254
246
|
}
|
|
255
247
|
|
|
256
248
|
|
|
@@ -297,10 +289,8 @@ export const TenantBankAccountApiAxiosParamCreator = function (configuration?: C
|
|
|
297
289
|
// http bearer authentication required
|
|
298
290
|
await setBearerAuthToObject(localVarHeaderParameter, configuration)
|
|
299
291
|
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
if (authorizationValue) {
|
|
303
|
-
localVarHeaderParameter['Authorization'] = String(authorizationValue);
|
|
292
|
+
if (authorization !== undefined && authorization !== null || baseAccessToken !== undefined && baseAccessToken !== null) {
|
|
293
|
+
localVarHeaderParameter['Authorization'] = String(authorization ? authorization : baseAccessToken);
|
|
304
294
|
}
|
|
305
295
|
|
|
306
296
|
|
package/base.ts
CHANGED
|
@@ -32,20 +32,9 @@ export const COLLECTION_FORMATS = {
|
|
|
32
32
|
pipes: "|",
|
|
33
33
|
};
|
|
34
34
|
|
|
35
|
-
export interface SessionClass {
|
|
36
|
-
sub: string;
|
|
37
|
-
username?: string;
|
|
38
|
-
email?: string;
|
|
39
|
-
tenantSlug?: string;
|
|
40
|
-
permissions?: string;
|
|
41
|
-
expiresAt?: number;
|
|
42
|
-
}
|
|
43
|
-
|
|
44
35
|
export interface LoginClass {
|
|
45
36
|
accessToken: string;
|
|
46
37
|
permissions: string;
|
|
47
|
-
authMode?: string;
|
|
48
|
-
session?: SessionClass;
|
|
49
38
|
}
|
|
50
39
|
|
|
51
40
|
export interface SwitchWorkspaceRequest {
|
|
@@ -56,8 +45,6 @@ export interface SwitchWorkspaceRequest {
|
|
|
56
45
|
export interface SwitchWorkspaceResponseClass {
|
|
57
46
|
accessToken: string;
|
|
58
47
|
permissions: string;
|
|
59
|
-
authMode?: string;
|
|
60
|
-
session?: SessionClass;
|
|
61
48
|
}
|
|
62
49
|
|
|
63
50
|
export enum Environment {
|
|
@@ -90,19 +77,10 @@ interface TokenData {
|
|
|
90
77
|
accessToken?: string;
|
|
91
78
|
username?: string;
|
|
92
79
|
permissions?: string;
|
|
93
|
-
// 'both' or 'session' when authservice keeps the tokens in a server session.
|
|
94
|
-
authMode?: string;
|
|
95
|
-
sub?: string;
|
|
96
80
|
}
|
|
97
81
|
|
|
98
82
|
const NETWORK_ERROR_MESSAGE = "Network Error";
|
|
99
83
|
const TOKEN_DATA = 'APP_TOKEN';
|
|
100
|
-
// Sent only to authservice, to ask for a server session.
|
|
101
|
-
const AUTH_MODE_HEADER = 'X-Emil-Auth-Mode';
|
|
102
|
-
// Names the account on every call; one browser session can hold several.
|
|
103
|
-
const ACCOUNT_HEADER = 'X-Emil-Account';
|
|
104
|
-
const SESSION_MODES = ['both', 'session'];
|
|
105
|
-
const RESEND_SAFE_METHODS = ['get', 'head', 'options'];
|
|
106
84
|
|
|
107
85
|
/**
|
|
108
86
|
*
|
|
@@ -124,18 +102,10 @@ export class BaseAPI {
|
|
|
124
102
|
this.configuration = configuration;
|
|
125
103
|
this.basePath = configuration.basePath || this.basePath;
|
|
126
104
|
|
|
127
|
-
if
|
|
128
|
-
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
if (this.usesSession()) {
|
|
132
|
-
this.useSessionAuth();
|
|
133
|
-
} else {
|
|
134
|
-
// Use config token if provided, otherwise use tokenData token
|
|
135
|
-
const configToken = this.configuration.accessToken;
|
|
136
|
-
const storedToken = accessToken ? `Bearer ${accessToken}` : '';
|
|
137
|
-
this.configuration.accessToken = configToken || storedToken;
|
|
138
|
-
}
|
|
105
|
+
// Use config token if provided, otherwise use tokenData token
|
|
106
|
+
const configToken = this.configuration.accessToken;
|
|
107
|
+
const storedToken = accessToken ? `Bearer ${accessToken}` : '';
|
|
108
|
+
this.configuration.accessToken = configToken || storedToken;
|
|
139
109
|
} else {
|
|
140
110
|
const { accessToken, username } = this.tokenData;
|
|
141
111
|
|
|
@@ -149,107 +119,6 @@ export class BaseAPI {
|
|
|
149
119
|
this.attachInterceptor(axios);
|
|
150
120
|
}
|
|
151
121
|
|
|
152
|
-
// The app's own account wins over APP_TOKEN, which holds whichever tab wrote last.
|
|
153
|
-
private sessionAccount(): string | undefined {
|
|
154
|
-
return this.configuration.account || this.tokenData.sub;
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
// Apps may pass the address as the second argument only; authservice is on the same host.
|
|
158
|
-
private authBasePath(): string {
|
|
159
|
-
return this.configuration.basePath || this.basePath;
|
|
160
|
-
}
|
|
161
|
-
|
|
162
|
-
private usesSession(): boolean {
|
|
163
|
-
return !!this.configuration.cookieAuth && SESSION_MODES.indexOf(this.tokenData.authMode) !== -1 && !!this.sessionAccount();
|
|
164
|
-
}
|
|
165
|
-
|
|
166
|
-
private useSessionAuth() {
|
|
167
|
-
const { headers, ...baseOptions } = this.configuration.baseOptions || {};
|
|
168
|
-
this.configuration.accessToken = '';
|
|
169
|
-
this.configuration.baseOptions = {
|
|
170
|
-
...baseOptions,
|
|
171
|
-
withCredentials: true,
|
|
172
|
-
headers: { ...headers, [ACCOUNT_HEADER]: this.sessionAccount() },
|
|
173
|
-
};
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
private useHeaderAuth(accessToken: string) {
|
|
177
|
-
this.configuration.accessToken = accessToken ? `Bearer ${accessToken}` : '';
|
|
178
|
-
this.tokenData.accessToken = accessToken;
|
|
179
|
-
delete this.tokenData.authMode;
|
|
180
|
-
delete this.tokenData.sub;
|
|
181
|
-
if (this.configuration.cookieAuth) {
|
|
182
|
-
const { withCredentials, headers, ...baseOptions } = this.configuration.baseOptions || {};
|
|
183
|
-
const { [ACCOUNT_HEADER]: account, ...otherHeaders } = headers || {};
|
|
184
|
-
this.configuration.baseOptions = { ...baseOptions, headers: otherHeaders };
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
private applyTokenReply({ accessToken, authMode, session }: LoginClass) {
|
|
189
|
-
if (this.configuration.cookieAuth && SESSION_MODES.indexOf(authMode) !== -1 && session?.sub) {
|
|
190
|
-
this.tokenData.authMode = authMode;
|
|
191
|
-
this.tokenData.sub = session.sub;
|
|
192
|
-
if (this.configuration.account) {
|
|
193
|
-
// A workspace switch moves the app to another account.
|
|
194
|
-
this.configuration.account = session.sub;
|
|
195
|
-
}
|
|
196
|
-
// Both keeps the token for apps not moved yet; session mode keeps no token at all.
|
|
197
|
-
if (authMode === 'both' && accessToken) {
|
|
198
|
-
this.tokenData.accessToken = accessToken;
|
|
199
|
-
} else {
|
|
200
|
-
delete this.tokenData.accessToken;
|
|
201
|
-
}
|
|
202
|
-
this.useSessionAuth();
|
|
203
|
-
} else {
|
|
204
|
-
this.useHeaderAuth(accessToken);
|
|
205
|
-
}
|
|
206
|
-
}
|
|
207
|
-
|
|
208
|
-
private sessionHeaders(): Record<string, string> {
|
|
209
|
-
if (!this.configuration.cookieAuth) {
|
|
210
|
-
return {};
|
|
211
|
-
}
|
|
212
|
-
return {
|
|
213
|
-
[AUTH_MODE_HEADER]: 'session',
|
|
214
|
-
...(this.usesSession() && { [ACCOUNT_HEADER]: this.sessionAccount() }),
|
|
215
|
-
};
|
|
216
|
-
}
|
|
217
|
-
|
|
218
|
-
private withCurrentAuth(config: AxiosRequestConfig): AxiosRequestConfig {
|
|
219
|
-
delete config.headers['Authorization'];
|
|
220
|
-
delete config.headers[ACCOUNT_HEADER];
|
|
221
|
-
if (this.usesSession()) {
|
|
222
|
-
config.headers[ACCOUNT_HEADER] = this.sessionAccount();
|
|
223
|
-
config.withCredentials = true;
|
|
224
|
-
} else if (this.configuration.accessToken) {
|
|
225
|
-
config.headers['Authorization'] = this.configuration.accessToken;
|
|
226
|
-
}
|
|
227
|
-
return config;
|
|
228
|
-
}
|
|
229
|
-
|
|
230
|
-
// Both keeps the token, so a session call the browser could not complete can be sent again with it.
|
|
231
|
-
private canRetryWithToken(config: AxiosRequestConfig): boolean {
|
|
232
|
-
return !!config.withCredentials && !!config.headers?.[ACCOUNT_HEADER]
|
|
233
|
-
&& !!this.tokenData.accessToken && this.tokenData.authMode !== 'session';
|
|
234
|
-
}
|
|
235
|
-
|
|
236
|
-
// A network error can come after the server ran the call, so only a call that is safe to repeat is sent again.
|
|
237
|
-
private canResend(config: AxiosRequestConfig): boolean {
|
|
238
|
-
return RESEND_SAFE_METHODS.indexOf((config.method || 'get').toLowerCase()) !== -1
|
|
239
|
-
|| Object.keys(config.headers || {}).some((name) => name.toLowerCase() === 'idempotency-key');
|
|
240
|
-
}
|
|
241
|
-
|
|
242
|
-
private switchToToken() {
|
|
243
|
-
this.useHeaderAuth(this.tokenData.accessToken);
|
|
244
|
-
this.storeTokenData(this.tokenData);
|
|
245
|
-
}
|
|
246
|
-
|
|
247
|
-
private retryWithToken(axios: AxiosInstance, config: AxiosRequestConfig) {
|
|
248
|
-
this.switchToToken();
|
|
249
|
-
config.withCredentials = false;
|
|
250
|
-
return axios(this.withCurrentAuth(config));
|
|
251
|
-
}
|
|
252
|
-
|
|
253
122
|
selectEnvironment(env: Environment) {
|
|
254
123
|
this.selectBasePath(env);
|
|
255
124
|
}
|
|
@@ -269,8 +138,8 @@ export class BaseAPI {
|
|
|
269
138
|
async authorize(username: string, password: string, targetWorkspace?: string): Promise<void> {
|
|
270
139
|
const options: AxiosRequestConfig = {
|
|
271
140
|
method: 'POST',
|
|
272
|
-
url: `${this.
|
|
273
|
-
headers: { 'Content-Type': 'application/json'
|
|
141
|
+
url: `${this.configuration.basePath}/authservice/v1/login`,
|
|
142
|
+
headers: { 'Content-Type': 'application/json' },
|
|
274
143
|
data: {
|
|
275
144
|
username,
|
|
276
145
|
password,
|
|
@@ -280,10 +149,13 @@ export class BaseAPI {
|
|
|
280
149
|
|
|
281
150
|
const response = await globalAxios.request<LoginClass>(options);
|
|
282
151
|
|
|
152
|
+
const { data: { accessToken, permissions } } = response;
|
|
153
|
+
|
|
283
154
|
this.configuration.username = username;
|
|
155
|
+
this.configuration.accessToken = `Bearer ${accessToken}`;
|
|
284
156
|
this.tokenData.username = username;
|
|
285
|
-
this.tokenData.
|
|
286
|
-
this.
|
|
157
|
+
this.tokenData.accessToken = accessToken;
|
|
158
|
+
this.tokenData.permissions = permissions;
|
|
287
159
|
|
|
288
160
|
// Switch workspace if provided
|
|
289
161
|
if (targetWorkspace) {
|
|
@@ -303,11 +175,10 @@ export class BaseAPI {
|
|
|
303
175
|
async switchWorkspace(targetWorkspace: string): Promise<void> {
|
|
304
176
|
const options: AxiosRequestConfig = {
|
|
305
177
|
method: 'POST',
|
|
306
|
-
url: `${this.
|
|
178
|
+
url: `${this.configuration.basePath}/authservice/v1/workspaces/switch`,
|
|
307
179
|
headers: {
|
|
308
180
|
'Content-Type': 'application/json',
|
|
309
|
-
|
|
310
|
-
...(!this.usesSession() && !!this.configuration.accessToken && { 'Authorization': this.configuration.accessToken as string }),
|
|
181
|
+
'Authorization': `Bearer ${this.configuration.accessToken}`,
|
|
311
182
|
},
|
|
312
183
|
data: {
|
|
313
184
|
username: this.configuration.username,
|
|
@@ -318,8 +189,11 @@ export class BaseAPI {
|
|
|
318
189
|
|
|
319
190
|
const response = await globalAxios.request<SwitchWorkspaceResponseClass>(options);
|
|
320
191
|
|
|
321
|
-
|
|
322
|
-
|
|
192
|
+
const { data: { accessToken, permissions } } = response;
|
|
193
|
+
|
|
194
|
+
this.configuration.accessToken = `Bearer ${accessToken}`;
|
|
195
|
+
this.tokenData.accessToken = accessToken;
|
|
196
|
+
this.tokenData.permissions = permissions;
|
|
323
197
|
|
|
324
198
|
this.storeTokenData({
|
|
325
199
|
...this.tokenData
|
|
@@ -345,10 +219,9 @@ export class BaseAPI {
|
|
|
345
219
|
|
|
346
220
|
const options: AxiosRequestConfig = {
|
|
347
221
|
method: 'POST',
|
|
348
|
-
url: `${this.
|
|
222
|
+
url: `${this.configuration.basePath}/authservice/v1/refresh-token`,
|
|
349
223
|
headers: {
|
|
350
224
|
'Content-Type': 'application/json',
|
|
351
|
-
...this.sessionHeaders(),
|
|
352
225
|
},
|
|
353
226
|
data: { username: username },
|
|
354
227
|
withCredentials: true,
|
|
@@ -389,22 +262,20 @@ export class BaseAPI {
|
|
|
389
262
|
&& !originalConfig._retry) {
|
|
390
263
|
originalConfig._retry = true;
|
|
391
264
|
try {
|
|
392
|
-
const
|
|
393
|
-
|
|
394
|
-
this.
|
|
395
|
-
this.storeTokenData(this.tokenData);
|
|
265
|
+
const { accessToken: tokenString, permissions } = await this.refreshTokenInternal();
|
|
266
|
+
const accessToken = `Bearer ${tokenString}`;
|
|
267
|
+
this.tokenData.permissions = permissions;
|
|
396
268
|
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
269
|
+
delete originalConfig.headers['Authorization']
|
|
270
|
+
|
|
271
|
+
originalConfig.headers['Authorization'] = accessToken;
|
|
400
272
|
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
});
|
|
273
|
+
this.configuration.accessToken = accessToken;
|
|
274
|
+
this.tokenData.accessToken = tokenString;
|
|
275
|
+
|
|
276
|
+
this.storeTokenData(this.tokenData);
|
|
277
|
+
|
|
278
|
+
return axios(originalConfig);
|
|
408
279
|
} catch (_error) {
|
|
409
280
|
if (_error.response && _error.response.data) {
|
|
410
281
|
return Promise.reject(_error.response.data);
|
|
@@ -412,30 +283,26 @@ export class BaseAPI {
|
|
|
412
283
|
return Promise.reject(_error);
|
|
413
284
|
}
|
|
414
285
|
}
|
|
415
|
-
} else if (err.message === NETWORK_ERROR_MESSAGE && this.canRetryWithToken(originalConfig)) {
|
|
416
|
-
// Both mode: the browser blocked the session call or hid its reply; later calls use the token.
|
|
417
|
-
if (!this.canResend(originalConfig)) {
|
|
418
|
-
this.switchToToken();
|
|
419
|
-
return Promise.reject(err);
|
|
420
|
-
}
|
|
421
|
-
return this.retryWithToken(axios, originalConfig);
|
|
422
286
|
} else if (err.message === NETWORK_ERROR_MESSAGE
|
|
423
|
-
&&
|
|
424
|
-
|| (this.configuration.cookieAuth && originalConfig.withCredentials && this.canResend(originalConfig)))
|
|
287
|
+
&& originalConfig.headers.hasOwnProperty('Authorization')
|
|
425
288
|
&& _retry_count < 4
|
|
426
289
|
) {
|
|
427
290
|
_retry_count++;
|
|
428
291
|
try {
|
|
429
|
-
|
|
430
|
-
const
|
|
431
|
-
this.tokenData.permissions =
|
|
292
|
+
const { accessToken: tokenString, permissions } = await this.refreshTokenInternal();
|
|
293
|
+
const accessToken = `Bearer ${tokenString}`;
|
|
294
|
+
this.tokenData.permissions = permissions;
|
|
432
295
|
|
|
433
296
|
_retry = true;
|
|
434
|
-
|
|
297
|
+
originalConfig.headers['Authorization'] = accessToken;
|
|
298
|
+
|
|
299
|
+
this.configuration.accessToken = accessToken;
|
|
300
|
+
this.tokenData.accessToken = tokenString;
|
|
301
|
+
|
|
435
302
|
this.storeTokenData(this.tokenData);
|
|
436
303
|
|
|
437
304
|
return axios.request({
|
|
438
|
-
...
|
|
305
|
+
...originalConfig,
|
|
439
306
|
});
|
|
440
307
|
} catch (_error) {
|
|
441
308
|
if (_error.response && _error.response.data) {
|
package/common.ts
CHANGED
|
@@ -130,10 +130,9 @@ export const toPathString = function (url: URL) {
|
|
|
130
130
|
* @export
|
|
131
131
|
*/
|
|
132
132
|
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
|
|
133
|
-
|
|
134
|
-
return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH): Promise<R> => {
|
|
133
|
+
return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
|
|
135
134
|
const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
|
|
136
|
-
return axios.request<T, R>(axiosRequestArgs)
|
|
135
|
+
return axios.request<T, R>(axiosRequestArgs);
|
|
137
136
|
};
|
|
138
137
|
}
|
|
139
138
|
|
package/configuration.ts
CHANGED
|
@@ -21,8 +21,6 @@ export interface ConfigurationParameters {
|
|
|
21
21
|
basePath?: string;
|
|
22
22
|
baseOptions?: any;
|
|
23
23
|
formDataCtor?: new () => any;
|
|
24
|
-
cookieAuth?: boolean;
|
|
25
|
-
account?: string;
|
|
26
24
|
}
|
|
27
25
|
|
|
28
26
|
export class Configuration {
|
|
@@ -76,22 +74,6 @@ export class Configuration {
|
|
|
76
74
|
*/
|
|
77
75
|
formDataCtor?: new () => any;
|
|
78
76
|
|
|
79
|
-
/**
|
|
80
|
-
* Use a server session when authservice makes one; otherwise the token, as without this option.
|
|
81
|
-
* Set `account` too, so each SDK object keeps its own account.
|
|
82
|
-
*
|
|
83
|
-
* @type {boolean}
|
|
84
|
-
* @memberof Configuration
|
|
85
|
-
*/
|
|
86
|
-
cookieAuth?: boolean;
|
|
87
|
-
/**
|
|
88
|
-
* The session account (Cognito sub) this app shows, so the SDK never takes another tab's account.
|
|
89
|
-
*
|
|
90
|
-
* @type {string}
|
|
91
|
-
* @memberof Configuration
|
|
92
|
-
*/
|
|
93
|
-
account?: string;
|
|
94
|
-
|
|
95
77
|
constructor(param: ConfigurationParameters = {}) {
|
|
96
78
|
this.apiKey = param.apiKey;
|
|
97
79
|
this.username = param.username;
|
|
@@ -100,8 +82,6 @@ export class Configuration {
|
|
|
100
82
|
this.basePath = param.basePath;
|
|
101
83
|
this.baseOptions = param.baseOptions;
|
|
102
84
|
this.formDataCtor = param.formDataCtor;
|
|
103
|
-
this.cookieAuth = param.cookieAuth;
|
|
104
|
-
this.account = param.account;
|
|
105
85
|
}
|
|
106
86
|
|
|
107
87
|
/**
|
|
@@ -409,7 +409,7 @@ export declare class BankAccountsApi extends BaseAPI {
|
|
|
409
409
|
* @throws {RequiredError}
|
|
410
410
|
* @memberof BankAccountsApi
|
|
411
411
|
*/
|
|
412
|
-
createBankAccount(requestParameters: BankAccountsApiCreateBankAccountRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<CreateBankAccountResponseClass, any, {}
|
|
412
|
+
createBankAccount(requestParameters: BankAccountsApiCreateBankAccountRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<CreateBankAccountResponseClass, any, {}>>;
|
|
413
413
|
/**
|
|
414
414
|
* Deletes a bank account by code. If the bank account was primary, then the first available bank account for the specified partner/account will be marked as primary. **Required Permissions** \"payment-management.bank-accounts.delete\"
|
|
415
415
|
* @summary Delete the bank account
|
|
@@ -418,7 +418,7 @@ export declare class BankAccountsApi extends BaseAPI {
|
|
|
418
418
|
* @throws {RequiredError}
|
|
419
419
|
* @memberof BankAccountsApi
|
|
420
420
|
*/
|
|
421
|
-
deleteBankAccount(requestParameters: BankAccountsApiDeleteBankAccountRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<object, any, {}
|
|
421
|
+
deleteBankAccount(requestParameters: BankAccountsApiDeleteBankAccountRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<object, any, {}>>;
|
|
422
422
|
/**
|
|
423
423
|
* Retrieves the details of the bank account that was previously created. Supply the unique bank account code that was returned when you created it and Emil Api will return the corresponding bank account information. **Required Permissions** \"payment-management.bank-accounts.view\"
|
|
424
424
|
* @summary Retrieve the bank account
|
|
@@ -427,7 +427,7 @@ export declare class BankAccountsApi extends BaseAPI {
|
|
|
427
427
|
* @throws {RequiredError}
|
|
428
428
|
* @memberof BankAccountsApi
|
|
429
429
|
*/
|
|
430
|
-
getBankAccount(requestParameters: BankAccountsApiGetBankAccountRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<GetBankAccountResponseClass, any, {}
|
|
430
|
+
getBankAccount(requestParameters: BankAccountsApiGetBankAccountRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<GetBankAccountResponseClass, any, {}>>;
|
|
431
431
|
/**
|
|
432
432
|
* Returns a list of bank accounts you have previously created. The bank accounts are returned in sorted order, with the oldest one appearing first. For more information about pagination, read the Pagination documentation. **Required Permissions** \"payment-management.bank-accounts.view\"
|
|
433
433
|
* @summary List bank accounts
|
|
@@ -436,7 +436,7 @@ export declare class BankAccountsApi extends BaseAPI {
|
|
|
436
436
|
* @throws {RequiredError}
|
|
437
437
|
* @memberof BankAccountsApi
|
|
438
438
|
*/
|
|
439
|
-
listBankAccounts(requestParameters?: BankAccountsApiListBankAccountsRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<ListBankAccountsResponseClass, any, {}
|
|
439
|
+
listBankAccounts(requestParameters?: BankAccountsApiListBankAccountsRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<ListBankAccountsResponseClass, any, {}>>;
|
|
440
440
|
/**
|
|
441
441
|
* Set the primary bank account for the specified partner/account **Required Permissions** \"payment-management.bank-accounts.update\"
|
|
442
442
|
* @summary Set primary bank account
|
|
@@ -445,7 +445,7 @@ export declare class BankAccountsApi extends BaseAPI {
|
|
|
445
445
|
* @throws {RequiredError}
|
|
446
446
|
* @memberof BankAccountsApi
|
|
447
447
|
*/
|
|
448
|
-
setPrimaryBankAccount(requestParameters: BankAccountsApiSetPrimaryBankAccountRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<object, any, {}
|
|
448
|
+
setPrimaryBankAccount(requestParameters: BankAccountsApiSetPrimaryBankAccountRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<object, any, {}>>;
|
|
449
449
|
/**
|
|
450
450
|
* Update a bank account by code **Required Permissions** \"payment-management.bank-accounts.update\"
|
|
451
451
|
* @summary Update the bank account
|
|
@@ -454,5 +454,5 @@ export declare class BankAccountsApi extends BaseAPI {
|
|
|
454
454
|
* @throws {RequiredError}
|
|
455
455
|
* @memberof BankAccountsApi
|
|
456
456
|
*/
|
|
457
|
-
updateBankAccount(requestParameters: BankAccountsApiUpdateBankAccountRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<UpdateBankAccountResponseClass, any, {}
|
|
457
|
+
updateBankAccount(requestParameters: BankAccountsApiUpdateBankAccountRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<UpdateBankAccountResponseClass, any, {}>>;
|
|
458
458
|
}
|