@adaptivestone/framework 5.4.1 → 5.5.0
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/CHANGELOG.md +58 -0
- package/README.md +42 -0
- package/dist/codegen/appTypes.d.ts +4 -5
- package/dist/codegen/appTypes.js +31 -22
- package/dist/codegen/appTypes.js.map +1 -1
- package/dist/codegen/index.d.ts +2 -2
- package/dist/codegen/index.js +3 -3
- package/dist/codegen/index.js.map +1 -1
- package/dist/commands/CreateEnv.d.ts +7 -0
- package/dist/commands/CreateEnv.js +36 -0
- package/dist/commands/CreateEnv.js.map +1 -0
- package/dist/commands/CreateUser.d.ts +5 -0
- package/dist/commands/CreateUser.js +13 -3
- package/dist/commands/CreateUser.js.map +1 -1
- package/dist/config/health.d.ts +4 -0
- package/dist/config/health.js +8 -0
- package/dist/config/health.js.map +1 -0
- package/dist/config/http.d.ts +1 -0
- package/dist/config/http.js +4 -0
- package/dist/config/http.js.map +1 -1
- package/dist/config/log.d.ts +2 -0
- package/dist/config/log.js +5 -0
- package/dist/config/log.js.map +1 -1
- package/dist/config/rateLimiter.js +1 -1
- package/dist/config/rateLimiter.js.map +1 -1
- package/dist/controllers/Auth.js +31 -34
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Health.d.ts +24 -0
- package/dist/controllers/Health.js +83 -0
- package/dist/controllers/Health.js.map +1 -0
- package/dist/controllers/Health.routes.gen.d.ts +13 -0
- package/dist/controllers/Health.routes.gen.js +10 -0
- package/dist/controllers/Health.routes.gen.js.map +1 -0
- package/dist/controllers/index.js +11 -7
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/crypto.d.ts +19 -0
- package/dist/helpers/crypto.js +32 -1
- package/dist/helpers/crypto.js.map +1 -1
- package/dist/helpers/deprecation.d.ts +4 -3
- package/dist/helpers/deprecation.js +5 -4
- package/dist/helpers/deprecation.js.map +1 -1
- package/dist/helpers/files.d.ts +6 -1
- package/dist/helpers/files.js +2 -1
- package/dist/helpers/files.js.map +1 -1
- package/dist/helpers/objects.d.ts +5 -0
- package/dist/helpers/objects.js +12 -0
- package/dist/helpers/objects.js.map +1 -0
- package/dist/models/User.d.ts +4 -9
- package/dist/models/User.js +37 -10
- package/dist/models/User.js.map +1 -1
- package/dist/modules/AbstractController.d.ts +3 -3
- package/dist/modules/BaseModel.js.map +1 -1
- package/dist/server.d.ts +4 -0
- package/dist/server.js +19 -2
- package/dist/server.js.map +1 -1
- package/dist/services/cache/drivers/MemoryDriver.d.ts +5 -4
- package/dist/services/cache/drivers/MemoryDriver.js +41 -18
- package/dist/services/cache/drivers/MemoryDriver.js.map +1 -1
- package/dist/services/documentation/OpenApiGenerator.js +21 -3
- package/dist/services/documentation/OpenApiGenerator.js.map +1 -1
- package/dist/services/http/HttpServer.d.ts +19 -11
- package/dist/services/http/HttpServer.js +47 -27
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/builtinErrorHandlers.d.ts +12 -2
- package/dist/services/http/builtinErrorHandlers.js +57 -9
- package/dist/services/http/builtinErrorHandlers.js.map +1 -1
- package/dist/services/http/httpErrors.d.ts +64 -11
- package/dist/services/http/httpErrors.js +42 -6
- package/dist/services/http/httpErrors.js.map +1 -1
- package/dist/services/http/middleware/AbstractMiddleware.d.ts +14 -6
- package/dist/services/http/middleware/AbstractMiddleware.js +20 -7
- package/dist/services/http/middleware/AbstractMiddleware.js.map +1 -1
- package/dist/services/http/middleware/Auth.d.ts +2 -1
- package/dist/services/http/middleware/Auth.js +9 -4
- package/dist/services/http/middleware/Auth.js.map +1 -1
- package/dist/services/http/middleware/Cors.d.ts +2 -0
- package/dist/services/http/middleware/Cors.js +9 -2
- package/dist/services/http/middleware/Cors.js.map +1 -1
- package/dist/services/http/middleware/GetUserByToken.d.ts +1 -1
- package/dist/services/http/middleware/GetUserByToken.js +2 -2
- package/dist/services/http/middleware/GetUserByToken.js.map +1 -1
- package/dist/services/http/middleware/I18n.js +11 -9
- package/dist/services/http/middleware/I18n.js.map +1 -1
- package/dist/services/http/middleware/Pagination.js +13 -11
- package/dist/services/http/middleware/Pagination.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.d.ts +2 -0
- package/dist/services/http/middleware/RateLimiter.js +42 -11
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestLogger.js +10 -2
- package/dist/services/http/middleware/RequestLogger.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.js +19 -5
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/services/http/middleware/Role.d.ts +2 -1
- package/dist/services/http/middleware/Role.js +14 -5
- package/dist/services/http/middleware/Role.js.map +1 -1
- package/dist/services/http/routing/ExpressAdapter.js +7 -2
- package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
- package/dist/services/http/routing/RouteNode.d.ts +7 -8
- package/dist/services/logging/redaction.d.ts +15 -0
- package/dist/services/logging/redaction.js +54 -0
- package/dist/services/logging/redaction.js.map +1 -0
- package/dist/services/validate/ValidateService.js +3 -27
- package/dist/services/validate/ValidateService.js.map +1 -1
- package/dist/services/validate/ValidationError.d.ts +10 -0
- package/dist/services/validate/ValidationError.js +28 -0
- package/dist/services/validate/ValidationError.js.map +1 -1
- package/dist/services/validate/mergeValidatedOutputs.d.ts +2 -6
- package/dist/services/validate/mergeValidatedOutputs.js +5 -12
- package/dist/services/validate/mergeValidatedOutputs.js.map +1 -1
- package/dist/tests/testHelpers.d.ts +111 -8
- package/package.json +9 -9
|
@@ -46,18 +46,28 @@ class RequestParser extends AbstractMiddleware {
|
|
|
46
46
|
const declaredLength = Number(req.headers?.['content-length']);
|
|
47
47
|
if (Number.isFinite(declaredLength) && declaredLength > maxBodySize) {
|
|
48
48
|
this.logger?.error(`Request body ${declaredLength}B exceeds maxFieldsSize ${maxBodySize}B`);
|
|
49
|
+
// Close after the 413 instead of draining the unread body.
|
|
50
|
+
res.setHeader('Connection', 'close');
|
|
49
51
|
return res.status(413).json({
|
|
50
52
|
message: this.translate(req, 'middleware.requestParser.entityTooLarge', 'Request entity too large. Your upload exceeds the allowed size or count limits.'),
|
|
51
53
|
});
|
|
52
54
|
}
|
|
53
55
|
}
|
|
54
56
|
// Also guard chunked bodies. Only a genuinely selected multipart parser
|
|
55
|
-
// may rely on the separate file/field limits.
|
|
57
|
+
// may rely on the separate file/field limits. Pausing (not destroying) the
|
|
58
|
+
// request keeps the socket writable, so the client receives the 413; its
|
|
59
|
+
// `Connection: close` then ends the connection.
|
|
60
|
+
let rejectOversized = () => { };
|
|
61
|
+
const oversized = new Promise((_resolve, reject) => {
|
|
62
|
+
rejectOversized = reject;
|
|
63
|
+
});
|
|
56
64
|
form.on('progress', (bytesReceived) => {
|
|
57
|
-
if (
|
|
65
|
+
if (!bodyTooLarge &&
|
|
66
|
+
form.type !== 'multipart' &&
|
|
58
67
|
bytesReceived > maxBodySize) {
|
|
59
68
|
bodyTooLarge = true;
|
|
60
|
-
req.
|
|
69
|
+
req.pause();
|
|
70
|
+
rejectOversized(new Error('Request body exceeds maxFieldsSize'));
|
|
61
71
|
}
|
|
62
72
|
});
|
|
63
73
|
// Track every temp file formidable opens (via fileBegin, so a file that
|
|
@@ -83,8 +93,8 @@ class RequestParser extends AbstractMiddleware {
|
|
|
83
93
|
let fields;
|
|
84
94
|
let files;
|
|
85
95
|
try {
|
|
86
|
-
[fields, files] = await form.parse(req);
|
|
87
|
-
//
|
|
96
|
+
[fields, files] = await Promise.race([form.parse(req), oversized]);
|
|
97
|
+
// Pausing the stream cannot cancel a chunk already inside the parser.
|
|
88
98
|
// Even if that chunk completes parsing, an oversized body must not advance.
|
|
89
99
|
if (bodyTooLarge) {
|
|
90
100
|
throw new Error('Request body exceeds maxFieldsSize');
|
|
@@ -96,6 +106,10 @@ class RequestParser extends AbstractMiddleware {
|
|
|
96
106
|
// count) with httpCode 413; our own JSON/urlencoded body-size guard sets
|
|
97
107
|
// `bodyTooLarge`. Everything else (bad content type / length) stays a 400.
|
|
98
108
|
if (bodyTooLarge || err?.httpCode === 413) {
|
|
109
|
+
if (bodyTooLarge) {
|
|
110
|
+
// The rest of the body stays unread; close rather than drain it.
|
|
111
|
+
res.setHeader('Connection', 'close');
|
|
112
|
+
}
|
|
99
113
|
return res.status(413).json({
|
|
100
114
|
message: this.translate(req, 'middleware.requestParser.entityTooLarge', 'Request entity too large. Your upload exceeds the allowed size or count limits.'),
|
|
101
115
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestParser.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RequestParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,UAAU,EAAE,EACjB,IAAI,EACJ,SAAS,EACT,WAAW,EACX,WAAW,GACZ,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD;;;;;;GAMG;AACH,MAAM,aAAc,SAAQ,kBAAkB;IAC5C,MAAM,KAAK,WAAW;QACpB,OAAO,sDAAsD,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAqB,EAAE,GAAa,EAAE,IAAkB;QACvE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAExC,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAuB,CAAC;QAC3E,gFAAgF;QAChF,MAAM,aAAa,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC3D,MAAM,SAAS,GAAG,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;QACtE,MAAM,WAAW,GACf,SAAS,KAAK,qBAAqB,IAAI,SAAS,KAAK,mBAAmB,CAAC;QAC3E,yEAAyE;QACzE,gEAAgE;QAChE,MAAM,MAAM,GAAG,WAAW;YACxB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,KAAK,kBAAkB,IAAI,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC;gBAChE,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,SAAS,KAAK,mCAAmC;oBACjD,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,SAAS,KAAK,0BAA0B;wBACxC,CAAC,CAAC,WAAW;wBACb,CAAC,CAAC,SAAS,CAAC;QACpB,MAAM,IAAI,GAAG,UAAU,CAAC;YACtB,GAAG,aAAa;YAChB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAChD,CAAC,CAAC;QAEH,wEAAwE;QACxE,8EAA8E;QAC9E,MAAM,WAAW,GACf,OAAO,aAAa,CAAC,aAAa,KAAK,QAAQ;YAC7C,CAAC,CAAC,aAAa,CAAC,aAAa;YAC7B,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;QACtB,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAC/D,IAAI,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,cAAc,GAAG,WAAW,EAAE,CAAC;gBACpE,IAAI,CAAC,MAAM,EAAE,KAAK,CAChB,gBAAgB,cAAc,2BAA2B,WAAW,GAAG,CACxE,CAAC;gBACF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBAC1B,OAAO,EAAE,IAAI,CAAC,SAAS,CACrB,GAAG,EACH,yCAAyC,EACzC,iFAAiF,CAClF;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,wEAAwE;QACxE,
|
|
1
|
+
{"version":3,"file":"RequestParser.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RequestParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,9 @@ import AbstractMiddleware from './AbstractMiddleware.ts';
|
|
|
5
5
|
import type { GetUserByTokenAppInfo } from './GetUserByToken.ts';
|
|
6
6
|
declare class RoleMiddleware extends AbstractMiddleware {
|
|
7
7
|
static get description(): string;
|
|
8
|
+
static get requiresAuth(): boolean;
|
|
8
9
|
middleware(req: FrameworkRequest & GetUserByTokenAppInfo & {
|
|
9
10
|
user: InstanceType<TUser>;
|
|
10
|
-
},
|
|
11
|
+
}, _res: Response, next: NextFunction): Promise<void>;
|
|
11
12
|
}
|
|
12
13
|
export default RoleMiddleware;
|
|
@@ -1,13 +1,20 @@
|
|
|
1
|
+
import { ForbiddenError, UnauthorizedError } from '../httpErrors.js';
|
|
1
2
|
import AbstractMiddleware from './AbstractMiddleware.js';
|
|
2
3
|
class RoleMiddleware extends AbstractMiddleware {
|
|
3
4
|
static get description() {
|
|
4
5
|
return 'Check user role (user.roles property). If the user has no role then stop request and return error. OR logic (any role will pass user)';
|
|
5
6
|
}
|
|
6
|
-
|
|
7
|
+
static get requiresAuth() {
|
|
8
|
+
return true;
|
|
9
|
+
}
|
|
10
|
+
async middleware(req, _res, next) {
|
|
7
11
|
const { user } = req.appInfo;
|
|
8
12
|
if (!user) {
|
|
9
|
-
|
|
10
|
-
|
|
13
|
+
// Same meaning for the client as the Auth 401: log in first.
|
|
14
|
+
throw new UnauthorizedError({
|
|
15
|
+
code: 'AUTH001',
|
|
16
|
+
i18nKey: 'middleware.role.userRequired',
|
|
17
|
+
message: 'User should be provided',
|
|
11
18
|
});
|
|
12
19
|
}
|
|
13
20
|
// Guard against `Role` being mounted without a `roles` param: treat a
|
|
@@ -20,8 +27,10 @@ class RoleMiddleware extends AbstractMiddleware {
|
|
|
20
27
|
}
|
|
21
28
|
});
|
|
22
29
|
if (!hasRole) {
|
|
23
|
-
|
|
24
|
-
|
|
30
|
+
throw new ForbiddenError({
|
|
31
|
+
code: 'NO_ACCESS',
|
|
32
|
+
i18nKey: 'middleware.role.noAccess',
|
|
33
|
+
message: 'You do not have access',
|
|
25
34
|
});
|
|
26
35
|
}
|
|
27
36
|
return next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Role.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Role.ts"],"names":[],"mappings":"AAGA,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAGzD,MAAM,cAAe,SAAQ,kBAAkB;IAC7C,MAAM,KAAK,WAAW;QACpB,OAAO,uIAAuI,CAAC;IACjJ,CAAC;IAED,KAAK,CAAC,UAAU,CACd,GACuD,EACvD,
|
|
1
|
+
{"version":3,"file":"Role.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Role.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAGzD,MAAM,cAAe,SAAQ,kBAAkB;IAC7C,MAAM,KAAK,WAAW;QACpB,OAAO,uIAAuI,CAAC;IACjJ,CAAC;IAED,MAAM,KAAK,YAAY;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,UAAU,CACd,GACuD,EACvD,IAAc,EACd,IAAkB;QAElB,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;QAE7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,6DAA6D;YAC7D,MAAM,IAAI,iBAAiB,CAAC;gBAC1B,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,8BAA8B;gBACvC,OAAO,EAAE,yBAAyB;aACnC,CAAC,CAAC;QACL,CAAC;QAED,sEAAsE;QACtE,6EAA6E;QAC7E,MAAM,YAAY,GAAI,IAAI,CAAC,MAAM,EAAE,KAAuB,IAAI,EAAE,CAAC;QACjE,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;YACnC,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,cAAc,CAAC;gBACvB,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,0BAA0B;gBACnC,OAAO,EAAE,wBAAwB;aAClC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* Middleware instances are cached by `MiddlewareEntry` identity (WeakMap)
|
|
6
6
|
* — each entry is constructed once on first request and reused thereafter.
|
|
7
7
|
*/
|
|
8
|
+
import { translateWithDefault } from '../../../helpers/translate.js';
|
|
8
9
|
import { getMatchedNode, MalformedPathError } from './match.js';
|
|
9
10
|
const instanceCache = new WeakMap();
|
|
10
11
|
export function createExpressAdapter(registry, app) {
|
|
@@ -18,7 +19,9 @@ export function createExpressAdapter(registry, app) {
|
|
|
18
19
|
}
|
|
19
20
|
catch (err) {
|
|
20
21
|
if (err instanceof MalformedPathError) {
|
|
21
|
-
res.status(400).json({
|
|
22
|
+
res.status(400).json({
|
|
23
|
+
message: translateWithDefault(req, 'http.malformedUrl', 'Malformed URL'),
|
|
24
|
+
});
|
|
22
25
|
return;
|
|
23
26
|
}
|
|
24
27
|
return next(err);
|
|
@@ -30,7 +33,9 @@ export function createExpressAdapter(registry, app) {
|
|
|
30
33
|
if (result.entry === null) {
|
|
31
34
|
// 405 — path matched, method didn't.
|
|
32
35
|
res.setHeader('Allow', result.allowedMethods.join(', '));
|
|
33
|
-
res.status(405).json({
|
|
36
|
+
res.status(405).json({
|
|
37
|
+
message: translateWithDefault(req, 'http.methodNotAllowed', 'Method not allowed'),
|
|
38
|
+
});
|
|
34
39
|
return;
|
|
35
40
|
}
|
|
36
41
|
// Populate request with match metadata before middleware runs.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressAdapter.js","sourceRoot":"","sources":["../../../../src/services/http/routing/ExpressAdapter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"ExpressAdapter.js","sourceRoot":"","sources":["../../../../src/services/http/routing/ExpressAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,15 +20,14 @@ export type HttpMethod = (typeof HTTP_METHODS)[number];
|
|
|
20
20
|
* - `'parsed'` (default): Content-Type-aware parser dispatch. **The only mode
|
|
21
21
|
* that takes effect today.**
|
|
22
22
|
*
|
|
23
|
-
* `'raw'` and `'none'` are **reserved and not yet
|
|
24
|
-
*
|
|
25
|
-
*
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
* the refactor plans).
|
|
23
|
+
* `'raw'` and `'none'` are **reserved and not implemented yet**. The matcher
|
|
24
|
+
* resolves and propagates the mode, but the request pipeline does not act on
|
|
25
|
+
* it: `RequestParser` is mounted globally, so every body is parsed regardless —
|
|
26
|
+
* `req.rawBody` is never set and the stream is always consumed. Do not rely on
|
|
27
|
+
* them until they ship (the parser-registry design lives in the refactor plans).
|
|
29
28
|
*
|
|
30
|
-
* - `'raw'` *(
|
|
31
|
-
* - `'none'` *(
|
|
29
|
+
* - `'raw'` *(reserved)*: capture bytes into `req.rawBody: Buffer`, skip parsing.
|
|
30
|
+
* - `'none'` *(reserved)*: pass-through, leave the request stream untouched.
|
|
32
31
|
*/
|
|
33
32
|
export type BodyParsingMode = 'parsed' | 'raw' | 'none';
|
|
34
33
|
/**
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import winston from 'winston';
|
|
2
|
+
/** What a redacted value is replaced with. */
|
|
3
|
+
export declare const REDACTED = "[REDACTED]";
|
|
4
|
+
/**
|
|
5
|
+
* Copy of `value` with the values of `keys` (lower-case) replaced at any
|
|
6
|
+
* depth, matching keys case-insensitively. Only plain objects and arrays are
|
|
7
|
+
* walked; anything else (Errors, Dates, class instances, strings) is returned
|
|
8
|
+
* as is. Never mutates `value`.
|
|
9
|
+
*/
|
|
10
|
+
export declare function redactValue(value: unknown, keys: ReadonlySet<string>, seen?: WeakMap<object, unknown>): unknown;
|
|
11
|
+
/**
|
|
12
|
+
* Winston format that redacts a log entry's fields before any transport sees
|
|
13
|
+
* them. The message text is never rewritten: put sensitive values in fields.
|
|
14
|
+
*/
|
|
15
|
+
export declare const createRedactFormat: (keys: readonly string[]) => winston.Logform.Format;
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import winston from 'winston';
|
|
2
|
+
import { isPlainObject } from '../../helpers/objects.js';
|
|
3
|
+
/** What a redacted value is replaced with. */
|
|
4
|
+
export const REDACTED = '[REDACTED]';
|
|
5
|
+
/**
|
|
6
|
+
* Copy of `value` with the values of `keys` (lower-case) replaced at any
|
|
7
|
+
* depth, matching keys case-insensitively. Only plain objects and arrays are
|
|
8
|
+
* walked; anything else (Errors, Dates, class instances, strings) is returned
|
|
9
|
+
* as is. Never mutates `value`.
|
|
10
|
+
*/
|
|
11
|
+
export function redactValue(value, keys, seen = new WeakMap()) {
|
|
12
|
+
if (!Array.isArray(value) && !isPlainObject(value)) {
|
|
13
|
+
return value;
|
|
14
|
+
}
|
|
15
|
+
const known = seen.get(value);
|
|
16
|
+
if (known) {
|
|
17
|
+
return known;
|
|
18
|
+
}
|
|
19
|
+
if (Array.isArray(value)) {
|
|
20
|
+
const copy = [];
|
|
21
|
+
seen.set(value, copy);
|
|
22
|
+
for (const item of value) {
|
|
23
|
+
copy.push(redactValue(item, keys, seen));
|
|
24
|
+
}
|
|
25
|
+
return copy;
|
|
26
|
+
}
|
|
27
|
+
const copy = {};
|
|
28
|
+
seen.set(value, copy);
|
|
29
|
+
for (const [key, item] of Object.entries(value)) {
|
|
30
|
+
copy[key] = keys.has(key.toLowerCase())
|
|
31
|
+
? REDACTED
|
|
32
|
+
: redactValue(item, keys, seen);
|
|
33
|
+
}
|
|
34
|
+
return copy;
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Winston format that redacts a log entry's fields before any transport sees
|
|
38
|
+
* them. The message text is never rewritten: put sensitive values in fields.
|
|
39
|
+
*/
|
|
40
|
+
export const createRedactFormat = (keys) => {
|
|
41
|
+
const keySet = new Set(keys.map((key) => key.toLowerCase()));
|
|
42
|
+
return winston.format((info) => {
|
|
43
|
+
for (const key of Object.keys(info)) {
|
|
44
|
+
if (key === 'level' || key === 'message') {
|
|
45
|
+
continue;
|
|
46
|
+
}
|
|
47
|
+
info[key] = keySet.has(key.toLowerCase())
|
|
48
|
+
? REDACTED
|
|
49
|
+
: redactValue(info[key], keySet);
|
|
50
|
+
}
|
|
51
|
+
return info;
|
|
52
|
+
})();
|
|
53
|
+
};
|
|
54
|
+
//# sourceMappingURL=redaction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redaction.js","sourceRoot":"","sources":["../../../src/services/logging/redaction.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,8CAA8C;AAC9C,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAY,CAAC;AAErC;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CACzB,KAAc,EACd,IAAyB,EACzB,IAAI,GAAG,IAAI,OAAO,EAAmB;IAErC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACnD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,GAAc,EAAE,CAAC;QAC3B,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACtB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAA4B,EAAE,CAAC;IACzC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACtB,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChD,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YACrC,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAuB,EAAE,EAAE;IAC5D,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAC7D,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACzC,SAAS;YACX,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;gBACvC,CAAC,CAAC,QAAQ;gBACV,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,EAAE,CAAC;AACP,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Base from '../../modules/Base.js';
|
|
2
2
|
import { standardSchemaDriver } from './drivers/StandardSchemaDriver.js';
|
|
3
3
|
import { yupDriver } from './drivers/YupDriver.js';
|
|
4
|
-
import { issuesToPayload, ValidationError } from './ValidationError.js';
|
|
4
|
+
import { issuesToPayload, translateIssues, ValidationError, } from './ValidationError.js';
|
|
5
5
|
/**
|
|
6
6
|
* Per-route validator dispatcher. Resolves a `ValidatorDriver` once at
|
|
7
7
|
* construction (cheap sync property check) and delegates per-request
|
|
@@ -86,33 +86,9 @@ class ValidateService extends Base {
|
|
|
86
86
|
return 'service';
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
|
-
|
|
90
|
-
// dotted/underscored token with no whitespace or template syntax. Driver
|
|
91
|
-
// messages (yup/zod) are free-form English sentences that often embed the raw
|
|
92
|
-
// submitted value (e.g. yup's typeError: `… (cast from the value "…")`). Only
|
|
93
|
-
// keys are sent through i18next; free-form messages are passed through verbatim.
|
|
94
|
-
const I18N_KEY_RE = /^[\w.:-]+$/;
|
|
95
|
-
/**
|
|
96
|
-
* Translate validation messages that are i18n keys; pass everything else
|
|
97
|
-
* through untouched. This is deliberately a KEY allow-list, not a fallback to
|
|
98
|
-
* `t(msg, msg, …)`: i18next runs nesting (`$t(...)`) and interpolation
|
|
99
|
-
* (`{{...}}`) over its key/defaultValue, so feeding a user-influenced driver
|
|
100
|
-
* message into it turns a 400 response into a reflected injection that can
|
|
101
|
-
* resolve arbitrary keys out of the loaded translation bundle.
|
|
102
|
-
*/
|
|
89
|
+
/** Translate key-like messages (see {@link translateIssues}) and rebuild the payload. */
|
|
103
90
|
function translateInPlace(err, t) {
|
|
104
|
-
err.issues = err.issues
|
|
105
|
-
if (typeof issue.message !== 'string' || !I18N_KEY_RE.test(issue.message)) {
|
|
106
|
-
return issue;
|
|
107
|
-
}
|
|
108
|
-
return {
|
|
109
|
-
...issue,
|
|
110
|
-
// 2-arg form: the message IS the key; if it isn't loaded i18next returns
|
|
111
|
-
// the key string unchanged. `params` supplies interpolation values for the
|
|
112
|
-
// (trusted, app-authored) translation string.
|
|
113
|
-
message: t(issue.message, issue.params),
|
|
114
|
-
};
|
|
115
|
-
});
|
|
91
|
+
err.issues = translateIssues(err.issues, t);
|
|
116
92
|
err.message = issuesToPayload(err.issues);
|
|
117
93
|
}
|
|
118
94
|
function buildNoDriverMessage(schema) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidateService.js","sourceRoot":"","sources":["../../../src/services/validate/ValidateService.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAGzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,
|
|
1
|
+
{"version":3,"file":"ValidateService.js","sourceRoot":"","sources":["../../../src/services/validate/ValidateService.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAGzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,sBAAsB,CAAC;AAE9B;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,eAAgB,SAAQ,IAAI;IAChC,MAAM,CAAU;IAChB,MAAM,CAAyB;IAE/B,MAAM,CAAC,OAAO,GAAsB,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;IAEtE,YAAY,GAAS,EAAE,MAAsB;QAC3C,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;YAChD,CAAC;YACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACrB,CAAC;IACH,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,MAAe;QAC5B,OAAO,CACL,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,IAAI,CAC3E,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CACb,MAAuB,EACvB,QAAQ,GAAqB,OAAO;QAEpC,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACzB,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,QAAQ,CACZ,IAAa,EACb,IAAwC;QAExC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,IAAI,EAAE,CAAC,IAAI,GAAG,YAAY,eAAe,EAAE,CAAC;gBAC9C,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YAChC,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAED,yFAAyF;AACzF,SAAS,gBAAgB,CAAC,GAAoB,EAAE,CAAsB;IACpE,GAAG,CAAC,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC5C,GAAG,CAAC,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,oBAAoB,CAAC,MAAe;IAC3C,MAAM,WAAW,GACf,MAAM,KAAK,IAAI;QACf,OAAO,MAAM,KAAK,QAAQ;QAC1B,OAAQ,MAAiC,CAAC,QAAQ,KAAK,UAAU;QACjE,OAAQ,MAA6B,CAAC,IAAI,KAAK,UAAU,CAAC;IAE5D,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,CACL,iEAAiE;YACjE,oEAAoE;YACpE,gEAAgE;YAChE,uDAAuD;YACvD,sBAAsB;YACtB,qBAAqB;YACrB,6BAA6B;YAC7B,2BAA2B;YAC3B,sFAAsF;YACtF,YAAY;YACZ,UAAU;YACV,MAAM,CACP,CAAC;IACJ,CAAC;IAED,OAAO,CACL,iEAAiE;QACjE,2EAA2E;QAC3E,iDAAiD;QACjD,sEAAsE;QACtE,yDAAyD,CAC1D,CAAC;AACJ,CAAC;AAED,eAAe,eAAe,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { TranslationFunction } from '../i18n/types.ts';
|
|
1
2
|
import type { ValidationIssue } from './types.ts';
|
|
2
3
|
/**
|
|
3
4
|
* The wire shape that goes out via `res.json({ errors: err.message })`.
|
|
@@ -33,3 +34,12 @@ export declare class ValidationError extends Error {
|
|
|
33
34
|
static isValidationError(err: unknown): err is ValidationError;
|
|
34
35
|
}
|
|
35
36
|
export declare function issuesToPayload(issues: ReadonlyArray<ValidationIssue>): ValidationErrorPayload;
|
|
37
|
+
/**
|
|
38
|
+
* Translate messages that are i18n keys; pass everything else
|
|
39
|
+
* through untouched. This is deliberately a KEY allow-list, not a fallback to
|
|
40
|
+
* `t(msg, msg, …)`: i18next runs nesting (`$t(...)`) and interpolation
|
|
41
|
+
* (`{{...}}`) over its key/defaultValue, so feeding a user-influenced driver
|
|
42
|
+
* message into it turns an error response into a reflected injection that can
|
|
43
|
+
* resolve arbitrary keys out of the loaded translation bundle.
|
|
44
|
+
*/
|
|
45
|
+
export declare function translateIssues(issues: ReadonlyArray<ValidationIssue>, t: TranslationFunction): ValidationIssue[];
|
|
@@ -87,4 +87,32 @@ function pathToString(path) {
|
|
|
87
87
|
}
|
|
88
88
|
return out;
|
|
89
89
|
}
|
|
90
|
+
// A framework validation message is an i18n KEY (e.g. `auth.emailValid`) — a
|
|
91
|
+
// dotted/underscored token with no whitespace or template syntax. Driver
|
|
92
|
+
// messages (yup/zod) are free-form English sentences that often embed the raw
|
|
93
|
+
// submitted value (e.g. yup's typeError: `… (cast from the value "…")`). Only
|
|
94
|
+
// keys are sent through i18next; free-form messages are passed through verbatim.
|
|
95
|
+
const I18N_KEY_RE = /^[\w.:-]+$/;
|
|
96
|
+
/**
|
|
97
|
+
* Translate messages that are i18n keys; pass everything else
|
|
98
|
+
* through untouched. This is deliberately a KEY allow-list, not a fallback to
|
|
99
|
+
* `t(msg, msg, …)`: i18next runs nesting (`$t(...)`) and interpolation
|
|
100
|
+
* (`{{...}}`) over its key/defaultValue, so feeding a user-influenced driver
|
|
101
|
+
* message into it turns an error response into a reflected injection that can
|
|
102
|
+
* resolve arbitrary keys out of the loaded translation bundle.
|
|
103
|
+
*/
|
|
104
|
+
export function translateIssues(issues, t) {
|
|
105
|
+
return issues.map((issue) => {
|
|
106
|
+
if (typeof issue.message !== 'string' || !I18N_KEY_RE.test(issue.message)) {
|
|
107
|
+
return issue;
|
|
108
|
+
}
|
|
109
|
+
return {
|
|
110
|
+
...issue,
|
|
111
|
+
// 2-arg form: the message IS the key; if it isn't loaded i18next returns
|
|
112
|
+
// the key string unchanged. `params` supplies interpolation values for the
|
|
113
|
+
// (trusted, app-authored) translation string.
|
|
114
|
+
message: t(issue.message, issue.params),
|
|
115
|
+
};
|
|
116
|
+
});
|
|
117
|
+
}
|
|
90
118
|
//# sourceMappingURL=ValidationError.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationError.js","sourceRoot":"","sources":["../../../src/services/validate/ValidationError.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ValidationError.js","sourceRoot":"","sources":["../../../src/services/validate/ValidationError.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
* validator outputs requires an object shape: the framework's established
|
|
4
|
-
* merge is a shallow, ordered merge of plain objects.
|
|
5
|
-
*/
|
|
6
|
-
export declare function isPlainObject(value: unknown): value is Record<PropertyKey, unknown>;
|
|
1
|
+
import { isPlainObject } from '../../helpers/objects.ts';
|
|
2
|
+
export { isPlainObject };
|
|
7
3
|
/**
|
|
8
4
|
* Preserve a single validator output exactly. When several schemas contribute
|
|
9
5
|
* to one request slot, merge their plain-object outputs in schema order so
|
|
@@ -1,15 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
export function isPlainObject(value) {
|
|
7
|
-
if (value === null || typeof value !== 'object') {
|
|
8
|
-
return false;
|
|
9
|
-
}
|
|
10
|
-
const prototype = Object.getPrototypeOf(value);
|
|
11
|
-
return prototype === Object.prototype || prototype === null;
|
|
12
|
-
}
|
|
1
|
+
import { isPlainObject } from '../../helpers/objects.js';
|
|
2
|
+
// Re-exported: this module was the public home of `isPlainObject` before it
|
|
3
|
+
// moved to helpers/objects.ts. A validator output can be any JavaScript value;
|
|
4
|
+
// only combining several outputs requires the plain-object shape.
|
|
5
|
+
export { isPlainObject };
|
|
13
6
|
/**
|
|
14
7
|
* Preserve a single validator output exactly. When several schemas contribute
|
|
15
8
|
* to one request slot, merge their plain-object outputs in schema order so
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeValidatedOutputs.js","sourceRoot":"","sources":["../../../src/services/validate/mergeValidatedOutputs.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"mergeValidatedOutputs.js","sourceRoot":"","sources":["../../../src/services/validate/mergeValidatedOutputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,4EAA4E;AAC5E,+EAA+E;AAC/E,kEAAkE;AAClE,OAAO,EAAE,aAAa,EAAE,CAAC;AAEzB;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAA2B;IAC/D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QAC5C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACb,0CAA0C,KAAK,GAAG,CAAC,0BAA0B;gBAC3E,wDAAwD,CAC3D,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC;AACvC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B,CACzC,MAAe,EACf,WAAmB;IAEnB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CACb,gGAAgG,CACjG,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,CAAC;AACpC,CAAC"}
|
|
@@ -146,14 +146,117 @@ export declare const createDefaultTestUser: () => Promise<false | {
|
|
|
146
146
|
}> & {
|
|
147
147
|
__v: number;
|
|
148
148
|
}, "generateToken" | "getPublic" | "id" | "sendPasswordRecoveryEmail" | "sendVerificationEmail"> & import("mongoose").HydratedDocumentOverrides<{} & import("../modules/BaseModel.ts").DocFacingMethods<{
|
|
149
|
-
readonly generateToken: (this: {
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
149
|
+
readonly generateToken: (this: import("../models/User.ts").UserAuthInstance & Pick<import("mongoose").Document<unknown, object, {
|
|
150
|
+
_id: import("mongoose").Types.ObjectId;
|
|
151
|
+
createdAt: NativeDate;
|
|
152
|
+
updatedAt: NativeDate;
|
|
153
|
+
avatar?: string | null | undefined;
|
|
154
|
+
name?: {
|
|
155
|
+
first?: string | null | undefined;
|
|
156
|
+
last?: string | null | undefined;
|
|
157
|
+
nick?: string | null | undefined;
|
|
158
|
+
} | null | undefined;
|
|
159
|
+
password?: string | null | undefined;
|
|
160
|
+
email?: string | null | undefined;
|
|
161
|
+
sessionTokens: ({
|
|
162
|
+
token?: string | null | undefined;
|
|
163
|
+
valid?: NativeDate | null | undefined;
|
|
164
|
+
} & {
|
|
165
|
+
_id: import("mongoose").Types.ObjectId;
|
|
166
|
+
})[];
|
|
167
|
+
verificationTokens: ({
|
|
168
|
+
until?: NativeDate | null | undefined;
|
|
169
|
+
token?: string | null | undefined;
|
|
170
|
+
} & {
|
|
171
|
+
_id: import("mongoose").Types.ObjectId;
|
|
172
|
+
})[];
|
|
173
|
+
passwordRecoveryTokens: ({
|
|
174
|
+
until?: NativeDate | null | undefined;
|
|
175
|
+
token?: string | null | undefined;
|
|
176
|
+
} & {
|
|
177
|
+
_id: import("mongoose").Types.ObjectId;
|
|
178
|
+
})[];
|
|
179
|
+
permissions: string[];
|
|
180
|
+
roles: string[];
|
|
181
|
+
isVerified: boolean;
|
|
182
|
+
locale: string;
|
|
183
|
+
languages: string[];
|
|
184
|
+
}, object, Omit<{
|
|
185
|
+
readonly timestamps: true;
|
|
186
|
+
readonly minimize: false;
|
|
187
|
+
}, never>> & Omit<{
|
|
188
|
+
_id: import("mongoose").Types.ObjectId;
|
|
189
|
+
createdAt: NativeDate;
|
|
190
|
+
updatedAt: NativeDate;
|
|
191
|
+
avatar?: string | null | undefined;
|
|
192
|
+
name?: Omit<{
|
|
193
|
+
_id: import("mongoose").Types.ObjectId;
|
|
194
|
+
first?: string | null | undefined;
|
|
195
|
+
last?: string | null | undefined;
|
|
196
|
+
nick?: string | null | undefined;
|
|
197
|
+
}, "_id"> | null | undefined;
|
|
198
|
+
password?: string | null | undefined;
|
|
199
|
+
email?: string | null | undefined;
|
|
200
|
+
sessionTokens: import("mongoose").Types.DocumentArray<{
|
|
201
|
+
token?: string | null | undefined;
|
|
202
|
+
valid?: NativeDate | null | undefined;
|
|
203
|
+
} & {
|
|
204
|
+
_id: import("mongoose").Types.ObjectId;
|
|
205
|
+
}, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, unknown, {
|
|
206
|
+
token?: string | null | undefined;
|
|
207
|
+
valid?: NativeDate | null | undefined;
|
|
208
|
+
} & {
|
|
209
|
+
_id: import("mongoose").Types.ObjectId;
|
|
210
|
+
}, {}, {}> & {
|
|
211
|
+
token?: string | null | undefined;
|
|
212
|
+
valid?: NativeDate | null | undefined;
|
|
213
|
+
} & {
|
|
214
|
+
_id: import("mongoose").Types.ObjectId;
|
|
215
|
+
}>;
|
|
216
|
+
verificationTokens: import("mongoose").Types.DocumentArray<{
|
|
217
|
+
until?: NativeDate | null | undefined;
|
|
218
|
+
token?: string | null | undefined;
|
|
219
|
+
} & {
|
|
220
|
+
_id: import("mongoose").Types.ObjectId;
|
|
221
|
+
}, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, unknown, {
|
|
222
|
+
until?: NativeDate | null | undefined;
|
|
223
|
+
token?: string | null | undefined;
|
|
224
|
+
} & {
|
|
225
|
+
_id: import("mongoose").Types.ObjectId;
|
|
226
|
+
}, {}, {}> & {
|
|
227
|
+
until?: NativeDate | null | undefined;
|
|
228
|
+
token?: string | null | undefined;
|
|
229
|
+
} & {
|
|
230
|
+
_id: import("mongoose").Types.ObjectId;
|
|
231
|
+
}>;
|
|
232
|
+
passwordRecoveryTokens: import("mongoose").Types.DocumentArray<{
|
|
233
|
+
until?: NativeDate | null | undefined;
|
|
234
|
+
token?: string | null | undefined;
|
|
235
|
+
} & {
|
|
236
|
+
_id: import("mongoose").Types.ObjectId;
|
|
237
|
+
}, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, unknown, {
|
|
238
|
+
until?: NativeDate | null | undefined;
|
|
239
|
+
token?: string | null | undefined;
|
|
240
|
+
} & {
|
|
241
|
+
_id: import("mongoose").Types.ObjectId;
|
|
242
|
+
}, {}, {}> & {
|
|
243
|
+
until?: NativeDate | null | undefined;
|
|
244
|
+
token?: string | null | undefined;
|
|
245
|
+
} & {
|
|
246
|
+
_id: import("mongoose").Types.ObjectId;
|
|
247
|
+
}>;
|
|
248
|
+
permissions: import("mongoose").Types.Array<string>;
|
|
249
|
+
roles: import("mongoose").Types.Array<string>;
|
|
250
|
+
isVerified: boolean;
|
|
251
|
+
locale: string;
|
|
252
|
+
languages: import("mongoose").Types.Array<string>;
|
|
253
|
+
} & Required<{
|
|
254
|
+
_id: import("mongoose").Types.ObjectId;
|
|
255
|
+
}> & {
|
|
256
|
+
__v: number;
|
|
257
|
+
}, "id"> & import("mongoose").HydratedDocumentOverrides<object & {
|
|
258
|
+
id: string;
|
|
259
|
+
}>, '_id' | '$where' | 'isModified'>) => Promise<{
|
|
157
260
|
token: string;
|
|
158
261
|
valid: Date;
|
|
159
262
|
}>;
|