@pax2pay/client 0.10.24 → 0.10.26

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.
@@ -42,7 +42,7 @@ export class Connection {
42
42
  const body = this.prepareBody(request)
43
43
 
44
44
  try {
45
- const response = await fetch(url, { method, headers, body })
45
+ const response = await fetch(url, { method, headers, body, credentials: "include" })
46
46
 
47
47
  // Handle Side Effects (Cookies/2FA)
48
48
  this.handleSessionSideEffects(response)
@@ -107,11 +107,6 @@ export class Connection {
107
107
  headers["x-assume"] = this.assumedOrg
108
108
  }
109
109
 
110
- const cookie = window.localStorage.getItem("cookie")
111
- if (cookie) {
112
- headers["x-otp-cookie"] = cookie
113
- }
114
-
115
110
  const publicKey = Session.publicKey.get()
116
111
  if (publicKey) {
117
112
  headers["cde-public-key"] = publicKey
@@ -121,11 +116,6 @@ export class Connection {
121
116
  }
122
117
 
123
118
  private handleSessionSideEffects(response: Response): void {
124
- const otpCookie = response.headers.get("x-otp-cookie")
125
- if (otpCookie) {
126
- window.localStorage.setItem("cookie", otpCookie)
127
- }
128
-
129
119
  const isLoginPath = response.url.includes("login") || response.url.includes("sso/google")
130
120
  if (response.status === 403 && isLoginPath && response.headers.has("X-Auth-Token")) {
131
121
  Session.authentication.set({ token: response.headers.get("X-Auth-Token") ?? undefined })
package/Client/List.ts CHANGED
@@ -26,37 +26,37 @@ export abstract class List<Response extends { [key: string]: any }> {
26
26
  chosenSort?: string
27
27
  ) {
28
28
  const sort = chosenSort
29
- let page = chosenPage
30
- let size = chosenSize
31
- let result
29
+ let page: number
30
+ let size: number
31
+
32
32
  if (previous) {
33
33
  if (previous.hasNextPage() == false) {
34
34
  return new Paginated([], previous.totalCount, previous.page, previous.size, true)
35
35
  }
36
-
37
- page = previous.nextPage()
36
+ page = chosenPage ?? previous.nextPage()
38
37
  size = chosenSize ?? previous.size
39
38
  } else {
40
- page = page ?? 0
39
+ page = chosenPage ?? 0
41
40
  size = chosenSize ?? this.DEFAULT_PAGE_SIZE
42
41
  }
43
42
 
44
43
  const response = await callback(page, size, sort, request)
44
+
45
45
  if (model.ErrorResponse.is(response)) {
46
- result = response
47
- } else {
48
- let totalCount = -1
49
- let list: R[]
50
- if (!Array.isArray(response)) {
51
- list = response.list
52
- totalCount = response.totalCount
53
- } else {
54
- list = response
55
- }
46
+ return response
47
+ }
48
+
49
+ let totalCount = -1
50
+ let list: R[]
56
51
 
57
- result = new Paginated(list, totalCount, page, size, list.length < size)
52
+ if (!Array.isArray(response)) {
53
+ list = response.list
54
+ totalCount = response.totalCount
55
+ } else {
56
+ list = response
58
57
  }
59
- return result
58
+
59
+ return new Paginated(list, totalCount, page, size, list.length < size)
60
60
  }
61
61
 
62
62
  extractResponse<R = Response>(value: R[] | { list: R[]; totalCount: number } | model.ErrorResponse) {
@@ -40,7 +40,7 @@ export class Connection {
40
40
  const headers = this.prepareHeaders(request, overrides);
41
41
  const body = this.prepareBody(request);
42
42
  try {
43
- const response = await fetch(url, { method, headers, body });
43
+ const response = await fetch(url, { method, headers, body, credentials: "include" });
44
44
  this.handleSessionSideEffects(response);
45
45
  if (response.status === 401 && (await this.unauthorized(this))) {
46
46
  return this.fetch(path, method, request, parameters, overrides);
@@ -94,10 +94,6 @@ export class Connection {
94
94
  if (this.assumedOrg) {
95
95
  headers["x-assume"] = this.assumedOrg;
96
96
  }
97
- const cookie = window.localStorage.getItem("cookie");
98
- if (cookie) {
99
- headers["x-otp-cookie"] = cookie;
100
- }
101
97
  const publicKey = Session.publicKey.get();
102
98
  if (publicKey) {
103
99
  headers["cde-public-key"] = publicKey;
@@ -105,10 +101,6 @@ export class Connection {
105
101
  return headers;
106
102
  }
107
103
  handleSessionSideEffects(response) {
108
- const otpCookie = response.headers.get("x-otp-cookie");
109
- if (otpCookie) {
110
- window.localStorage.setItem("cookie", otpCookie);
111
- }
112
104
  const isLoginPath = response.url.includes("login") || response.url.includes("sso/google");
113
105
  if (response.status === 403 && isLoginPath && response.headers.has("X-Auth-Token")) {
114
106
  Session.authentication.set({ token: response.headers.get("X-Auth-Token") ?? undefined });
@@ -1 +1 @@
1
- {"version":3,"file":"Connection.js","sourceRoot":"../","sources":["Client/Connection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Connection.js","sourceRoot":"../","sources":["Client/Connection.ts"],"names":[],"mappings":"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"}
@@ -23,37 +23,33 @@ export class List {
23
23
  }
24
24
  async getNextPaginated(previous, callback, request, chosenPage, chosenSize, chosenSort) {
25
25
  const sort = chosenSort;
26
- let page = chosenPage;
27
- let size = chosenSize;
28
- let result;
26
+ let page;
27
+ let size;
29
28
  if (previous) {
30
29
  if (previous.hasNextPage() == false) {
31
30
  return new Paginated([], previous.totalCount, previous.page, previous.size, true);
32
31
  }
33
- page = previous.nextPage();
32
+ page = chosenPage ?? previous.nextPage();
34
33
  size = chosenSize ?? previous.size;
35
34
  }
36
35
  else {
37
- page = page ?? 0;
36
+ page = chosenPage ?? 0;
38
37
  size = chosenSize ?? this.DEFAULT_PAGE_SIZE;
39
38
  }
40
39
  const response = await callback(page, size, sort, request);
41
40
  if (model.ErrorResponse.is(response)) {
42
- result = response;
41
+ return response;
42
+ }
43
+ let totalCount = -1;
44
+ let list;
45
+ if (!Array.isArray(response)) {
46
+ list = response.list;
47
+ totalCount = response.totalCount;
43
48
  }
44
49
  else {
45
- let totalCount = -1;
46
- let list;
47
- if (!Array.isArray(response)) {
48
- list = response.list;
49
- totalCount = response.totalCount;
50
- }
51
- else {
52
- list = response;
53
- }
54
- result = new Paginated(list, totalCount, page, size, list.length < size);
50
+ list = response;
55
51
  }
56
- return result;
52
+ return new Paginated(list, totalCount, page, size, list.length < size);
57
53
  }
58
54
  extractResponse(value) {
59
55
  if (!model.ErrorResponse.is(value) && "list" in value) {
@@ -1 +1 @@
1
- {"version":3,"file":"List.js","sourceRoot":"../","sources":["Client/List.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAEjC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,MAAM,OAAgB,IAAI;IAGzB,IAAc,UAAU;QACvB,OAAO,uBAAA,IAAI,wBAAY,CAAA;IACxB,CAAC;IAED,YAAY,UAAsB;QAN1B,sBAAiB,GAAG,EAAE,CAAA;QAC9B,mCAAuB;QAMtB,uBAAA,IAAI,oBAAe,UAAU,MAAA,CAAA;IAC9B,CAAC;IACD,KAAK,CAAC,gBAAgB,CACrB,QAAkC,EAClC,QAK2E,EAC3E,OAA6B,EAC7B,UAAmB,EACnB,UAAmB,EACnB,UAAmB;QAEnB,MAAM,IAAI,GAAG,UAAU,CAAA;QACvB,IAAI,IAAI,GAAG,UAAU,CAAA;QACrB,IAAI,IAAI,GAAG,UAAU,CAAA;QACrB,IAAI,MAAM,CAAA;QACV,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,QAAQ,CAAC,WAAW,EAAE,IAAI,KAAK,EAAE,CAAC;gBACrC,OAAO,IAAI,SAAS,CAAC,EAAE,EAAE,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAClF,CAAC;YAED,IAAI,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAA;YAC1B,IAAI,GAAG,UAAU,IAAI,QAAQ,CAAC,IAAI,CAAA;QACnC,CAAC;aAAM,CAAC;YACP,IAAI,GAAG,IAAI,IAAI,CAAC,CAAA;YAChB,IAAI,GAAG,UAAU,IAAI,IAAI,CAAC,iBAAiB,CAAA;QAC5C,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;QAC1D,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,MAAM,GAAG,QAAQ,CAAA;QAClB,CAAC;aAAM,CAAC;YACP,IAAI,UAAU,GAAG,CAAC,CAAC,CAAA;YACnB,IAAI,IAAS,CAAA;YACb,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC9B,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAA;gBACpB,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAA;YACjC,CAAC;iBAAM,CAAC;gBACP,IAAI,GAAG,QAAQ,CAAA;YAChB,CAAC;YAED,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;QACzE,CAAC;QACD,OAAO,MAAM,CAAA;IACd,CAAC;IAED,eAAe,CAAe,KAAoE;QACjG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;YACvD,OAAO,KAAK,CAAC,IAAI,CAAA;QAClB,CAAC;aAAM,CAAC;YACP,OAAO,KAAK,CAAA;QACb,CAAC;IACF,CAAC;CACD"}
1
+ {"version":3,"file":"List.js","sourceRoot":"../","sources":["Client/List.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAEjC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,MAAM,OAAgB,IAAI;IAGzB,IAAc,UAAU;QACvB,OAAO,uBAAA,IAAI,wBAAY,CAAA;IACxB,CAAC;IAED,YAAY,UAAsB;QAN1B,sBAAiB,GAAG,EAAE,CAAA;QAC9B,mCAAuB;QAMtB,uBAAA,IAAI,oBAAe,UAAU,MAAA,CAAA;IAC9B,CAAC;IACD,KAAK,CAAC,gBAAgB,CACrB,QAAkC,EAClC,QAK2E,EAC3E,OAA6B,EAC7B,UAAmB,EACnB,UAAmB,EACnB,UAAmB;QAEnB,MAAM,IAAI,GAAG,UAAU,CAAA;QACvB,IAAI,IAAY,CAAA;QAChB,IAAI,IAAY,CAAA;QAEhB,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,QAAQ,CAAC,WAAW,EAAE,IAAI,KAAK,EAAE,CAAC;gBACrC,OAAO,IAAI,SAAS,CAAC,EAAE,EAAE,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAClF,CAAC;YACD,IAAI,GAAG,UAAU,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAA;YACxC,IAAI,GAAG,UAAU,IAAI,QAAQ,CAAC,IAAI,CAAA;QACnC,CAAC;aAAM,CAAC;YACP,IAAI,GAAG,UAAU,IAAI,CAAC,CAAA;YACtB,IAAI,GAAG,UAAU,IAAI,IAAI,CAAC,iBAAiB,CAAA;QAC5C,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;QAE1D,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,OAAO,QAAQ,CAAA;QAChB,CAAC;QAED,IAAI,UAAU,GAAG,CAAC,CAAC,CAAA;QACnB,IAAI,IAAS,CAAA;QAEb,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9B,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAA;YACpB,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAA;QACjC,CAAC;aAAM,CAAC;YACP,IAAI,GAAG,QAAQ,CAAA;QAChB,CAAC;QAED,OAAO,IAAI,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;IACvE,CAAC;IAED,eAAe,CAAe,KAAoE;QACjG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;YACvD,OAAO,KAAK,CAAC,IAAI,CAAA;QAClB,CAAC;aAAM,CAAC;YACP,OAAO,KAAK,CAAA;QACb,CAAC;IACF,CAAC;CACD"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pax2pay/client",
3
- "version": "0.10.24",
3
+ "version": "0.10.26",
4
4
  "description": "Client library for the Pax2Pay API",
5
5
  "author": "Pax2Pay Ltd.",
6
6
  "license": "MIT",
@@ -15,6 +15,7 @@
15
15
  "outDir": "dist",
16
16
  "moduleResolution": "node",
17
17
  "resolveJsonModule": true,
18
+ "strictPropertyInitialization": false,
18
19
  "paths": {
19
20
  "*": ["types/*"]
20
21
  }