@prosopo/provider 2.3.1 → 2.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (124) hide show
  1. package/dist/api/admin/apiAdminRoutesProvider.d.ts +9 -0
  2. package/dist/api/admin/apiAdminRoutesProvider.d.ts.map +1 -0
  3. package/dist/api/admin/apiAdminRoutesProvider.js +17 -0
  4. package/dist/api/admin/apiAdminRoutesProvider.js.map +1 -0
  5. package/dist/api/admin/apiRegisterSiteKeyEndpoint.d.ts +13 -0
  6. package/dist/api/admin/apiRegisterSiteKeyEndpoint.d.ts.map +1 -0
  7. package/dist/api/admin/apiRegisterSiteKeyEndpoint.js +20 -0
  8. package/dist/api/admin/apiRegisterSiteKeyEndpoint.js.map +1 -0
  9. package/dist/api/admin/createApiAdminRoutesProvider.d.ts +4 -0
  10. package/dist/api/admin/createApiAdminRoutesProvider.d.ts.map +1 -0
  11. package/dist/api/admin/createApiAdminRoutesProvider.js +7 -0
  12. package/dist/api/admin/createApiAdminRoutesProvider.js.map +1 -0
  13. package/dist/api/authMiddleware.d.ts.map +1 -1
  14. package/dist/api/authMiddleware.js +4 -1
  15. package/dist/api/authMiddleware.js.map +1 -1
  16. package/dist/api/blacklistRequestInspector.d.ts +19 -0
  17. package/dist/api/blacklistRequestInspector.d.ts.map +1 -0
  18. package/dist/api/blacklistRequestInspector.js +61 -0
  19. package/dist/api/blacklistRequestInspector.js.map +1 -0
  20. package/dist/api/block.d.ts +1 -2
  21. package/dist/api/block.d.ts.map +1 -1
  22. package/dist/api/block.js +13 -38
  23. package/dist/api/block.js.map +1 -1
  24. package/dist/api/captcha.d.ts.map +1 -1
  25. package/dist/api/captcha.js +85 -88
  26. package/dist/api/captcha.js.map +1 -1
  27. package/dist/api/domainMiddleware.d.ts.map +1 -1
  28. package/dist/api/domainMiddleware.js +7 -6
  29. package/dist/api/domainMiddleware.js.map +1 -1
  30. package/dist/api/headerCheckMiddleware.d.ts.map +1 -1
  31. package/dist/api/headerCheckMiddleware.js +5 -1
  32. package/dist/api/headerCheckMiddleware.js.map +1 -1
  33. package/dist/api/public.d.ts.map +1 -1
  34. package/dist/api/public.js +1 -2
  35. package/dist/api/public.js.map +1 -1
  36. package/dist/api/validateAddress.d.ts +4 -0
  37. package/dist/api/validateAddress.d.ts.map +1 -0
  38. package/dist/api/validateAddress.js +16 -0
  39. package/dist/api/validateAddress.js.map +1 -0
  40. package/dist/api/verify.d.ts.map +1 -1
  41. package/dist/api/verify.js +6 -14
  42. package/dist/api/verify.js.map +1 -1
  43. package/dist/index.d.ts +1 -2
  44. package/dist/index.d.ts.map +1 -1
  45. package/dist/index.js +1 -2
  46. package/dist/index.js.map +1 -1
  47. package/dist/tasks/captchaManager.d.ts +25 -0
  48. package/dist/tasks/captchaManager.d.ts.map +1 -0
  49. package/dist/tasks/captchaManager.js +81 -0
  50. package/dist/tasks/captchaManager.js.map +1 -0
  51. package/dist/tasks/client/clientTasks.d.ts +2 -7
  52. package/dist/tasks/client/clientTasks.d.ts.map +1 -1
  53. package/dist/tasks/client/clientTasks.js +5 -63
  54. package/dist/tasks/client/clientTasks.js.map +1 -1
  55. package/dist/tasks/frictionless/frictionlessTasks.d.ts +13 -9
  56. package/dist/tasks/frictionless/frictionlessTasks.d.ts.map +1 -1
  57. package/dist/tasks/frictionless/frictionlessTasks.js +54 -23
  58. package/dist/tasks/frictionless/frictionlessTasks.js.map +1 -1
  59. package/dist/tasks/frictionless/frictionlessTasksUtils.d.ts +5 -0
  60. package/dist/tasks/frictionless/frictionlessTasksUtils.d.ts.map +1 -0
  61. package/dist/tasks/frictionless/frictionlessTasksUtils.js +6 -0
  62. package/dist/tasks/frictionless/frictionlessTasksUtils.js.map +1 -0
  63. package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts +7 -8
  64. package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts.map +1 -1
  65. package/dist/tasks/imgCaptcha/imgCaptchaTasks.js +32 -12
  66. package/dist/tasks/imgCaptcha/imgCaptchaTasks.js.map +1 -1
  67. package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.d.ts +1 -3
  68. package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.d.ts.map +1 -1
  69. package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.js +0 -29
  70. package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.js.map +1 -1
  71. package/dist/tasks/powCaptcha/powTasks.d.ts +8 -5
  72. package/dist/tasks/powCaptcha/powTasks.d.ts.map +1 -1
  73. package/dist/tasks/powCaptcha/powTasks.js +22 -15
  74. package/dist/tasks/powCaptcha/powTasks.js.map +1 -1
  75. package/dist/tasks/tasks.d.ts.map +1 -1
  76. package/dist/tasks/tasks.js +3 -3
  77. package/dist/tasks/tasks.js.map +1 -1
  78. package/dist/tests/integration/imgCaptcha.integration.test.js +59 -7
  79. package/dist/tests/integration/imgCaptcha.integration.test.js.map +1 -1
  80. package/dist/tests/integration/powCaptcha.integration.test.js +57 -13
  81. package/dist/tests/integration/powCaptcha.integration.test.js.map +1 -1
  82. package/dist/tests/integration/registerSitekey.d.ts +2 -1
  83. package/dist/tests/integration/registerSitekey.d.ts.map +1 -1
  84. package/dist/tests/integration/registerSitekey.js +2 -2
  85. package/dist/tests/integration/registerSitekey.js.map +1 -1
  86. package/dist/tests/unit/api/authMiddleware.unit.test.js +7 -1
  87. package/dist/tests/unit/api/authMiddleware.unit.test.js.map +1 -1
  88. package/dist/tests/unit/tasks/captchaManager.unit.test.d.ts +2 -0
  89. package/dist/tests/unit/tasks/captchaManager.unit.test.d.ts.map +1 -0
  90. package/dist/tests/unit/tasks/captchaManager.unit.test.js +229 -0
  91. package/dist/tests/unit/tasks/captchaManager.unit.test.js.map +1 -0
  92. package/dist/tests/unit/tasks/frictionless/frictionlessTasks.unit.test.js +39 -64
  93. package/dist/tests/unit/tasks/frictionless/frictionlessTasks.unit.test.js.map +1 -1
  94. package/dist/tests/unit/tasks/frictionless/frictionlessTasksUtils.unit.test.d.ts +2 -0
  95. package/dist/tests/unit/tasks/frictionless/frictionlessTasksUtils.unit.test.d.ts.map +1 -0
  96. package/dist/tests/unit/tasks/frictionless/frictionlessTasksUtils.unit.test.js +37 -0
  97. package/dist/tests/unit/tasks/frictionless/frictionlessTasksUtils.unit.test.js.map +1 -0
  98. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.js +4 -4
  99. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.js.map +1 -1
  100. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.js +1 -101
  101. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.js.map +1 -1
  102. package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.js +5 -10
  103. package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.js.map +1 -1
  104. package/package.json +14 -11
  105. package/dist/api/admin.d.ts +0 -4
  106. package/dist/api/admin.d.ts.map +0 -1
  107. package/dist/api/admin.js +0 -87
  108. package/dist/api/admin.js.map +0 -1
  109. package/dist/api/errorHandler.d.ts +0 -5
  110. package/dist/api/errorHandler.d.ts.map +0 -1
  111. package/dist/api/errorHandler.js +0 -10
  112. package/dist/api/errorHandler.js.map +0 -1
  113. package/dist/rules/ip.d.ts +0 -4
  114. package/dist/rules/ip.d.ts.map +0 -1
  115. package/dist/rules/ip.js +0 -19
  116. package/dist/rules/ip.js.map +0 -1
  117. package/dist/rules/user.d.ts +0 -4
  118. package/dist/rules/user.d.ts.map +0 -1
  119. package/dist/rules/user.js +0 -10
  120. package/dist/rules/user.js.map +0 -1
  121. package/dist/tests/unit/api/errorHandler.unit.test.d.ts +0 -2
  122. package/dist/tests/unit/api/errorHandler.unit.test.d.ts.map +0 -1
  123. package/dist/tests/unit/api/errorHandler.unit.test.js +0 -105
  124. package/dist/tests/unit/api/errorHandler.unit.test.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"imgCaptchaTasksUtils.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"imgCaptchaTasksUtils.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EACN,iBAAiB,EACjB,0BAA0B,GAC1B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,sDAAsD,CAAC;AAEnG,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;IACnC,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;QACpD,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;QACd,IAAI,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;KAChC,CAAC,CAAC;IACH,0BAA0B,EAAE,EAAE,CAAC,EAAE,EAAE;CACnC,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC5C,MAAM,oBAAoB,GAAG;QAC5B,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE;QACjE,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE;KACjC,CAAC;IAElC,UAAU,CAAC,GAAG,EAAE;QACf,EAAE,CAAC,aAAa,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QAEzD,0BAAkC;aACjC,mBAAmB,CAAC,iBAAiB,CAAC;aACtC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;QAEzC,MAAM,MAAM,GAAG,2BAA2B,CAAC,oBAAoB,CAAC,CAAC;QAEjE,MAAM,CAAC,iBAAiB,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC7C,MAAM,CAAC,0BAA0B,CAAC,CAAC,oBAAoB,CACtD,oBAAoB,CAAC,CAAC,CAAC,CACvB,CAAC;QACF,MAAM,CAAC,0BAA0B,CAAC,CAAC,oBAAoB,CACtD,oBAAoB,CAAC,CAAC,CAAC,CACvB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACtB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;YACxB,YAAY,EAAE,gBAAgB;SAC9B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAE9D,iBAAyB,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;YACpD,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;YACd,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;SACpB,CAAC,CAAC,CAAC;QAEJ,MAAM,CAAC,GAAG,EAAE,CAAC,2BAA2B,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CACtE,IAAI,eAAe,CAClB,qDAAqD,EACrD;YACC,OAAO,EAAE;gBACR,cAAc,EAAE,6BAA6B;gBAC7C,YAAY,EAAE,IAAI;aAClB;SACD,CACD,CACD,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
