@prosopo/api-express-router 3.0.47 → 3.1.18
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/.turbo/turbo-build$colon$cjs.log +10 -6
- package/.turbo/turbo-build$colon$tsc.log +27 -21
- package/.turbo/turbo-build.log +11 -7
- package/CHANGELOG.md +332 -0
- package/dist/cjs/endpointAdapter/apiExpressDefaultEndpointAdapter.cjs +2 -1
- package/dist/cjs/middlewares/requestLoggerMiddleware.cjs +14 -4
- package/dist/endpointAdapter/apiExpressDefaultEndpointAdapter.d.ts +1 -1
- package/dist/endpointAdapter/apiExpressDefaultEndpointAdapter.d.ts.map +1 -1
- package/dist/endpointAdapter/apiExpressDefaultEndpointAdapter.js +2 -1
- package/dist/endpointAdapter/apiExpressDefaultEndpointAdapter.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/middlewares/requestLoggerMiddleware.d.ts.map +1 -1
- package/dist/middlewares/requestLoggerMiddleware.js +11 -1
- package/dist/middlewares/requestLoggerMiddleware.js.map +1 -1
- package/dist/tests/unit/middlewares/authMiddleware.unit.test.js +2 -1
- package/dist/tests/unit/middlewares/authMiddleware.unit.test.js.map +1 -1
- package/express.d.ts +3 -1
- package/package.json +14 -8
- package/src/apiExpressRouterFactory.ts +68 -0
- package/src/endpointAdapter/apiExpressDefaultEndpointAdapter.ts +65 -0
- package/src/endpointAdapter/apiExpressEndpointAdapter.ts +28 -0
- package/src/errorHandler.ts +33 -0
- package/src/index.ts +37 -0
- package/src/middlewares/authMiddleware.ts +93 -0
- package/src/middlewares/requestLoggerMiddleware.ts +55 -0
- package/src/tests/unit/errorHandler.unit.test.ts +190 -0
- package/src/tests/unit/middlewares/authMiddleware.unit.test.ts +183 -0
- package/tsconfig.cjs.json +34 -0
- package/tsconfig.json +41 -0
- package/tsconfig.tsbuildinfo +1 -0
- package/tsconfig.types.json +9 -0
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
// Copyright 2021-2026 Prosopo (UK) Ltd.
|
|
2
|
+
//
|
|
3
|
+
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
+
// you may not use this file except in compliance with the License.
|
|
5
|
+
// You may obtain a copy of the License at
|
|
6
|
+
//
|
|
7
|
+
// http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
+
//
|
|
9
|
+
// Unless required by applicable law or agreed to in writing, software
|
|
10
|
+
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
+
// See the License for the specific language governing permissions and
|
|
13
|
+
// limitations under the License.
|
|
14
|
+
|
|
15
|
+
import { hexToU8a, isHex } from "@polkadot/util";
|
|
16
|
+
import { ProsopoEnvError } from "@prosopo/common";
|
|
17
|
+
import { type Logger, getLogger } from "@prosopo/logger";
|
|
18
|
+
import type { KeyringPair } from "@prosopo/types";
|
|
19
|
+
import type { JWTVerifyResult } from "@prosopo/util-crypto";
|
|
20
|
+
import type { NextFunction, Request, Response } from "express";
|
|
21
|
+
import { describe, expect, it, vi } from "vitest";
|
|
22
|
+
import { authMiddleware } from "../../../middlewares/authMiddleware.js";
|
|
23
|
+
|
|
24
|
+
const loggerOuter = getLogger("info", import.meta.url);
|
|
25
|
+
|
|
26
|
+
const mockLogger = {
|
|
27
|
+
debug: vi.fn().mockImplementation(loggerOuter.debug.bind(loggerOuter)),
|
|
28
|
+
log: vi.fn().mockImplementation(loggerOuter.log.bind(loggerOuter)),
|
|
29
|
+
info: vi.fn().mockImplementation(loggerOuter.info.bind(loggerOuter)),
|
|
30
|
+
error: vi.fn().mockImplementation(loggerOuter.error.bind(loggerOuter)),
|
|
31
|
+
trace: vi.fn().mockImplementation(loggerOuter.trace.bind(loggerOuter)),
|
|
32
|
+
fatal: vi.fn().mockImplementation(loggerOuter.fatal.bind(loggerOuter)),
|
|
33
|
+
warn: vi.fn().mockImplementation(loggerOuter.warn.bind(loggerOuter)),
|
|
34
|
+
} as unknown as Logger;
|
|
35
|
+
|
|
36
|
+
vi.mock("@polkadot/util", async (importOriginal) => {
|
|
37
|
+
const actual = await importOriginal();
|
|
38
|
+
|
|
39
|
+
return {
|
|
40
|
+
// @ts-ignore
|
|
41
|
+
...actual,
|
|
42
|
+
hexToU8a: vi.fn(),
|
|
43
|
+
isHex: vi.fn(),
|
|
44
|
+
};
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
const mockPair = {
|
|
48
|
+
publicKey: "mockPublicKey",
|
|
49
|
+
verify: vi.fn(),
|
|
50
|
+
jwtVerify: vi.fn(),
|
|
51
|
+
} as unknown as KeyringPair;
|
|
52
|
+
const mockEnv = {
|
|
53
|
+
pair: mockPair,
|
|
54
|
+
authAccount: mockPair,
|
|
55
|
+
logger: mockLogger,
|
|
56
|
+
jwtVerify: vi.fn(),
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
describe("authMiddleware", () => {
|
|
60
|
+
it("should call next() if signature is valid", async () => {
|
|
61
|
+
const mockLogger = {
|
|
62
|
+
debug: vi.fn().mockImplementation(loggerOuter.debug.bind(loggerOuter)),
|
|
63
|
+
log: vi.fn().mockImplementation(loggerOuter.log.bind(loggerOuter)),
|
|
64
|
+
info: vi.fn().mockImplementation(loggerOuter.info.bind(loggerOuter)),
|
|
65
|
+
error: vi.fn().mockImplementation(loggerOuter.error.bind(loggerOuter)),
|
|
66
|
+
trace: vi.fn().mockImplementation(loggerOuter.trace.bind(loggerOuter)),
|
|
67
|
+
fatal: vi.fn().mockImplementation(loggerOuter.fatal.bind(loggerOuter)),
|
|
68
|
+
warn: vi.fn().mockImplementation(loggerOuter.warn.bind(loggerOuter)),
|
|
69
|
+
} as unknown as Logger;
|
|
70
|
+
const mockReq = {
|
|
71
|
+
url: "/v1/prosopo/provider/captcha/image",
|
|
72
|
+
originalUrl: "/v1/prosopo/provider/captcha/image",
|
|
73
|
+
headers: {
|
|
74
|
+
Authorization: "Bearer mockToken",
|
|
75
|
+
},
|
|
76
|
+
logger: mockLogger,
|
|
77
|
+
} as unknown as Request;
|
|
78
|
+
|
|
79
|
+
const mockRes = {
|
|
80
|
+
status: vi.fn().mockReturnThis(),
|
|
81
|
+
json: vi.fn(),
|
|
82
|
+
} as unknown as Response;
|
|
83
|
+
|
|
84
|
+
const mockNext = vi.fn() as unknown as NextFunction;
|
|
85
|
+
|
|
86
|
+
vi.mocked(isHex).mockReturnValue(true);
|
|
87
|
+
vi.mocked(hexToU8a).mockReturnValue(new Uint8Array());
|
|
88
|
+
vi.mocked(mockPair.jwtVerify).mockReturnValue({
|
|
89
|
+
isValid: true,
|
|
90
|
+
} as unknown as JWTVerifyResult);
|
|
91
|
+
|
|
92
|
+
const middleware = authMiddleware(mockEnv.pair, mockEnv.authAccount);
|
|
93
|
+
await middleware(mockReq, mockRes, mockNext);
|
|
94
|
+
|
|
95
|
+
expect(mockNext).toHaveBeenCalled();
|
|
96
|
+
expect(mockRes.status).not.toHaveBeenCalled();
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
it("should return 401 if jwt is invalid", async () => {
|
|
100
|
+
const mockLogger = {
|
|
101
|
+
debug: vi.fn().mockImplementation(loggerOuter.debug.bind(loggerOuter)),
|
|
102
|
+
log: vi.fn().mockImplementation(loggerOuter.log.bind(loggerOuter)),
|
|
103
|
+
info: vi.fn().mockImplementation(loggerOuter.info.bind(loggerOuter)),
|
|
104
|
+
error: vi.fn().mockImplementation(loggerOuter.error.bind(loggerOuter)),
|
|
105
|
+
trace: vi.fn().mockImplementation(loggerOuter.trace.bind(loggerOuter)),
|
|
106
|
+
fatal: vi.fn().mockImplementation(loggerOuter.fatal.bind(loggerOuter)),
|
|
107
|
+
warn: vi.fn().mockImplementation(loggerOuter.warn.bind(loggerOuter)),
|
|
108
|
+
} as unknown as Logger;
|
|
109
|
+
const mockReq = {
|
|
110
|
+
url: "/v1/prosopo/provider/captcha/image",
|
|
111
|
+
originalUrl: "/v1/prosopo/provider/captcha/image",
|
|
112
|
+
headers: {
|
|
113
|
+
Authorization: "Bearer mockToken",
|
|
114
|
+
},
|
|
115
|
+
logger: mockLogger,
|
|
116
|
+
i18n: vi.fn().mockReturnValue({
|
|
117
|
+
t: (key: string) => key,
|
|
118
|
+
}),
|
|
119
|
+
} as unknown as Request;
|
|
120
|
+
|
|
121
|
+
const mockRes = {
|
|
122
|
+
status: vi.fn().mockReturnThis(),
|
|
123
|
+
json: vi.fn(),
|
|
124
|
+
} as unknown as Response;
|
|
125
|
+
|
|
126
|
+
const mockNext = vi.fn() as unknown as NextFunction;
|
|
127
|
+
|
|
128
|
+
vi.mocked(isHex).mockReturnValue(true);
|
|
129
|
+
vi.mocked(hexToU8a).mockReturnValue(new Uint8Array());
|
|
130
|
+
vi.mocked(mockPair.jwtVerify).mockReturnValue({
|
|
131
|
+
isValid: false,
|
|
132
|
+
} as unknown as JWTVerifyResult);
|
|
133
|
+
|
|
134
|
+
const middleware = authMiddleware(mockEnv.pair, mockEnv.authAccount);
|
|
135
|
+
await middleware(mockReq, mockRes, mockNext);
|
|
136
|
+
|
|
137
|
+
expect(mockNext).not.toHaveBeenCalled();
|
|
138
|
+
expect(mockRes.status).toHaveBeenCalledWith(401);
|
|
139
|
+
expect(mockRes.json).toHaveBeenCalledWith({
|
|
140
|
+
error: new ProsopoEnvError("API.UNAUTHORIZED", {
|
|
141
|
+
context: { i18n: mockReq.i18n, code: 401 },
|
|
142
|
+
}),
|
|
143
|
+
});
|
|
144
|
+
});
|
|
145
|
+
|
|
146
|
+
it("should return 401 if key pair is missing", async () => {
|
|
147
|
+
const mockLogger = {
|
|
148
|
+
debug: vi.fn().mockImplementation(loggerOuter.debug.bind(loggerOuter)),
|
|
149
|
+
log: vi.fn().mockImplementation(loggerOuter.log.bind(loggerOuter)),
|
|
150
|
+
info: vi.fn().mockImplementation(loggerOuter.info.bind(loggerOuter)),
|
|
151
|
+
error: vi.fn().mockImplementation(loggerOuter.error.bind(loggerOuter)),
|
|
152
|
+
trace: vi.fn().mockImplementation(loggerOuter.trace.bind(loggerOuter)),
|
|
153
|
+
fatal: vi.fn().mockImplementation(loggerOuter.fatal.bind(loggerOuter)),
|
|
154
|
+
warn: vi.fn().mockImplementation(loggerOuter.warn.bind(loggerOuter)),
|
|
155
|
+
} as unknown as Logger;
|
|
156
|
+
const mockReq = {
|
|
157
|
+
url: "/v1/prosopo/provider/captcha/image",
|
|
158
|
+
originalUrl: "/v1/prosopo/provider/captcha/image",
|
|
159
|
+
headers: {
|
|
160
|
+
Authorization: "Bearer mockToken",
|
|
161
|
+
},
|
|
162
|
+
logger: mockLogger,
|
|
163
|
+
} as unknown as Request;
|
|
164
|
+
|
|
165
|
+
const mockRes = {
|
|
166
|
+
status: vi.fn().mockReturnThis(),
|
|
167
|
+
json: vi.fn(),
|
|
168
|
+
} as unknown as Response;
|
|
169
|
+
|
|
170
|
+
const mockNext = vi.fn() as unknown as NextFunction;
|
|
171
|
+
|
|
172
|
+
const middleware = authMiddleware(undefined, undefined);
|
|
173
|
+
await middleware(mockReq, mockRes, mockNext);
|
|
174
|
+
|
|
175
|
+
expect(mockNext).not.toHaveBeenCalled();
|
|
176
|
+
expect(mockRes.status).toHaveBeenCalledWith(401);
|
|
177
|
+
expect(mockRes.json).toHaveBeenCalledWith({
|
|
178
|
+
error: new ProsopoEnvError("API.UNAUTHORIZED", {
|
|
179
|
+
context: { i18n: mockReq.i18n, code: 401 },
|
|
180
|
+
}),
|
|
181
|
+
});
|
|
182
|
+
});
|
|
183
|
+
});
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
{
|
|
2
|
+
"extends": "../../tsconfig.cjs.json",
|
|
3
|
+
"compilerOptions": {
|
|
4
|
+
"rootDir": "./src",
|
|
5
|
+
"outDir": "./dist/cjs"
|
|
6
|
+
},
|
|
7
|
+
"include": ["./src"],
|
|
8
|
+
"references": [
|
|
9
|
+
{
|
|
10
|
+
"path": "../api-route/tsconfig.cjs.json"
|
|
11
|
+
},
|
|
12
|
+
{
|
|
13
|
+
"path": "../common/tsconfig.cjs.json"
|
|
14
|
+
},
|
|
15
|
+
{
|
|
16
|
+
"path": "../logger/tsconfig.cjs.json"
|
|
17
|
+
},
|
|
18
|
+
{
|
|
19
|
+
"path": "../../dev/config/tsconfig.cjs.json"
|
|
20
|
+
},
|
|
21
|
+
{
|
|
22
|
+
"path": "../env/tsconfig.cjs.json"
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
"path": "../locale/tsconfig.cjs.json"
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
"path": "../types/tsconfig.cjs.json"
|
|
29
|
+
},
|
|
30
|
+
{
|
|
31
|
+
"path": "../util-crypto/tsconfig.cjs.json"
|
|
32
|
+
}
|
|
33
|
+
]
|
|
34
|
+
}
|
package/tsconfig.json
ADDED
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
{
|
|
2
|
+
"extends": "../../tsconfig.esm.json",
|
|
3
|
+
"compilerOptions": {
|
|
4
|
+
"rootDir": "./src",
|
|
5
|
+
"outDir": "./dist"
|
|
6
|
+
},
|
|
7
|
+
"include": [
|
|
8
|
+
"./src",
|
|
9
|
+
"express.d.ts",
|
|
10
|
+
"src/**/*.ts",
|
|
11
|
+
"src/**/*.tsx",
|
|
12
|
+
"src/**/*.json",
|
|
13
|
+
"src/**/*.d.ts"
|
|
14
|
+
],
|
|
15
|
+
"references": [
|
|
16
|
+
{
|
|
17
|
+
"path": "../api-route"
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"path": "../common"
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
"path": "../logger"
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
"path": "../../dev/config/tsconfig.json"
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
"path": "../env"
|
|
30
|
+
},
|
|
31
|
+
{
|
|
32
|
+
"path": "../locale"
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
"path": "../types"
|
|
36
|
+
},
|
|
37
|
+
{
|
|
38
|
+
"path": "../util-crypto"
|
|
39
|
+
}
|
|
40
|
+
]
|
|
41
|
+
}
|