@emilgroup/payment-sdk 1.22.1-beta.81 → 1.22.1-beta.83

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.
Files changed (137) hide show
  1. package/.openapi-generator/FILES +0 -6
  2. package/README.md +2 -2
  3. package/api/bank-accounts-api.ts +18 -48
  4. package/api/bank-orders-api.ts +15 -40
  5. package/api/bank-transaction-api.ts +26 -181
  6. package/api/billing-addresses-api.ts +15 -40
  7. package/api/credit-allocation-api.ts +9 -24
  8. package/api/exceeding-credits-api.ts +6 -128
  9. package/api/health-check-api.ts +1 -1
  10. package/api/ibanvalidator-api.ts +3 -8
  11. package/api/payment-methods-api.ts +9 -24
  12. package/api/payment-receipts-api.ts +15 -40
  13. package/api/payment-reminders-api.ts +12 -32
  14. package/api/payment-requests-api.ts +27 -52
  15. package/api/payment-setup-api.ts +6 -16
  16. package/api/payments-api.ts +16 -46
  17. package/api/payout-methods-api.ts +18 -48
  18. package/api/policy-payment-methods-api.ts +9 -24
  19. package/api/refunds-api.ts +9 -24
  20. package/api/tenant-bank-account-api.ts +15 -40
  21. package/api/webhooks-api.ts +2 -2
  22. package/base.ts +43 -239
  23. package/common.ts +2 -3
  24. package/configuration.ts +0 -20
  25. package/dist/api/bank-accounts-api.d.ts +6 -6
  26. package/dist/api/bank-accounts-api.js +46 -82
  27. package/dist/api/bank-orders-api.d.ts +5 -5
  28. package/dist/api/bank-orders-api.js +38 -67
  29. package/dist/api/bank-transaction-api.d.ts +14 -80
  30. package/dist/api/bank-transaction-api.js +52 -194
  31. package/dist/api/billing-addresses-api.d.ts +5 -5
  32. package/dist/api/billing-addresses-api.js +39 -71
  33. package/dist/api/credit-allocation-api.d.ts +3 -3
  34. package/dist/api/credit-allocation-api.js +23 -41
  35. package/dist/api/exceeding-credits-api.d.ts +2 -59
  36. package/dist/api/exceeding-credits-api.js +15 -126
  37. package/dist/api/health-check-api.d.ts +1 -1
  38. package/dist/api/health-check-api.js +1 -1
  39. package/dist/api/ibanvalidator-api.d.ts +1 -1
  40. package/dist/api/ibanvalidator-api.js +8 -15
  41. package/dist/api/payment-methods-api.d.ts +3 -3
  42. package/dist/api/payment-methods-api.js +23 -41
  43. package/dist/api/payment-receipts-api.d.ts +5 -5
  44. package/dist/api/payment-receipts-api.js +38 -67
  45. package/dist/api/payment-reminders-api.d.ts +4 -4
  46. package/dist/api/payment-reminders-api.js +31 -56
  47. package/dist/api/payment-requests-api.d.ts +17 -17
  48. package/dist/api/payment-requests-api.js +47 -76
  49. package/dist/api/payment-setup-api.d.ts +2 -2
  50. package/dist/api/payment-setup-api.js +16 -30
  51. package/dist/api/payments-api.d.ts +4 -4
  52. package/dist/api/payments-api.js +34 -62
  53. package/dist/api/payout-methods-api.d.ts +6 -6
  54. package/dist/api/payout-methods-api.js +46 -82
  55. package/dist/api/policy-payment-methods-api.d.ts +3 -3
  56. package/dist/api/policy-payment-methods-api.js +23 -41
  57. package/dist/api/refunds-api.d.ts +3 -3
  58. package/dist/api/refunds-api.js +22 -37
  59. package/dist/api/tenant-bank-account-api.d.ts +5 -5
  60. package/dist/api/tenant-bank-account-api.js +38 -67
  61. package/dist/api/webhooks-api.d.ts +2 -2
  62. package/dist/api/webhooks-api.js +2 -2
  63. package/dist/base.d.ts +0 -26
  64. package/dist/base.js +60 -243
  65. package/dist/common.d.ts +1 -1
  66. package/dist/common.js +0 -1
  67. package/dist/configuration.d.ts +0 -17
  68. package/dist/configuration.js +0 -2
  69. package/dist/models/bank-transaction-class.d.ts +0 -7
  70. package/dist/models/bank-transaction-entity.d.ts +0 -7
  71. package/dist/models/bank-transaction-invoice-entity.d.ts +0 -24
  72. package/dist/models/create-payment-order-dto.d.ts +1 -1
  73. package/dist/models/create-payment-receipt-request-dto.d.ts +3 -3
  74. package/dist/models/create-payment-request-dto.d.ts +1 -1
  75. package/dist/models/create-payment-request-request-dto.d.ts +0 -6
  76. package/dist/models/credit-allocation-class.d.ts +0 -6
  77. package/dist/models/credit-allocation-entity.d.ts +0 -6
  78. package/dist/models/exceeding-credit-entity.d.ts +0 -6
  79. package/dist/models/index.d.ts +0 -6
  80. package/dist/models/index.js +0 -6
  81. package/dist/models/list-billing-addresses-response-class.d.ts +9 -9
  82. package/dist/models/list-exceeding-credits-response-class.d.ts +18 -6
  83. package/dist/models/list-payment-receipts-response-class.d.ts +9 -9
  84. package/dist/models/list-payment-requests-response-class.d.ts +18 -6
  85. package/dist/models/list-payout-methods-response-class.d.ts +9 -9
  86. package/dist/models/list-refunds-response-class.d.ts +18 -6
  87. package/dist/models/payment-class-without-expand-properties.d.ts +2 -2
  88. package/dist/models/payment-class.d.ts +2 -2
  89. package/dist/models/payment-entity.d.ts +1 -1
  90. package/dist/models/payment-receipt-class.d.ts +1 -13
  91. package/dist/models/payment-request-class.d.ts +6 -13
  92. package/dist/models/payment-request-class.js +0 -1
  93. package/dist/models/shared-transaction-class.d.ts +0 -6
  94. package/dist/models/transaction-entity.d.ts +0 -6
  95. package/models/bank-transaction-class.ts +0 -7
  96. package/models/bank-transaction-entity.ts +0 -7
  97. package/models/bank-transaction-invoice-entity.ts +0 -24
  98. package/models/create-payment-order-dto.ts +1 -1
  99. package/models/create-payment-receipt-request-dto.ts +3 -3
  100. package/models/create-payment-request-dto.ts +1 -1
  101. package/models/create-payment-request-request-dto.ts +0 -6
  102. package/models/credit-allocation-class.ts +0 -6
  103. package/models/credit-allocation-entity.ts +0 -6
  104. package/models/exceeding-credit-entity.ts +0 -6
  105. package/models/index.ts +0 -6
  106. package/models/list-billing-addresses-response-class.ts +9 -9
  107. package/models/list-exceeding-credits-response-class.ts +18 -6
  108. package/models/list-payment-receipts-response-class.ts +9 -9
  109. package/models/list-payment-requests-response-class.ts +18 -6
  110. package/models/list-payout-methods-response-class.ts +9 -9
  111. package/models/list-refunds-response-class.ts +18 -6
  112. package/models/payment-class-without-expand-properties.ts +2 -2
  113. package/models/payment-class.ts +2 -2
  114. package/models/payment-entity.ts +1 -1
  115. package/models/payment-receipt-class.ts +1 -13
  116. package/models/payment-request-class.ts +6 -13
  117. package/models/shared-transaction-class.ts +0 -6
  118. package/models/transaction-entity.ts +0 -6
  119. package/package.json +2 -2
  120. package/dist/models/create-exceeding-credit-request-dto.d.ts +0 -48
  121. package/dist/models/create-exceeding-credit-request-dto.js +0 -15
  122. package/dist/models/create-exceeding-credit-response-class.d.ts +0 -25
  123. package/dist/models/create-exceeding-credit-response-class.js +0 -15
  124. package/dist/models/link-bank-transaction-payment-requests-request-dto-rest.d.ts +0 -30
  125. package/dist/models/link-bank-transaction-payment-requests-request-dto-rest.js +0 -15
  126. package/dist/models/link-bank-transaction-payment-requests-response-class.d.ts +0 -25
  127. package/dist/models/link-bank-transaction-payment-requests-response-class.js +0 -15
  128. package/dist/models/payment-receipt-entity.d.ts +0 -139
  129. package/dist/models/payment-receipt-entity.js +0 -20
  130. package/dist/models/payment-request-entity.d.ts +0 -223
  131. package/dist/models/payment-request-entity.js +0 -39
  132. package/models/create-exceeding-credit-request-dto.ts +0 -54
  133. package/models/create-exceeding-credit-response-class.ts +0 -31
  134. package/models/link-bank-transaction-payment-requests-request-dto-rest.ts +0 -36
  135. package/models/link-bank-transaction-payment-requests-response-class.ts +0 -31
  136. package/models/payment-receipt-entity.ts +0 -148
  137. package/models/payment-request-entity.ts +0 -233
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 {
@@ -72,10 +59,6 @@ export enum Environment {
72
59
  let _retry_count = 0
73
60
  let _retry = null
74
61
 
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
-
79
62
  export function resetRetry() {
80
63
  _retry_count = 0
81
64
  }
@@ -94,19 +77,10 @@ interface TokenData {
94
77
  accessToken?: string;
95
78
  username?: string;
96
79
  permissions?: string;
97
- // 'both' or 'session' when authservice keeps the tokens in a server session.
98
- authMode?: string;
99
- sub?: string;
100
80
  }
101
81
 
102
82
  const NETWORK_ERROR_MESSAGE = "Network Error";
103
83
  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'];
110
84
 
111
85
  /**
112
86
  *
@@ -124,31 +98,14 @@ export class BaseAPI {
124
98
  this.loadTokenData();
125
99
 
126
100
  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
- }
136
101
  const { accessToken } = this.tokenData;
137
102
  this.configuration = configuration;
138
103
  this.basePath = configuration.basePath || this.basePath;
139
104
 
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
- }
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;
152
109
  } else {
153
110
  const { accessToken, username } = this.tokenData;
154
111
 
@@ -162,110 +119,6 @@ export class BaseAPI {
162
119
  this.attachInterceptor(axios);
163
120
  }
164
121
 
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
-
269
122
  selectEnvironment(env: Environment) {
270
123
  this.selectBasePath(env);
271
124
  }
@@ -285,8 +138,8 @@ export class BaseAPI {
285
138
  async authorize(username: string, password: string, targetWorkspace?: string): Promise<void> {
286
139
  const options: AxiosRequestConfig = {
287
140
  method: 'POST',
288
- url: `${this.authBasePath()}/authservice/v1/login`,
289
- headers: { 'Content-Type': 'application/json', ...(this.configuration.cookieAuth && { [AUTH_MODE_HEADER]: 'session' }) },
141
+ url: `${this.configuration.basePath}/authservice/v1/login`,
142
+ headers: { 'Content-Type': 'application/json' },
290
143
  data: {
291
144
  username,
292
145
  password,
@@ -296,10 +149,13 @@ export class BaseAPI {
296
149
 
297
150
  const response = await globalAxios.request<LoginClass>(options);
298
151
 
152
+ const { data: { accessToken, permissions } } = response;
153
+
299
154
  this.configuration.username = username;
155
+ this.configuration.accessToken = `Bearer ${accessToken}`;
300
156
  this.tokenData.username = username;
301
- this.tokenData.permissions = response.data.permissions;
302
- this.applyTokenReply(response.data);
157
+ this.tokenData.accessToken = accessToken;
158
+ this.tokenData.permissions = permissions;
303
159
 
304
160
  // Switch workspace if provided
305
161
  if (targetWorkspace) {
@@ -319,11 +175,10 @@ export class BaseAPI {
319
175
  async switchWorkspace(targetWorkspace: string): Promise<void> {
320
176
  const options: AxiosRequestConfig = {
321
177
  method: 'POST',
322
- url: `${this.authBasePath()}/authservice/v1/workspaces/switch`,
178
+ url: `${this.configuration.basePath}/authservice/v1/workspaces/switch`,
323
179
  headers: {
324
180
  'Content-Type': 'application/json',
325
- ...this.sessionHeaders(),
326
- ...(!this.usesSession() && !!this.configuration.accessToken && { 'Authorization': this.configuration.accessToken as string }),
181
+ 'Authorization': `Bearer ${this.configuration.accessToken}`,
327
182
  },
328
183
  data: {
329
184
  username: this.configuration.username,
@@ -334,8 +189,11 @@ export class BaseAPI {
334
189
 
335
190
  const response = await globalAxios.request<SwitchWorkspaceResponseClass>(options);
336
191
 
337
- this.tokenData.permissions = response.data.permissions;
338
- this.applyTokenReply(response.data);
192
+ const { data: { accessToken, permissions } } = response;
193
+
194
+ this.configuration.accessToken = `Bearer ${accessToken}`;
195
+ this.tokenData.accessToken = accessToken;
196
+ this.tokenData.permissions = permissions;
339
197
 
340
198
  this.storeTokenData({
341
199
  ...this.tokenData
@@ -351,34 +209,9 @@ export class BaseAPI {
351
209
 
352
210
  const refreshTokenAxios = globalAxios.create()
353
211
  refreshTokenAxios.interceptors.response.use(response => {
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
- }
212
+ const { permissions } = response.data;
213
+
373
214
  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
- }
382
215
  this.storeTokenData(this.tokenData);
383
216
 
384
217
  return response;
@@ -386,10 +219,9 @@ export class BaseAPI {
386
219
 
387
220
  const options: AxiosRequestConfig = {
388
221
  method: 'POST',
389
- url: `${this.authBasePath()}/authservice/v1/refresh-token`,
222
+ url: `${this.configuration.basePath}/authservice/v1/refresh-token`,
390
223
  headers: {
391
224
  'Content-Type': 'application/json',
392
- ...this.sessionHeaders(),
393
225
  },
394
226
  data: { username: username },
395
227
  withCredentials: true,
@@ -417,18 +249,6 @@ export class BaseAPI {
417
249
  this.storeTokenData(null);
418
250
  }
419
251
 
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
-
432
252
  private attachInterceptor(axios: AxiosInstance) {
433
253
  axios.interceptors.response.use(
434
254
  (res) => {
@@ -436,33 +256,26 @@ export class BaseAPI {
436
256
  },
437
257
  async (err) => {
438
258
  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
- }
444
259
  if (err.response && !(err.response instanceof XMLHttpRequest)) { // sometimes buggy and is of type request
445
260
  // Access Token was expired
446
261
  if ((err.response.status === 401 || err.response.status === 403)
447
262
  && !originalConfig._retry) {
448
263
  originalConfig._retry = true;
449
264
  try {
450
- const reply = await this.refreshTokenInternal();
451
- this.tokenData.permissions = reply.permissions;
452
- this.applyTokenReply(reply, true);
453
- this.storeTokenData(this.tokenData);
265
+ const { accessToken: tokenString, permissions } = await this.refreshTokenInternal();
266
+ const accessToken = `Bearer ${tokenString}`;
267
+ this.tokenData.permissions = permissions;
454
268
 
455
- if (!this.usesSession()) {
456
- return axios(this.withCurrentAuth(originalConfig));
457
- }
269
+ delete originalConfig.headers['Authorization']
270
+
271
+ originalConfig.headers['Authorization'] = accessToken;
272
+
273
+ this.configuration.accessToken = accessToken;
274
+ this.tokenData.accessToken = tokenString;
275
+
276
+ this.storeTokenData(this.tokenData);
458
277
 
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
- });
278
+ return axios(originalConfig);
466
279
  } catch (_error) {
467
280
  if (_error.response && _error.response.data) {
468
281
  return Promise.reject(_error.response.data);
@@ -470,35 +283,26 @@ export class BaseAPI {
470
283
  return Promise.reject(_error);
471
284
  }
472
285
  }
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);
480
286
  } else if (err.message === NETWORK_ERROR_MESSAGE
481
- && (originalConfig.headers.hasOwnProperty('Authorization')
482
- || (this.configuration.cookieAuth && originalConfig.withCredentials && this.canResend(originalConfig)))
287
+ && originalConfig.headers.hasOwnProperty('Authorization')
483
288
  && _retry_count < 4
484
289
  ) {
485
290
  _retry_count++;
486
291
  try {
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;
292
+ const { accessToken: tokenString, permissions } = await this.refreshTokenInternal();
293
+ const accessToken = `Bearer ${tokenString}`;
294
+ this.tokenData.permissions = permissions;
490
295
 
491
296
  _retry = true;
492
- this.applyTokenReply(reply, true);
297
+ originalConfig.headers['Authorization'] = accessToken;
298
+
299
+ this.configuration.accessToken = accessToken;
300
+ this.tokenData.accessToken = tokenString;
301
+
493
302
  this.storeTokenData(this.tokenData);
494
303
 
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.
497
304
  return axios.request({
498
- ...this.withCurrentAuth(originalConfig),
499
- }).then((retried) => {
500
- _retry_count = 0;
501
- return retried;
305
+ ...originalConfig,
502
306
  });
503
307
  } catch (_error) {
504
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
- // 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> => {
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) as Promise<R>;
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, {}, 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, {}, 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, {}, 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, {}, 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, {}, 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, {}, any>>;
457
+ updateBankAccount(requestParameters: BankAccountsApiUpdateBankAccountRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<UpdateBankAccountResponseClass, any, {}>>;
458
458
  }