@@ -1,5 +1,4 @@
1
1
  import { stringToHex, u8aToHex } from "@polkadot/util";
2
- import { ProsopoEnvError } from "@prosopo/common";
3
2
  import { ApiParams, CaptchaStatus, POW_SEPARATOR, } from "@prosopo/types";
4
3
  import { verifyRecency } from "@prosopo/util";
5
4
  import { beforeEach, describe, expect, it, vi } from "vitest";
@@ -39,7 +38,7 @@ describe("PowCaptchaManager", () => {
39
38
  sign: vi.fn(),
40
39
  address: "testAddress",
41
40
  };
42
- powCaptchaManager = new PowCaptchaManager(pair, db);
41
+ powCaptchaManager = new PowCaptchaManager(db, pair);
43
42
  vi.clearAllMocks();
44
43
  });
45
44
  describe("getPowCaptchaChallenge", () => {
@@ -185,25 +184,21 @@ describe("PowCaptchaManager", () => {
185
184
  db.getPowCaptchaRecordByChallenge.mockResolvedValue(challengeRecord);
186
185
  verifyRecency.mockImplementation(() => true);
187
186
  const result = await powCaptchaManager.serverVerifyPowCaptchaSolution(dappAccount, challenge, timeout);
188
- expect(result).toBe(true);
187
+ expect(result.verified).toBe(true);
189
188
  expect(db.getPowCaptchaRecordByChallenge).toHaveBeenCalledWith(challenge);
190
189
  expect(verifyRecency).toHaveBeenCalledWith(challenge, timeout);
191
190
  const markDappUserPoWCommitmentsCheckedArgs = [[challenge]];
192
191
  expect(db.markDappUserPoWCommitmentsChecked).toHaveBeenCalledWith(...markDappUserPoWCommitmentsCheckedArgs);
193
192
  });
194
- it("should throw an error if challenge record is not found", async () => {
193
+ it("should return verified:false if a challenge cannot be found", async () => {
195
194
  const dappAccount = "dappAccount";
196
195
  const timestamp = 123456678;
197
196
  const userAccount = "testUserAccount";
198
197
  const challenge = `${timestamp}${POW_SEPARATOR}${userAccount}${POW_SEPARATOR}${dappAccount}`;
199
198
  const timeout = 1000;
200
199
  db.getPowCaptchaRecordByChallenge.mockResolvedValue(null);
201
- await expect(powCaptchaManager.serverVerifyPowCaptchaSolution(dappAccount, challenge, timeout)).rejects.toThrow(new ProsopoEnvError("DATABASE.CAPTCHA_GET_FAILED", {
202
- context: {
203
- failedFuncName: "serverVerifyPowCaptchaSolution",
204
- challenge,
205
- },
206
- }));
200
+ const result = await powCaptchaManager.serverVerifyPowCaptchaSolution(dappAccount, challenge, timeout);
201
+ expect(result.verified).toBe(false);
207
202
  expect(db.getPowCaptchaRecordByChallenge).toHaveBeenCalledWith(challenge);
208
203
  });
209
204
  });
@@ -1 +1 @@
1
- {"version":3,"file":"powTasks.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/powCaptcha/powTasks.unit.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"powTasks.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/powCaptcha/powTasks.unit.test.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@prosopo/provider",
3
- "version": "2.3.1",
3
+ "version": "2.4.1",
4
4
  "author": "PROSOPO LIMITED <info@prosopo.io>",
5
5
  "license": "Apache-2.0",
6
6
  "main": "./dist/index.js",
@@ -27,16 +27,19 @@
27
27
  "@polkadot/keyring": "12.6.2",
28
28
  "@polkadot/util": "12.6.2",
29
29
  "@polkadot/util-crypto": "12.6.2",
30
- "@prosopo/common": "2.3.1",
31
- "@prosopo/config": "2.3.1",
32
- "@prosopo/keyring": "2.3.1",
33
- "@prosopo/database": "2.3.1",
34
- "@prosopo/datasets": "2.3.1",
35
- "@prosopo/env": "2.3.1",
36
- "@prosopo/types": "2.3.1",
37
- "@prosopo/types-database": "2.3.1",
38
- "@prosopo/types-env": "2.3.1",
39
- "@prosopo/util": "2.3.1",
30
+ "@prosopo/api-route": "2.4.1",
31
+ "@prosopo/api-express-router": "2.4.1",
32
+ "@prosopo/common": "2.4.1",
33
+ "@prosopo/config": "2.4.1",
34
+ "@prosopo/keyring": "2.4.1",
35
+ "@prosopo/database": "2.4.1",
36
+ "@prosopo/datasets": "2.4.1",
37
+ "@prosopo/env": "2.4.1",
38
+ "@prosopo/types": "2.4.1",
39
+ "@prosopo/types-database": "2.4.1",
40
+ "@prosopo/types-env": "2.4.1",
41
+ "@prosopo/util": "2.4.1",
42
+ "@prosopo/user-access-policy": "2.4.1",
40
43
  "cron": "3.1.7",
41
44
  "express": "4.21.1",
42
45
  "ip-address": "10.0.1",
@@ -1,4 +0,0 @@
1
- import type { ProviderEnvironment } from "@prosopo/types-env";
2
- import { Router } from "express";
3
- export declare function prosopoAdminRouter(env: ProviderEnvironment): Router;
4
- //# sourceMappingURL=admin.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../src/api/admin.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGjC,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CAkFnE"}
package/dist/api/admin.js DELETED
@@ -1,87 +0,0 @@
1
- import { logError } from "@prosopo/common";
2
- import { AddBlockRulesIPSpec, AddBlockRulesUserSpec, AdminApiPaths, RegisterSitekeyBody, RemoveBlockRulesIPSpec, RemoveBlockRulesUserSpec, } from "@prosopo/types";
3
- import { Router } from "express";
4
- import { Tasks } from "../index.js";
5
- export function prosopoAdminRouter(env) {
6
- const router = Router();
7
- const tasks = new Tasks(env);
8
- router.post(AdminApiPaths.SiteKeyRegister, async (req, res, next) => {
9
- try {
10
- tasks.logger.info("Registering site key, request body:");
11
- tasks.logger.info(req.body);
12
- const { siteKey, settings } = RegisterSitekeyBody.parse(req.body);
13
- const temp = settings || {};
14
- await tasks.clientTaskManager.registerSiteKey(siteKey, temp);
15
- const response = {
16
- status: "success",
17
- };
18
- res.json(response);
19
- }
20
- catch (err) {
21
- logError(err, tasks.logger);
22
- res.status(500).send("An internal server error occurred.");
23
- }
24
- });
25
- router.post(AdminApiPaths.BlockRuleIPAdd, async (req, res, next) => {
26
- try {
27
- tasks.logger.info("Adding block rules");
28
- const parsed = AddBlockRulesIPSpec.parse(req.body);
29
- await tasks.clientTaskManager.addIPBlockRules(parsed);
30
- const response = {
31
- status: "success",
32
- };
33
- res.json(response);
34
- }
35
- catch (err) {
36
- logError(err, tasks.logger);
37
- res.status(400).send("An internal server error occurred.");
38
- }
39
- });
40
- router.post(AdminApiPaths.BlockRuleIPRemove, async (req, res, next) => {
41
- try {
42
- tasks.logger.info("Removing block rules");
43
- const parsed = RemoveBlockRulesIPSpec.parse(req.body);
44
- await tasks.clientTaskManager.removeIPBlockRules(parsed);
45
- const response = {
46
- status: "success",
47
- };
48
- res.json(response);
49
- }
50
- catch (err) {
51
- logError(err, tasks.logger);
52
- res.status(400).send("An internal server error occurred.");
53
- }
54
- });
55
- router.post(AdminApiPaths.BlocKRuleUserAdd, async (req, res, next) => {
56
- try {
57
- tasks.logger.info("Adding block rules");
58
- const parsed = AddBlockRulesUserSpec.parse(req.body);
59
- await tasks.clientTaskManager.addUserBlockRules(parsed);
60
- const response = {
61
- status: "success",
62
- };
63
- res.json(response);
64
- }
65
- catch (err) {
66
- logError(err, tasks.logger);
67
- res.status(400).send("An internal server error occurred.");
68
- }
69
- });
70
- router.post(AdminApiPaths.BlockRuleUserRemove, async (req, res, next) => {
71
- try {
72
- tasks.logger.info("Removing block rules");
73
- const parsed = RemoveBlockRulesUserSpec.parse(req.body);
74
- await tasks.clientTaskManager.removeUserBlockRules(parsed);
75
- const response = {
76
- status: "success",
77
- };
78
- res.json(response);
79
- }
80
- catch (err) {
81
- logError(err, tasks.logger);
82
- res.status(400).send("An internal server error occurred.");
83
- }
84
- });
85
- return router;
86
- }
87
- //# sourceMappingURL=admin.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/api/admin.ts"],"names":[],"mappings":"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"}
@@ -1,5 +0,0 @@
1
- import { type ProsopoApiError } from "@prosopo/common";
2
- import type { NextFunction, Request, Response } from "express";
3
- import type { ZodError } from "zod";
4
- export declare const handleErrors: (err: ProsopoApiError | SyntaxError | ZodError, request: Request, response: Response, next: NextFunction) => void;
5
- //# sourceMappingURL=errorHandler.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../src/api/errorHandler.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,eAAe,EAAe,MAAM,iBAAiB,CAAC;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAEpC,eAAO,MAAM,YAAY,QACnB,eAAe,GAAG,WAAW,GAAG,QAAQ,WACpC,OAAO,YACN,QAAQ,QACZ,YAAY,SAQlB,CAAC"}
@@ -1,10 +0,0 @@
1
- import { unwrapError } from "@prosopo/common";
2
- export const handleErrors = (err, request, response, next) => {
3
- const { code, statusMessage, jsonError } = unwrapError(err);
4
- response.statusMessage = statusMessage;
5
- response.set("content-type", "application/json");
6
- response.status(code);
7
- response.send({ error: jsonError });
8
- response.end();
9
- };
10
- //# sourceMappingURL=errorHandler.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../src/api/errorHandler.ts"],"names":[],"mappings":"AAcA,OAAO,EAAwB,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAIpE,MAAM,CAAC,MAAM,YAAY,GAAG,CAC3B,GAA6C,EAC7C,OAAgB,EAChB,QAAkB,EAClB,IAAkB,EACjB,EAAE;IACH,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IAC5D,QAAQ,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IACjD,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,CAAC;AAChB,CAAC,CAAC"}
@@ -1,4 +0,0 @@
1
- import type { BlockRule, IPAddress } from "@prosopo/types";
2
- import type { IProviderDatabase } from "@prosopo/types-database";
3
- export declare const checkIpRules: (db: IProviderDatabase, ipAddress: IPAddress, dapp: string) => Promise<BlockRule | undefined>;
4
- //# sourceMappingURL=ip.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"ip.d.ts","sourceRoot":"","sources":["../../src/rules/ip.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,eAAO,MAAM,YAAY,OACpB,iBAAiB,aACV,SAAS,QACd,MAAM,KACV,OAAO,CAAC,SAAS,GAAG,SAAS,CAwB/B,CAAC"}
package/dist/rules/ip.js DELETED
@@ -1,19 +0,0 @@
1
- export const checkIpRules = async (db, ipAddress, dapp) => {
2
- const rule = await db.getIPBlockRuleRecord(ipAddress.bigInt());
3
- if (rule && BigInt(rule.ip) === ipAddress.bigInt()) {
4
- if (rule.global) {
5
- return rule;
6
- }
7
- if (rule.dappAccount === dapp) {
8
- return rule;
9
- }
10
- }
11
- const dappRule = await db.getIPBlockRuleRecord(ipAddress.bigInt(), dapp);
12
- if (dappRule &&
13
- dappRule.dappAccount === dapp &&
14
- BigInt(dappRule.ip) === ipAddress.bigInt()) {
15
- return rule;
16
- }
17
- return undefined;
18
- };
19
- //# sourceMappingURL=ip.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"ip.js","sourceRoot":"","sources":["../../src/rules/ip.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAChC,EAAqB,EACrB,SAAoB,EACpB,IAAY,EACqB,EAAE;IACnC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;IAE/D,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;QAEpD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACb,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;IACzE,IACC,QAAQ;QACR,QAAQ,CAAC,WAAW,KAAK,IAAI;QAC7B,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,SAAS,CAAC,MAAM,EAAE,EACzC,CAAC;QACF,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC"}
@@ -1,4 +0,0 @@
1
- import type { BlockRule } from "@prosopo/types";
2
- import type { IProviderDatabase } from "@prosopo/types-database";
3
- export declare const checkUserRules: (db: IProviderDatabase, user: string, dapp: string) => Promise<BlockRule | undefined>;
4
- //# sourceMappingURL=user.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/rules/user.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,eAAO,MAAM,cAAc,OACtB,iBAAiB,QACf,MAAM,QACN,MAAM,KACV,OAAO,CAAC,SAAS,GAAG,SAAS,CAW/B,CAAC"}
@@ -1,10 +0,0 @@
1
- export const checkUserRules = async (db, user, dapp) => {
2
- const userRule = await db.getUserBlockRuleRecord(user, dapp);
3
- if (userRule &&
4
- userRule.userAccount === user &&
5
- userRule.dappAccount === dapp) {
6
- return userRule;
7
- }
8
- return undefined;
9
- };
10
- //# sourceMappingURL=user.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/rules/user.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAClC,EAAqB,EACrB,IAAY,EACZ,IAAY,EACqB,EAAE;IACnC,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAE7D,IACC,QAAQ;QACR,QAAQ,CAAC,WAAW,KAAK,IAAI;QAC7B,QAAQ,CAAC,WAAW,KAAK,IAAI,EAC5B,CAAC;QACF,OAAO,QAAQ,CAAC;IACjB,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=errorHandler.unit.test.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"errorHandler.unit.test.d.ts","sourceRoot":"","sources":["../../../../src/tests/unit/api/errorHandler.unit.test.ts"],"names":[],"mappings":""}
@@ -1,105 +0,0 @@
1
- import { ProsopoApiError, ProsopoEnvError, } from "@prosopo/common";
2
- import { describe, expect, it, vi } from "vitest";
3
- import { ZodError } from "zod";
4
- import { handleErrors } from "../../../api/errorHandler.js";
5
- describe("handleErrors", () => {
6
- it("should handle ProsopoApiError", () => {
7
- const mockRequest = {};
8
- const mockResponse = {
9
- writeHead: vi.fn().mockReturnThis(),
10
- set: vi.fn().mockReturnThis(),
11
- status: vi.fn().mockReturnThis(),
12
- send: vi.fn(),
13
- end: vi.fn(),
14
- };
15
- const mockNext = vi.fn();
16
- const error = new ProsopoApiError("CONTRACT.INVALID_DATA_FORMAT", {
17
- context: { code: 400 },
18
- });
19
- console.log(error);
20
- handleErrors(error, mockRequest, mockResponse, mockNext);
21
- expect(mockResponse.set).toHaveBeenCalledWith("content-type", "application/json");
22
- expect(mockResponse.send).toHaveBeenCalledWith({
23
- error: {
24
- code: 400,
25
- key: "CONTRACT.INVALID_DATA_FORMAT",
26
- message: "Invalid data format",
27
- },
28
- });
29
- expect(mockResponse.status).toHaveBeenCalledWith(400);
30
- expect(mockResponse.end).toHaveBeenCalled();
31
- });
32
- it("should handle SyntaxError", () => {
33
- const mockRequest = {};
34
- const mockResponse = {
35
- writeHead: vi.fn().mockReturnThis(),
36
- set: vi.fn().mockReturnThis(),
37
- status: vi.fn().mockReturnThis(),
38
- send: vi.fn(),
39
- end: vi.fn(),
40
- };
41
- const mockNext = vi.fn();
42
- const [len, max] = [100, 50];
43
- const message = `Input length: ${len}, exceeds maximum allowed length: ${max}`;
44
- const error = new SyntaxError(message);
45
- handleErrors(error, mockRequest, mockResponse, mockNext);
46
- expect(mockResponse.set).toHaveBeenCalledWith("content-type", "application/json");
47
- expect(mockResponse.status).toHaveBeenCalledWith(400);
48
- expect(mockResponse.send).toHaveBeenCalledWith({
49
- error: {
50
- message,
51
- code: 400,
52
- },
53
- });
54
- expect(mockResponse.end).toHaveBeenCalled();
55
- });
56
- it("should handle ZodError", () => {
57
- const mockRequest = {};
58
- const mockResponse = {
59
- writeHead: vi.fn().mockReturnThis(),
60
- set: vi.fn().mockReturnThis(),
61
- status: vi.fn().mockReturnThis(),
62
- send: vi.fn(),
63
- end: vi.fn(),
64
- };
65
- const mockNext = vi.fn();
66
- const zodError = {
67
- code: "custom",
68
- message: "Invalid input",
69
- path: ["some", "variable"],
70
- };
71
- const error = new ZodError([zodError]);
72
- handleErrors(error, mockRequest, mockResponse, mockNext);
73
- expect(mockResponse.set).toHaveBeenCalledWith("content-type", "application/json");
74
- expect(mockResponse.status).toHaveBeenCalledWith(400);
75
- expect(mockResponse.send).toHaveBeenCalledWith({
76
- error: { code: 400, message: [zodError] },
77
- });
78
- expect(mockResponse.end).toHaveBeenCalled();
79
- });
80
- it("should unwrap nested ProsopoBaseError", () => {
81
- const mockRequest = {};
82
- const mockResponse = {
83
- writeHead: vi.fn().mockReturnThis(),
84
- set: vi.fn().mockReturnThis(),
85
- status: vi.fn().mockReturnThis(),
86
- send: vi.fn(),
87
- end: vi.fn(),
88
- };
89
- const mockNext = vi.fn();
90
- const envError = new ProsopoEnvError("GENERAL.ENVIRONMENT_NOT_READY");
91
- const apiError = new ProsopoApiError(envError);
92
- handleErrors(apiError, mockRequest, mockResponse, mockNext);
93
- expect(mockResponse.set).toHaveBeenCalledWith("content-type", "application/json");
94
- expect(mockResponse.status).toHaveBeenCalledWith(500);
95
- expect(mockResponse.send).toHaveBeenCalledWith({
96
- error: {
97
- code: 500,
98
- key: "GENERAL.ENVIRONMENT_NOT_READY",
99
- message: "Environment not ready",
100
- },
101
- });
102
- expect(mockResponse.end).toHaveBeenCalled();
103
- });
104
- });
105
- //# sourceMappingURL=errorHandler.unit.test.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"errorHandler.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/api/errorHandler.unit.test.ts"],"names":[],"mappings":"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"}