@prosopo/provider 2.3.2 → 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.
- package/dist/api/admin/apiRegisterSiteKeyEndpoint.d.ts.map +1 -1
- package/dist/api/admin/apiRegisterSiteKeyEndpoint.js +4 -4
- package/dist/api/admin/apiRegisterSiteKeyEndpoint.js.map +1 -1
- package/dist/api/admin/createApiAdminRoutesProvider.d.ts +1 -2
- package/dist/api/admin/createApiAdminRoutesProvider.d.ts.map +1 -1
- package/dist/api/admin/createApiAdminRoutesProvider.js +1 -2
- package/dist/api/admin/createApiAdminRoutesProvider.js.map +1 -1
- package/dist/api/authMiddleware.d.ts.map +1 -1
- package/dist/api/authMiddleware.js +4 -1
- package/dist/api/authMiddleware.js.map +1 -1
- package/dist/api/captcha.d.ts.map +1 -1
- package/dist/api/captcha.js +81 -83
- package/dist/api/captcha.js.map +1 -1
- package/dist/api/domainMiddleware.d.ts.map +1 -1
- package/dist/api/domainMiddleware.js +7 -6
- package/dist/api/domainMiddleware.js.map +1 -1
- package/dist/api/headerCheckMiddleware.d.ts.map +1 -1
- package/dist/api/headerCheckMiddleware.js +5 -1
- package/dist/api/headerCheckMiddleware.js.map +1 -1
- package/dist/api/public.d.ts.map +1 -1
- package/dist/api/public.js +1 -2
- package/dist/api/public.js.map +1 -1
- package/dist/api/validateAddress.d.ts +4 -0
- package/dist/api/validateAddress.d.ts.map +1 -0
- package/dist/api/validateAddress.js +16 -0
- package/dist/api/validateAddress.js.map +1 -0
- package/dist/api/verify.d.ts.map +1 -1
- package/dist/api/verify.js +6 -14
- package/dist/api/verify.js.map +1 -1
- package/dist/index.d.ts +1 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -2
- package/dist/index.js.map +1 -1
- package/dist/tasks/captchaManager.d.ts +25 -0
- package/dist/tasks/captchaManager.d.ts.map +1 -0
- package/dist/tasks/captchaManager.js +81 -0
- package/dist/tasks/captchaManager.js.map +1 -0
- package/dist/tasks/client/clientTasks.d.ts +2 -3
- package/dist/tasks/client/clientTasks.d.ts.map +1 -1
- package/dist/tasks/client/clientTasks.js +4 -12
- package/dist/tasks/client/clientTasks.js.map +1 -1
- package/dist/tasks/frictionless/frictionlessTasks.d.ts +13 -7
- package/dist/tasks/frictionless/frictionlessTasks.d.ts.map +1 -1
- package/dist/tasks/frictionless/frictionlessTasks.js +54 -13
- package/dist/tasks/frictionless/frictionlessTasks.js.map +1 -1
- package/dist/tasks/frictionless/frictionlessTasksUtils.d.ts +5 -0
- package/dist/tasks/frictionless/frictionlessTasksUtils.d.ts.map +1 -0
- package/dist/tasks/frictionless/frictionlessTasksUtils.js +6 -0
- package/dist/tasks/frictionless/frictionlessTasksUtils.js.map +1 -0
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts +7 -8
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.js +32 -12
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.js.map +1 -1
- package/dist/tasks/powCaptcha/powTasks.d.ts +8 -5
- package/dist/tasks/powCaptcha/powTasks.d.ts.map +1 -1
- package/dist/tasks/powCaptcha/powTasks.js +22 -15
- package/dist/tasks/powCaptcha/powTasks.js.map +1 -1
- package/dist/tasks/tasks.d.ts.map +1 -1
- package/dist/tasks/tasks.js +3 -3
- package/dist/tasks/tasks.js.map +1 -1
- package/dist/tests/integration/imgCaptcha.integration.test.js +59 -7
- package/dist/tests/integration/imgCaptcha.integration.test.js.map +1 -1
- package/dist/tests/integration/powCaptcha.integration.test.js +57 -13
- package/dist/tests/integration/powCaptcha.integration.test.js.map +1 -1
- package/dist/tests/integration/registerSitekey.d.ts +2 -1
- package/dist/tests/integration/registerSitekey.d.ts.map +1 -1
- package/dist/tests/integration/registerSitekey.js +2 -2
- package/dist/tests/integration/registerSitekey.js.map +1 -1
- package/dist/tests/unit/api/authMiddleware.unit.test.js +7 -1
- package/dist/tests/unit/api/authMiddleware.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/captchaManager.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/captchaManager.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/captchaManager.unit.test.js +229 -0
- package/dist/tests/unit/tasks/captchaManager.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/frictionless/frictionlessTasks.unit.test.js +41 -7
- package/dist/tests/unit/tasks/frictionless/frictionlessTasks.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/frictionless/frictionlessTasksUtils.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/frictionless/frictionlessTasksUtils.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/frictionless/frictionlessTasksUtils.unit.test.js +37 -0
- package/dist/tests/unit/tasks/frictionless/frictionlessTasksUtils.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.js +4 -4
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.js +5 -10
- package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.js.map +1 -1
- package/package.json +14 -13
- package/dist/api/admin/export.d.ts +0 -3
- package/dist/api/admin/export.d.ts.map +0 -1
- package/dist/api/admin/export.js +0 -3
- package/dist/api/admin/export.js.map +0 -1
- package/dist/api/errorHandler.d.ts +0 -5
- package/dist/api/errorHandler.d.ts.map +0 -1
- package/dist/api/errorHandler.js +0 -10
- package/dist/api/errorHandler.js.map +0 -1
- package/dist/api/export.d.ts +0 -2
- package/dist/api/export.d.ts.map +0 -1
- package/dist/api/export.js +0 -2
- package/dist/api/export.js.map +0 -1
- package/dist/tests/unit/api/errorHandler.unit.test.d.ts +0 -2
- package/dist/tests/unit/api/errorHandler.unit.test.d.ts.map +0 -1
- package/dist/tests/unit/api/errorHandler.unit.test.js +0 -105
- package/dist/tests/unit/api/errorHandler.unit.test.js.map +0 -1
|
@@ -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(
|
|
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
|
|
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
|
|
202
|
-
|
|
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":"AAeA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;
|
|
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
|
+
"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,18 +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/api-route": "2.
|
|
31
|
-
"@prosopo/
|
|
32
|
-
"@prosopo/
|
|
33
|
-
"@prosopo/
|
|
34
|
-
"@prosopo/
|
|
35
|
-
"@prosopo/
|
|
36
|
-
"@prosopo/
|
|
37
|
-
"@prosopo/
|
|
38
|
-
"@prosopo/types
|
|
39
|
-
"@prosopo/types-
|
|
40
|
-
"@prosopo/
|
|
41
|
-
"@prosopo/
|
|
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",
|
|
42
43
|
"cron": "3.1.7",
|
|
43
44
|
"express": "4.21.1",
|
|
44
45
|
"ip-address": "10.0.1",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../src/api/admin/export.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAEjF,OAAO,EAAE,4BAA4B,EAAE,CAAC"}
|
package/dist/api/admin/export.js
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../src/api/admin/export.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAEjF,OAAO,EAAE,4BAA4B,EAAE,CAAC"}
|
|
@@ -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"}
|
package/dist/api/errorHandler.js
DELETED
|
@@ -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"}
|
package/dist/api/export.d.ts
DELETED
package/dist/api/export.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../src/api/export.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAC"}
|
package/dist/api/export.js
DELETED
package/dist/api/export.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../src/api/export.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAC"}
|
|
@@ -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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"}
|