@emilgroup/payment-sdk 1.22.1-beta.83 → 1.22.1-beta.84
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 +8 -0
- package/README.md +2 -2
- package/api/bank-accounts-api.ts +48 -18
- package/api/bank-orders-api.ts +40 -15
- package/api/bank-transaction-api.ts +181 -26
- package/api/billing-addresses-api.ts +40 -15
- package/api/credit-allocation-api.ts +24 -9
- package/api/exceeding-credits-api.ts +240 -6
- package/api/health-check-api.ts +1 -1
- package/api/ibanvalidator-api.ts +8 -3
- package/api/payment-methods-api.ts +24 -9
- package/api/payment-receipts-api.ts +40 -15
- package/api/payment-reminders-api.ts +32 -12
- package/api/payment-requests-api.ts +52 -27
- package/api/payment-setup-api.ts +16 -6
- package/api/payments-api.ts +46 -16
- package/api/payout-methods-api.ts +48 -18
- package/api/policy-payment-methods-api.ts +24 -9
- package/api/refunds-api.ts +24 -9
- package/api/tenant-bank-account-api.ts +40 -15
- package/api/webhooks-api.ts +2 -2
- package/base.ts +239 -43
- package/common.ts +3 -2
- package/configuration.ts +20 -0
- package/dist/api/bank-accounts-api.d.ts +6 -6
- package/dist/api/bank-accounts-api.js +82 -46
- package/dist/api/bank-orders-api.d.ts +5 -5
- package/dist/api/bank-orders-api.js +67 -38
- package/dist/api/bank-transaction-api.d.ts +80 -14
- package/dist/api/bank-transaction-api.js +194 -52
- package/dist/api/billing-addresses-api.d.ts +5 -5
- package/dist/api/billing-addresses-api.js +71 -39
- package/dist/api/credit-allocation-api.d.ts +3 -3
- package/dist/api/credit-allocation-api.js +41 -23
- package/dist/api/exceeding-credits-api.d.ts +116 -2
- package/dist/api/exceeding-credits-api.js +226 -15
- package/dist/api/health-check-api.d.ts +1 -1
- package/dist/api/health-check-api.js +1 -1
- package/dist/api/ibanvalidator-api.d.ts +1 -1
- package/dist/api/ibanvalidator-api.js +15 -8
- package/dist/api/payment-methods-api.d.ts +3 -3
- package/dist/api/payment-methods-api.js +41 -23
- package/dist/api/payment-receipts-api.d.ts +5 -5
- package/dist/api/payment-receipts-api.js +67 -38
- package/dist/api/payment-reminders-api.d.ts +4 -4
- package/dist/api/payment-reminders-api.js +56 -31
- package/dist/api/payment-requests-api.d.ts +17 -17
- package/dist/api/payment-requests-api.js +76 -47
- package/dist/api/payment-setup-api.d.ts +2 -2
- package/dist/api/payment-setup-api.js +30 -16
- package/dist/api/payments-api.d.ts +4 -4
- package/dist/api/payments-api.js +62 -34
- package/dist/api/payout-methods-api.d.ts +6 -6
- package/dist/api/payout-methods-api.js +82 -46
- package/dist/api/policy-payment-methods-api.d.ts +3 -3
- package/dist/api/policy-payment-methods-api.js +41 -23
- package/dist/api/refunds-api.d.ts +3 -3
- package/dist/api/refunds-api.js +37 -22
- package/dist/api/tenant-bank-account-api.d.ts +5 -5
- package/dist/api/tenant-bank-account-api.js +67 -38
- package/dist/api/webhooks-api.d.ts +2 -2
- package/dist/api/webhooks-api.js +2 -2
- package/dist/base.d.ts +26 -0
- package/dist/base.js +243 -60
- package/dist/common.d.ts +1 -1
- package/dist/common.js +1 -0
- package/dist/configuration.d.ts +17 -0
- package/dist/configuration.js +2 -0
- package/dist/models/bank-transaction-class.d.ts +7 -0
- package/dist/models/bank-transaction-entity.d.ts +7 -0
- package/dist/models/bank-transaction-invoice-entity.d.ts +24 -0
- package/dist/models/create-exceeding-credit-request-dto.d.ts +48 -0
- package/dist/models/create-exceeding-credit-request-dto.js +15 -0
- package/dist/models/create-exceeding-credit-response-class.d.ts +25 -0
- package/dist/models/create-exceeding-credit-response-class.js +15 -0
- package/dist/models/create-payment-order-dto.d.ts +1 -1
- package/dist/models/create-payment-receipt-request-dto.d.ts +3 -3
- package/dist/models/create-payment-request-dto.d.ts +1 -1
- package/dist/models/create-payment-request-request-dto.d.ts +6 -0
- package/dist/models/create-return-premium-credits-request-dto.d.ts +24 -0
- package/dist/models/create-return-premium-credits-request-dto.js +15 -0
- package/dist/models/create-return-premium-credits-response-class.d.ts +25 -0
- package/dist/models/create-return-premium-credits-response-class.js +15 -0
- package/dist/models/credit-allocation-class.d.ts +6 -0
- package/dist/models/credit-allocation-entity.d.ts +6 -0
- package/dist/models/exceeding-credit-class.d.ts +25 -2
- package/dist/models/exceeding-credit-class.js +5 -1
- package/dist/models/exceeding-credit-entity.d.ts +31 -2
- package/dist/models/exceeding-credit-entity.js +5 -1
- package/dist/models/index.d.ts +8 -0
- package/dist/models/index.js +8 -0
- package/dist/models/link-bank-transaction-payment-requests-request-dto-rest.d.ts +30 -0
- package/dist/models/link-bank-transaction-payment-requests-request-dto-rest.js +15 -0
- package/dist/models/link-bank-transaction-payment-requests-response-class.d.ts +25 -0
- package/dist/models/link-bank-transaction-payment-requests-response-class.js +15 -0
- package/dist/models/list-billing-addresses-response-class.d.ts +9 -9
- package/dist/models/list-exceeding-credits-response-class.d.ts +6 -18
- package/dist/models/list-payment-receipts-response-class.d.ts +9 -9
- package/dist/models/list-payment-requests-response-class.d.ts +6 -18
- package/dist/models/list-payout-methods-response-class.d.ts +9 -9
- package/dist/models/list-refunds-response-class.d.ts +6 -18
- package/dist/models/payment-class-without-expand-properties.d.ts +2 -2
- package/dist/models/payment-class.d.ts +2 -2
- package/dist/models/payment-entity.d.ts +1 -1
- package/dist/models/payment-receipt-class.d.ts +13 -1
- package/dist/models/payment-receipt-entity.d.ts +139 -0
- package/dist/models/payment-receipt-entity.js +20 -0
- package/dist/models/payment-request-class.d.ts +13 -6
- package/dist/models/payment-request-class.js +1 -0
- package/dist/models/payment-request-entity.d.ts +223 -0
- package/dist/models/payment-request-entity.js +39 -0
- package/dist/models/shared-transaction-class.d.ts +6 -0
- package/dist/models/transaction-entity.d.ts +6 -0
- package/models/bank-transaction-class.ts +7 -0
- package/models/bank-transaction-entity.ts +7 -0
- package/models/bank-transaction-invoice-entity.ts +24 -0
- package/models/create-exceeding-credit-request-dto.ts +54 -0
- package/models/create-exceeding-credit-response-class.ts +31 -0
- package/models/create-payment-order-dto.ts +1 -1
- package/models/create-payment-receipt-request-dto.ts +3 -3
- package/models/create-payment-request-dto.ts +1 -1
- package/models/create-payment-request-request-dto.ts +6 -0
- package/models/create-return-premium-credits-request-dto.ts +30 -0
- package/models/create-return-premium-credits-response-class.ts +31 -0
- package/models/credit-allocation-class.ts +6 -0
- package/models/credit-allocation-entity.ts +6 -0
- package/models/exceeding-credit-class.ts +26 -2
- package/models/exceeding-credit-entity.ts +32 -2
- package/models/index.ts +8 -0
- package/models/link-bank-transaction-payment-requests-request-dto-rest.ts +36 -0
- package/models/link-bank-transaction-payment-requests-response-class.ts +31 -0
- package/models/list-billing-addresses-response-class.ts +9 -9
- package/models/list-exceeding-credits-response-class.ts +6 -18
- package/models/list-payment-receipts-response-class.ts +9 -9
- package/models/list-payment-requests-response-class.ts +6 -18
- package/models/list-payout-methods-response-class.ts +9 -9
- package/models/list-refunds-response-class.ts +6 -18
- package/models/payment-class-without-expand-properties.ts +2 -2
- package/models/payment-class.ts +2 -2
- package/models/payment-entity.ts +1 -1
- package/models/payment-receipt-class.ts +13 -1
- package/models/payment-receipt-entity.ts +148 -0
- package/models/payment-request-class.ts +13 -6
- package/models/payment-request-entity.ts +233 -0
- package/models/shared-transaction-class.ts +6 -0
- package/models/transaction-entity.ts +6 -0
- package/package.json +2 -2
package/base.ts
CHANGED
|
@@ -32,9 +32,20 @@ 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
|
+
|
|
35
44
|
export interface LoginClass {
|
|
36
45
|
accessToken: string;
|
|
37
46
|
permissions: string;
|
|
47
|
+
authMode?: string;
|
|
48
|
+
session?: SessionClass;
|
|
38
49
|
}
|
|
39
50
|
|
|
40
51
|
export interface SwitchWorkspaceRequest {
|
|
@@ -45,6 +56,8 @@ export interface SwitchWorkspaceRequest {
|
|
|
45
56
|
export interface SwitchWorkspaceResponseClass {
|
|
46
57
|
accessToken: string;
|
|
47
58
|
permissions: string;
|
|
59
|
+
authMode?: string;
|
|
60
|
+
session?: SessionClass;
|
|
48
61
|
}
|
|
49
62
|
|
|
50
63
|
export enum Environment {
|
|
@@ -59,6 +72,10 @@ export enum Environment {
|
|
|
59
72
|
let _retry_count = 0
|
|
60
73
|
let _retry = null
|
|
61
74
|
|
|
75
|
+
// Marks each request with the account (username) of the SDK object that sent it: only SDK objects of that
|
|
76
|
+
// account refresh and resend it, never an object of another account open in the same browser.
|
|
77
|
+
const REQUEST_OWNER = '_emilSdkOwner';
|
|
78
|
+
|
|
62
79
|
export function resetRetry() {
|
|
63
80
|
_retry_count = 0
|
|
64
81
|
}
|
|
@@ -77,10 +94,19 @@ interface TokenData {
|
|
|
77
94
|
accessToken?: string;
|
|
78
95
|
username?: string;
|
|
79
96
|
permissions?: string;
|
|
97
|
+
// 'both' or 'session' when authservice keeps the tokens in a server session.
|
|
98
|
+
authMode?: string;
|
|
99
|
+
sub?: string;
|
|
80
100
|
}
|
|
81
101
|
|
|
82
102
|
const NETWORK_ERROR_MESSAGE = "Network Error";
|
|
83
103
|
const TOKEN_DATA = 'APP_TOKEN';
|
|
104
|
+
// Sent only to authservice, to ask for a server session.
|
|
105
|
+
const AUTH_MODE_HEADER = 'X-Emil-Auth-Mode';
|
|
106
|
+
// Names the account on every call; one browser session can hold several.
|
|
107
|
+
const ACCOUNT_HEADER = 'X-Emil-Account';
|
|
108
|
+
const SESSION_MODES = ['both', 'session'];
|
|
109
|
+
const RESEND_SAFE_METHODS = ['get', 'head', 'options'];
|
|
84
110
|
|
|
85
111
|
/**
|
|
86
112
|
*
|
|
@@ -98,14 +124,31 @@ export class BaseAPI {
|
|
|
98
124
|
this.loadTokenData();
|
|
99
125
|
|
|
100
126
|
if (configuration) {
|
|
127
|
+
// Two accounts in one browser share APP_TOKEN: never take the token or session account saved for
|
|
128
|
+
// another account. The mode stays (an app naming its account keeps its session). Saved with the next refresh.
|
|
129
|
+
const ownUser = configuration.username;
|
|
130
|
+
const storedUser = this.tokenData.username;
|
|
131
|
+
if (ownUser && storedUser && ownUser.toLowerCase() !== storedUser.toLowerCase()) {
|
|
132
|
+
delete this.tokenData.accessToken;
|
|
133
|
+
delete this.tokenData.sub;
|
|
134
|
+
this.tokenData.username = ownUser;
|
|
135
|
+
}
|
|
101
136
|
const { accessToken } = this.tokenData;
|
|
102
137
|
this.configuration = configuration;
|
|
103
138
|
this.basePath = configuration.basePath || this.basePath;
|
|
104
139
|
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
140
|
+
if (configuration.cookieAuth) {
|
|
141
|
+
this.configuration.username = this.configuration.username || this.tokenData.username;
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
if (this.usesSession()) {
|
|
145
|
+
this.useSessionAuth();
|
|
146
|
+
} else {
|
|
147
|
+
// Use config token if provided, otherwise use tokenData token
|
|
148
|
+
const configToken = this.configuration.accessToken;
|
|
149
|
+
const storedToken = accessToken ? `Bearer ${accessToken}` : '';
|
|
150
|
+
this.configuration.accessToken = configToken || storedToken;
|
|
151
|
+
}
|
|
109
152
|
} else {
|
|
110
153
|
const { accessToken, username } = this.tokenData;
|
|
111
154
|
|
|
@@ -119,6 +162,110 @@ export class BaseAPI {
|
|
|
119
162
|
this.attachInterceptor(axios);
|
|
120
163
|
}
|
|
121
164
|
|
|
165
|
+
// The app's own account wins over APP_TOKEN, which holds whichever tab wrote last.
|
|
166
|
+
private sessionAccount(): string | undefined {
|
|
167
|
+
return this.configuration.account || this.tokenData.sub;
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
// Apps may pass the address as the second argument only; authservice is on the same host.
|
|
171
|
+
private authBasePath(): string {
|
|
172
|
+
return this.configuration.basePath || this.basePath;
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
private usesSession(): boolean {
|
|
176
|
+
return !!this.configuration.cookieAuth && SESSION_MODES.indexOf(this.tokenData.authMode) !== -1 && !!this.sessionAccount();
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
private useSessionAuth() {
|
|
180
|
+
const { headers, ...baseOptions } = this.configuration.baseOptions || {};
|
|
181
|
+
this.configuration.accessToken = '';
|
|
182
|
+
this.configuration.baseOptions = {
|
|
183
|
+
...baseOptions,
|
|
184
|
+
withCredentials: true,
|
|
185
|
+
headers: { ...headers, [ACCOUNT_HEADER]: this.sessionAccount() },
|
|
186
|
+
};
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
private useHeaderAuth(accessToken: string, keepSessionData = false) {
|
|
190
|
+
this.configuration.accessToken = accessToken ? `Bearer ${accessToken}` : '';
|
|
191
|
+
this.tokenData.accessToken = accessToken;
|
|
192
|
+
// An app without cookieAuth does not own the session fields: its refresh leaves them for the session apps.
|
|
193
|
+
if (!keepSessionData || this.configuration.cookieAuth) {
|
|
194
|
+
delete this.tokenData.authMode;
|
|
195
|
+
delete this.tokenData.sub;
|
|
196
|
+
}
|
|
197
|
+
if (this.configuration.cookieAuth) {
|
|
198
|
+
const { withCredentials, headers, ...baseOptions } = this.configuration.baseOptions || {};
|
|
199
|
+
const { [ACCOUNT_HEADER]: account, ...otherHeaders } = headers || {};
|
|
200
|
+
this.configuration.baseOptions = { ...baseOptions, headers: otherHeaders };
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
private applyTokenReply({ accessToken, authMode, session }: LoginClass, fromRefresh = false) {
|
|
205
|
+
if (this.configuration.cookieAuth && SESSION_MODES.indexOf(authMode) !== -1 && session?.sub) {
|
|
206
|
+
this.tokenData.authMode = authMode;
|
|
207
|
+
this.tokenData.sub = session.sub;
|
|
208
|
+
if (this.configuration.account) {
|
|
209
|
+
// A workspace switch moves the app to another account.
|
|
210
|
+
this.configuration.account = session.sub;
|
|
211
|
+
}
|
|
212
|
+
// Both keeps the token for apps not moved yet; session mode keeps no token at all.
|
|
213
|
+
if (authMode === 'both' && accessToken) {
|
|
214
|
+
this.tokenData.accessToken = accessToken;
|
|
215
|
+
} else {
|
|
216
|
+
delete this.tokenData.accessToken;
|
|
217
|
+
}
|
|
218
|
+
this.useSessionAuth();
|
|
219
|
+
} else {
|
|
220
|
+
this.useHeaderAuth(accessToken, fromRefresh);
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
private sessionHeaders(): Record<string, string> {
|
|
225
|
+
if (!this.configuration.cookieAuth) {
|
|
226
|
+
return {};
|
|
227
|
+
}
|
|
228
|
+
return {
|
|
229
|
+
[AUTH_MODE_HEADER]: 'session',
|
|
230
|
+
...(this.usesSession() && { [ACCOUNT_HEADER]: this.sessionAccount() }),
|
|
231
|
+
};
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
private withCurrentAuth(config: AxiosRequestConfig): AxiosRequestConfig {
|
|
235
|
+
delete config.headers['Authorization'];
|
|
236
|
+
delete config.headers[ACCOUNT_HEADER];
|
|
237
|
+
if (this.usesSession()) {
|
|
238
|
+
config.headers[ACCOUNT_HEADER] = this.sessionAccount();
|
|
239
|
+
config.withCredentials = true;
|
|
240
|
+
} else if (this.configuration.accessToken) {
|
|
241
|
+
config.headers['Authorization'] = this.configuration.accessToken;
|
|
242
|
+
}
|
|
243
|
+
return config;
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
// Both keeps the token, so a session call the browser could not complete can be sent again with it.
|
|
247
|
+
private canRetryWithToken(config: AxiosRequestConfig): boolean {
|
|
248
|
+
return !!config.withCredentials && !!config.headers?.[ACCOUNT_HEADER]
|
|
249
|
+
&& !!this.tokenData.accessToken && this.tokenData.authMode !== 'session';
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
// A network error can come after the server ran the call, so only a call that is safe to repeat is sent again.
|
|
253
|
+
private canResend(config: AxiosRequestConfig): boolean {
|
|
254
|
+
return RESEND_SAFE_METHODS.indexOf((config.method || 'get').toLowerCase()) !== -1
|
|
255
|
+
|| Object.keys(config.headers || {}).some((name) => name.toLowerCase() === 'idempotency-key');
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
private switchToToken() {
|
|
259
|
+
this.useHeaderAuth(this.tokenData.accessToken);
|
|
260
|
+
this.storeTokenData(this.tokenData);
|
|
261
|
+
}
|
|
262
|
+
|
|
263
|
+
private retryWithToken(axios: AxiosInstance, config: AxiosRequestConfig) {
|
|
264
|
+
this.switchToToken();
|
|
265
|
+
config.withCredentials = false;
|
|
266
|
+
return axios(this.withCurrentAuth(config));
|
|
267
|
+
}
|
|
268
|
+
|
|
122
269
|
selectEnvironment(env: Environment) {
|
|
123
270
|
this.selectBasePath(env);
|
|
124
271
|
}
|
|
@@ -138,8 +285,8 @@ export class BaseAPI {
|
|
|
138
285
|
async authorize(username: string, password: string, targetWorkspace?: string): Promise<void> {
|
|
139
286
|
const options: AxiosRequestConfig = {
|
|
140
287
|
method: 'POST',
|
|
141
|
-
url: `${this.
|
|
142
|
-
headers: { 'Content-Type': 'application/json' },
|
|
288
|
+
url: `${this.authBasePath()}/authservice/v1/login`,
|
|
289
|
+
headers: { 'Content-Type': 'application/json', ...(this.configuration.cookieAuth && { [AUTH_MODE_HEADER]: 'session' }) },
|
|
143
290
|
data: {
|
|
144
291
|
username,
|
|
145
292
|
password,
|
|
@@ -149,13 +296,10 @@ export class BaseAPI {
|
|
|
149
296
|
|
|
150
297
|
const response = await globalAxios.request<LoginClass>(options);
|
|
151
298
|
|
|
152
|
-
const { data: { accessToken, permissions } } = response;
|
|
153
|
-
|
|
154
299
|
this.configuration.username = username;
|
|
155
|
-
this.configuration.accessToken = `Bearer ${accessToken}`;
|
|
156
300
|
this.tokenData.username = username;
|
|
157
|
-
this.tokenData.
|
|
158
|
-
this.
|
|
301
|
+
this.tokenData.permissions = response.data.permissions;
|
|
302
|
+
this.applyTokenReply(response.data);
|
|
159
303
|
|
|
160
304
|
// Switch workspace if provided
|
|
161
305
|
if (targetWorkspace) {
|
|
@@ -175,10 +319,11 @@ export class BaseAPI {
|
|
|
175
319
|
async switchWorkspace(targetWorkspace: string): Promise<void> {
|
|
176
320
|
const options: AxiosRequestConfig = {
|
|
177
321
|
method: 'POST',
|
|
178
|
-
url: `${this.
|
|
322
|
+
url: `${this.authBasePath()}/authservice/v1/workspaces/switch`,
|
|
179
323
|
headers: {
|
|
180
324
|
'Content-Type': 'application/json',
|
|
181
|
-
|
|
325
|
+
...this.sessionHeaders(),
|
|
326
|
+
...(!this.usesSession() && !!this.configuration.accessToken && { 'Authorization': this.configuration.accessToken as string }),
|
|
182
327
|
},
|
|
183
328
|
data: {
|
|
184
329
|
username: this.configuration.username,
|
|
@@ -189,11 +334,8 @@ export class BaseAPI {
|
|
|
189
334
|
|
|
190
335
|
const response = await globalAxios.request<SwitchWorkspaceResponseClass>(options);
|
|
191
336
|
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
this.configuration.accessToken = `Bearer ${accessToken}`;
|
|
195
|
-
this.tokenData.accessToken = accessToken;
|
|
196
|
-
this.tokenData.permissions = permissions;
|
|
337
|
+
this.tokenData.permissions = response.data.permissions;
|
|
338
|
+
this.applyTokenReply(response.data);
|
|
197
339
|
|
|
198
340
|
this.storeTokenData({
|
|
199
341
|
...this.tokenData
|
|
@@ -209,9 +351,34 @@ export class BaseAPI {
|
|
|
209
351
|
|
|
210
352
|
const refreshTokenAxios = globalAxios.create()
|
|
211
353
|
refreshTokenAxios.interceptors.response.use(response => {
|
|
212
|
-
const { permissions } = response.data;
|
|
213
|
-
|
|
354
|
+
const { permissions, accessToken, authMode } = response.data;
|
|
355
|
+
// Decided before the merge below: newer session data must not keep the new token from this object.
|
|
356
|
+
const onSession = this.usesSession();
|
|
357
|
+
|
|
358
|
+
// Newer data saved for this account (e.g. the session mode the shell saved later) wins over the copy
|
|
359
|
+
// read when the object was made; data of another account or another workspace (sub) is never taken.
|
|
360
|
+
const latest = ((typeof window !== 'undefined' && defaultStorage().get<TokenData>(TOKEN_DATA)) || {}) as TokenData;
|
|
361
|
+
const ownSub = this.sessionAccount();
|
|
362
|
+
if (latest.username?.toLowerCase() === username.toLowerCase()
|
|
363
|
+
&& (!ownSub || !latest.sub || latest.sub === ownSub)) {
|
|
364
|
+
// A bare reset ({username}, an app's account check) keeps this copy's other fields; any fuller record
|
|
365
|
+
// is the truth, so fields it lacks were removed on purpose (e.g. a rollback) and stay removed.
|
|
366
|
+
const bareReset = Object.keys(latest).every((key) => key === 'username');
|
|
367
|
+
this.tokenData = bareReset ? { ...this.tokenData, ...latest } : { ...latest };
|
|
368
|
+
}
|
|
369
|
+
// The reply is for this account: label it, or an SDK object of another account would take the token.
|
|
370
|
+
if (this.tokenData.username?.toLowerCase() !== username.toLowerCase()) {
|
|
371
|
+
this.tokenData.username = username;
|
|
372
|
+
}
|
|
214
373
|
this.tokenData.permissions = permissions;
|
|
374
|
+
// Keep the new token for the page's next SDK objects; session data is left as it is.
|
|
375
|
+
if (accessToken && !onSession) {
|
|
376
|
+
this.tokenData.accessToken = accessToken;
|
|
377
|
+
this.configuration.accessToken = `Bearer ${accessToken}`;
|
|
378
|
+
} else if (accessToken && authMode === 'both') {
|
|
379
|
+
// Both: this app stays on the session; the token is kept for apps not moved yet.
|
|
380
|
+
this.tokenData.accessToken = accessToken;
|
|
381
|
+
}
|
|
215
382
|
this.storeTokenData(this.tokenData);
|
|
216
383
|
|
|
217
384
|
return response;
|
|
@@ -219,9 +386,10 @@ export class BaseAPI {
|
|
|
219
386
|
|
|
220
387
|
const options: AxiosRequestConfig = {
|
|
221
388
|
method: 'POST',
|
|
222
|
-
url: `${this.
|
|
389
|
+
url: `${this.authBasePath()}/authservice/v1/refresh-token`,
|
|
223
390
|
headers: {
|
|
224
391
|
'Content-Type': 'application/json',
|
|
392
|
+
...this.sessionHeaders(),
|
|
225
393
|
},
|
|
226
394
|
data: { username: username },
|
|
227
395
|
withCredentials: true,
|
|
@@ -249,6 +417,18 @@ export class BaseAPI {
|
|
|
249
417
|
this.storeTokenData(null);
|
|
250
418
|
}
|
|
251
419
|
|
|
420
|
+
private ownAccount(): string {
|
|
421
|
+
return (this.configuration.username || '').toLowerCase();
|
|
422
|
+
}
|
|
423
|
+
|
|
424
|
+
protected withOwner(options?: AxiosRequestConfig): AxiosRequestConfig {
|
|
425
|
+
// An object without a username cannot refresh itself: its requests stay unmarked, as before.
|
|
426
|
+
if (!this.ownAccount()) {
|
|
427
|
+
return { ...options };
|
|
428
|
+
}
|
|
429
|
+
return { ...options, [REQUEST_OWNER]: this.ownAccount() } as AxiosRequestConfig;
|
|
430
|
+
}
|
|
431
|
+
|
|
252
432
|
private attachInterceptor(axios: AxiosInstance) {
|
|
253
433
|
axios.interceptors.response.use(
|
|
254
434
|
(res) => {
|
|
@@ -256,26 +436,33 @@ export class BaseAPI {
|
|
|
256
436
|
},
|
|
257
437
|
async (err) => {
|
|
258
438
|
let originalConfig = err.config;
|
|
439
|
+
// Sent for another account: only that account's SDK objects handle it. Unmarked requests as before.
|
|
440
|
+
const owner = originalConfig?.[REQUEST_OWNER];
|
|
441
|
+
if (owner !== undefined && owner !== this.ownAccount()) {
|
|
442
|
+
return Promise.reject(err);
|
|
443
|
+
}
|
|
259
444
|
if (err.response && !(err.response instanceof XMLHttpRequest)) { // sometimes buggy and is of type request
|
|
260
445
|
// Access Token was expired
|
|
261
446
|
if ((err.response.status === 401 || err.response.status === 403)
|
|
262
447
|
&& !originalConfig._retry) {
|
|
263
448
|
originalConfig._retry = true;
|
|
264
449
|
try {
|
|
265
|
-
const
|
|
266
|
-
|
|
267
|
-
this.
|
|
268
|
-
|
|
269
|
-
delete originalConfig.headers['Authorization']
|
|
270
|
-
|
|
271
|
-
originalConfig.headers['Authorization'] = accessToken;
|
|
272
|
-
|
|
273
|
-
this.configuration.accessToken = accessToken;
|
|
274
|
-
this.tokenData.accessToken = tokenString;
|
|
275
|
-
|
|
450
|
+
const reply = await this.refreshTokenInternal();
|
|
451
|
+
this.tokenData.permissions = reply.permissions;
|
|
452
|
+
this.applyTokenReply(reply, true);
|
|
276
453
|
this.storeTokenData(this.tokenData);
|
|
277
454
|
|
|
278
|
-
|
|
455
|
+
if (!this.usesSession()) {
|
|
456
|
+
return axios(this.withCurrentAuth(originalConfig));
|
|
457
|
+
}
|
|
458
|
+
|
|
459
|
+
// Both mode: if the browser does not send the session cookie (another site), use the token.
|
|
460
|
+
return axios(this.withCurrentAuth(originalConfig)).catch((retryError) => {
|
|
461
|
+
if (retryError?.response?.status !== 401 || !this.tokenData.accessToken) {
|
|
462
|
+
return Promise.reject(retryError);
|
|
463
|
+
}
|
|
464
|
+
return this.retryWithToken(axios, originalConfig);
|
|
465
|
+
});
|
|
279
466
|
} catch (_error) {
|
|
280
467
|
if (_error.response && _error.response.data) {
|
|
281
468
|
return Promise.reject(_error.response.data);
|
|
@@ -283,26 +470,35 @@ export class BaseAPI {
|
|
|
283
470
|
return Promise.reject(_error);
|
|
284
471
|
}
|
|
285
472
|
}
|
|
473
|
+
} else if (err.message === NETWORK_ERROR_MESSAGE && this.canRetryWithToken(originalConfig)) {
|
|
474
|
+
// Both mode: the browser blocked the session call or hid its reply; later calls use the token.
|
|
475
|
+
if (!this.canResend(originalConfig)) {
|
|
476
|
+
this.switchToToken();
|
|
477
|
+
return Promise.reject(err);
|
|
478
|
+
}
|
|
479
|
+
return this.retryWithToken(axios, originalConfig);
|
|
286
480
|
} else if (err.message === NETWORK_ERROR_MESSAGE
|
|
287
|
-
&& originalConfig.headers.hasOwnProperty('Authorization')
|
|
481
|
+
&& (originalConfig.headers.hasOwnProperty('Authorization')
|
|
482
|
+
|| (this.configuration.cookieAuth && originalConfig.withCredentials && this.canResend(originalConfig)))
|
|
288
483
|
&& _retry_count < 4
|
|
289
484
|
) {
|
|
290
485
|
_retry_count++;
|
|
291
486
|
try {
|
|
292
|
-
|
|
293
|
-
const
|
|
294
|
-
this.tokenData.permissions = permissions;
|
|
487
|
+
// In session mode an unreadable 401 (no CORS headers on the error reply) also lands here.
|
|
488
|
+
const reply = await this.refreshTokenInternal();
|
|
489
|
+
this.tokenData.permissions = reply.permissions;
|
|
295
490
|
|
|
296
491
|
_retry = true;
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
this.configuration.accessToken = accessToken;
|
|
300
|
-
this.tokenData.accessToken = tokenString;
|
|
301
|
-
|
|
492
|
+
this.applyTokenReply(reply, true);
|
|
302
493
|
this.storeTokenData(this.tokenData);
|
|
303
494
|
|
|
495
|
+
// The limit is for refreshes that do not help; one that worked starts the count again.
|
|
496
|
+
// Not awaited, so a failed retry reaches the app as the same axios error as before.
|
|
304
497
|
return axios.request({
|
|
305
|
-
...originalConfig,
|
|
498
|
+
...this.withCurrentAuth(originalConfig),
|
|
499
|
+
}).then((retried) => {
|
|
500
|
+
_retry_count = 0;
|
|
501
|
+
return retried;
|
|
306
502
|
});
|
|
307
503
|
} catch (_error) {
|
|
308
504
|
if (_error.response && _error.response.data) {
|
package/common.ts
CHANGED
|
@@ -130,9 +130,10 @@ 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
|
-
|
|
133
|
+
// Typed by hand: since axios 1.20, request() returns an internal axios type that SDK declarations cannot name.
|
|
134
|
+
return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH): Promise<R> => {
|
|
134
135
|
const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
|
|
135
|
-
return axios.request<T, R>(axiosRequestArgs)
|
|
136
|
+
return axios.request<T, R>(axiosRequestArgs) as Promise<R>;
|
|
136
137
|
};
|
|
137
138
|
}
|
|
138
139
|
|
package/configuration.ts
CHANGED
|
@@ -21,6 +21,8 @@ export interface ConfigurationParameters {
|
|
|
21
21
|
basePath?: string;
|
|
22
22
|
baseOptions?: any;
|
|
23
23
|
formDataCtor?: new () => any;
|
|
24
|
+
cookieAuth?: boolean;
|
|
25
|
+
account?: string;
|
|
24
26
|
}
|
|
25
27
|
|
|
26
28
|
export class Configuration {
|
|
@@ -74,6 +76,22 @@ export class Configuration {
|
|
|
74
76
|
*/
|
|
75
77
|
formDataCtor?: new () => any;
|
|
76
78
|
|
|
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
|
+
|
|
77
95
|
constructor(param: ConfigurationParameters = {}) {
|
|
78
96
|
this.apiKey = param.apiKey;
|
|
79
97
|
this.username = param.username;
|
|
@@ -82,6 +100,8 @@ export class Configuration {
|
|
|
82
100
|
this.basePath = param.basePath;
|
|
83
101
|
this.baseOptions = param.baseOptions;
|
|
84
102
|
this.formDataCtor = param.formDataCtor;
|
|
103
|
+
this.cookieAuth = param.cookieAuth;
|
|
104
|
+
this.account = param.account;
|
|
85
105
|
}
|
|
86
106
|
|
|
87
107
|
/**
|
|
@@ -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, {}, 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, {}, 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, {}, 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, {}, 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, {}, 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, {}, any>>;
|
|
458
458
|
}
|