@adaptivestone/framework 5.6.0 → 5.7.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 +78 -1
- package/README.md +98 -0
- package/dist/clusterRunner.js +9 -4
- package/dist/clusterRunner.js.map +1 -1
- package/dist/codegen/appTypes.js +9 -6
- package/dist/codegen/appTypes.js.map +1 -1
- package/dist/codegen/astEmit.js +7 -0
- package/dist/codegen/astEmit.js.map +1 -1
- package/dist/codegen/astExtract.d.ts +3 -0
- package/dist/codegen/astExtract.js +1 -0
- package/dist/codegen/astExtract.js.map +1 -1
- package/dist/codegen/astResolve.d.ts +2 -0
- package/dist/codegen/astResolve.js +1 -0
- package/dist/codegen/astResolve.js.map +1 -1
- package/dist/codegen/emit.js +1 -1
- package/dist/codegen/index.js +1 -1
- package/dist/codegen/index.js.map +1 -1
- package/dist/commands/CreateUser.d.ts +1 -0
- package/dist/commands/CreateUser.js +1 -0
- package/dist/commands/CreateUser.js.map +1 -1
- package/dist/commands/SyncIndexes.js +4 -12
- package/dist/commands/SyncIndexes.js.map +1 -1
- package/dist/commands/migration/Migrate.js +3 -2
- package/dist/commands/migration/Migrate.js.map +1 -1
- package/dist/config/http.d.ts +1 -0
- package/dist/config/http.js +13 -2
- package/dist/config/http.js.map +1 -1
- package/dist/controllers/Auth.d.ts +22 -14
- package/dist/controllers/Auth.js +38 -72
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Auth.routes.gen.d.ts +1 -1
- package/dist/controllers/Auth.routes.gen.js +1 -1
- package/dist/controllers/Health.d.ts +8 -5
- package/dist/controllers/Health.js +11 -6
- package/dist/controllers/Health.js.map +1 -1
- package/dist/controllers/Health.routes.gen.d.ts +1 -1
- package/dist/controllers/Health.routes.gen.js +1 -1
- package/dist/controllers/Home.d.ts +3 -2
- package/dist/controllers/Home.js +6 -2
- package/dist/controllers/Home.js.map +1 -1
- package/dist/controllers/Home.routes.gen.d.ts +1 -1
- package/dist/controllers/Home.routes.gen.js +1 -1
- package/dist/controllers/index.js +83 -42
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/crypto.d.ts +6 -0
- package/dist/helpers/crypto.js +21 -4
- package/dist/helpers/crypto.js.map +1 -1
- package/dist/helpers/logger.d.ts +3 -1
- package/dist/helpers/logger.js +11 -1
- package/dist/helpers/logger.js.map +1 -1
- package/dist/helpers/passwordPolicy.d.ts +23 -0
- package/dist/helpers/passwordPolicy.js +62 -0
- package/dist/helpers/passwordPolicy.js.map +1 -0
- package/dist/helpers/redis/redisConnection.d.ts +1 -0
- package/dist/helpers/redis/redisConnection.js +1 -0
- package/dist/helpers/redis/redisConnection.js.map +1 -1
- package/dist/helpers/yup.d.ts +11 -5
- package/dist/helpers/yup.js +12 -6
- package/dist/helpers/yup.js.map +1 -1
- package/dist/locales/ru/translation.json +31 -0
- package/dist/models/Lock.d.ts +2 -2
- package/dist/models/Lock.js +64 -15
- package/dist/models/Lock.js.map +1 -1
- package/dist/models/User.d.ts +5 -4
- package/dist/models/User.js +4 -4
- package/dist/models/User.js.map +1 -1
- package/dist/models/UserOld.d.ts +2 -0
- package/dist/models/UserOld.js +9 -3
- package/dist/models/UserOld.js.map +1 -1
- package/dist/modules/BaseCli.d.ts +5 -0
- package/dist/modules/BaseCli.js +10 -1
- package/dist/modules/BaseCli.js.map +1 -1
- package/dist/server.d.ts +22 -2
- package/dist/server.js +127 -18
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.js +16 -8
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/cache/drivers/RedisDriver.js +15 -11
- package/dist/services/cache/drivers/RedisDriver.js.map +1 -1
- package/dist/services/http/ExpressResponseWriter.d.ts +30 -0
- package/dist/services/http/ExpressResponseWriter.js +447 -0
- package/dist/services/http/ExpressResponseWriter.js.map +1 -0
- package/dist/services/http/HttpServer.d.ts +17 -11
- package/dist/services/http/HttpServer.js +71 -23
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/ResponseWriter.d.ts +11 -0
- package/dist/services/http/ResponseWriter.js +2 -0
- package/dist/services/http/ResponseWriter.js.map +1 -0
- package/dist/services/http/builtInResponse.d.ts +26 -0
- package/dist/services/http/builtInResponse.js +70 -0
- package/dist/services/http/builtInResponse.js.map +1 -0
- package/dist/services/http/builtinErrorHandlers.d.ts +60 -7
- package/dist/services/http/builtinErrorHandlers.js +86 -5
- package/dist/services/http/builtinErrorHandlers.js.map +1 -1
- package/dist/services/http/files.d.ts +21 -8
- package/dist/services/http/files.js +2 -18
- package/dist/services/http/files.js.map +1 -1
- package/dist/services/http/httpErrors.d.ts +40 -2
- package/dist/services/http/httpErrors.js +50 -2
- package/dist/services/http/httpErrors.js.map +1 -1
- package/dist/services/http/middleware/Cors.js +5 -0
- package/dist/services/http/middleware/Cors.js.map +1 -1
- package/dist/services/http/middleware/IpDetector.js +23 -4
- package/dist/services/http/middleware/IpDetector.js.map +1 -1
- package/dist/services/http/middleware/Pagination.js +4 -2
- package/dist/services/http/middleware/Pagination.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.d.ts +1 -0
- package/dist/services/http/middleware/RateLimiter.js +37 -13
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.d.ts +9 -3
- package/dist/services/http/middleware/RequestParser.js +108 -36
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/services/http/responses.d.ts +114 -0
- package/dist/services/http/responses.js +191 -0
- package/dist/services/http/responses.js.map +1 -0
- package/dist/services/http/routing/ExpressAdapter.d.ts +4 -1
- package/dist/services/http/routing/ExpressAdapter.js +82 -9
- package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
- package/dist/services/http/routing/RouteRegistry.js +21 -10
- package/dist/services/http/routing/RouteRegistry.js.map +1 -1
- package/dist/services/i18n/I18n.js.map +1 -1
- package/dist/services/i18n/types.d.ts +2 -1
- package/dist/services/validate/ValidationError.d.ts +8 -1
- package/dist/services/validate/ValidationError.js +10 -2
- package/dist/services/validate/ValidationError.js.map +1 -1
- package/dist/services/validate/drivers/YupDriver.js +44 -6
- package/dist/services/validate/drivers/YupDriver.js.map +1 -1
- package/dist/tests/setupFramework.d.ts +4 -1
- package/dist/tests/setupFramework.js +15 -9
- package/dist/tests/setupFramework.js.map +1 -1
- package/package.json +5 -5
package/dist/helpers/logger.js
CHANGED
|
@@ -30,5 +30,15 @@ const consoleLogger = (level, message) => {
|
|
|
30
30
|
console.log(message);
|
|
31
31
|
}
|
|
32
32
|
};
|
|
33
|
-
|
|
33
|
+
/** @internal A thrown value as log text: its stack if it has one, else its string form. Never throws. */
|
|
34
|
+
const describeThrown = (value) => {
|
|
35
|
+
try {
|
|
36
|
+
const stack = value?.stack;
|
|
37
|
+
return typeof stack === 'string' ? stack : String(value);
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
return '[unprintable value]';
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
export { consoleLogger, describeThrown, levels, noopLogger };
|
|
34
44
|
//# sourceMappingURL=logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/helpers/logger.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAU,CAAC;AAI3D;;;;;;GAMG;AACH,MAAM,IAAI,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AACtB,MAAM,UAAU,GAAG;IACjB,KAAK,EAAE,IAAI;IACX,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,IAAI;IACX,GAAG,EAAE,IAAI;IACT,KAAK;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;CAC2B,CAAC;AAE/B,+EAA+E;AAC/E,gFAAgF;AAChF,MAAM,aAAa,GAAG,CAAC,KAAe,EAAE,OAAe,EAAE,EAAE;IACzD,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACnB,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;AACH,CAAC,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/helpers/logger.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAU,CAAC;AAI3D;;;;;;GAMG;AACH,MAAM,IAAI,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AACtB,MAAM,UAAU,GAAG;IACjB,KAAK,EAAE,IAAI;IACX,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,IAAI;IACX,GAAG,EAAE,IAAI;IACT,KAAK;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;CAC2B,CAAC;AAE/B,+EAA+E;AAC/E,gFAAgF;AAChF,MAAM,aAAa,GAAG,CAAC,KAAe,EAAE,OAAe,EAAE,EAAE;IACzD,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACnB,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;AACH,CAAC,CAAC;AAEF,yGAAyG;AACzG,MAAM,cAAc,GAAG,CAAC,KAAc,EAAU,EAAE;IAChD,IAAI,CAAC;QACH,MAAM,KAAK,GAAI,KAAgD,EAAE,KAAK,CAAC;QACvE,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,qBAAqB,CAAC;IAC/B,CAAC;AACH,CAAC,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { ValidationIssue } from '../services/validate/types.ts';
|
|
2
|
+
/** @internal English defaults of the password messages, shared with the `Auth` controller. */
|
|
3
|
+
export declare const PASSWORD_EN: {
|
|
4
|
+
readonly 'auth.passwordProvided': 'Password must be provided';
|
|
5
|
+
readonly 'auth.passwordTooShort': 'Password must be at least {{min}} characters';
|
|
6
|
+
readonly 'auth.passwordTooLong': 'Password must be at most {{max}} characters';
|
|
7
|
+
};
|
|
8
|
+
/** @internal {@link passwordPolicyIssues} against the given `auth` config. */
|
|
9
|
+
export declare const passwordPolicyIssuesFor: (authConfig: Record<string, unknown>, password: unknown, field?: string) => ValidationIssue[];
|
|
10
|
+
/**
|
|
11
|
+
* Check a new password against `auth.passwordPolicy` (`minLength`..`maxLength`
|
|
12
|
+
* Unicode code points). Returns `[]` when it passes, otherwise one issue at
|
|
13
|
+
* `field` whose message is an i18n key with an English default; a thrown
|
|
14
|
+
* `HttpError` translates it. Throws when the policy config is invalid.
|
|
15
|
+
*
|
|
16
|
+
* ```ts
|
|
17
|
+
* const issues = passwordPolicyIssues(req.appInfo.request.newPassword, 'newPassword');
|
|
18
|
+
* if (issues.length) {
|
|
19
|
+
* throw new BadRequestError({ code: 'VALIDATION_FAILED', message: 'Validation failed', errors: issues });
|
|
20
|
+
* }
|
|
21
|
+
* ```
|
|
22
|
+
*/
|
|
23
|
+
export declare const passwordPolicyIssues: (password: unknown, field?: string) => ValidationIssue[];
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { getAppInstance } from './appInstance.js';
|
|
2
|
+
/** @internal English defaults of the password messages, shared with the `Auth` controller. */
|
|
3
|
+
export const PASSWORD_EN = {
|
|
4
|
+
'auth.passwordProvided': 'Password must be provided',
|
|
5
|
+
'auth.passwordTooShort': 'Password must be at least {{min}} characters',
|
|
6
|
+
'auth.passwordTooLong': 'Password must be at most {{max}} characters',
|
|
7
|
+
};
|
|
8
|
+
/** @internal {@link passwordPolicyIssues} against the given `auth` config. */
|
|
9
|
+
export const passwordPolicyIssuesFor = (authConfig, password, field = 'password') => {
|
|
10
|
+
if (typeof password !== 'string' || password === '') {
|
|
11
|
+
return [
|
|
12
|
+
{
|
|
13
|
+
message: 'auth.passwordProvided',
|
|
14
|
+
path: [field],
|
|
15
|
+
params: { defaultValue: PASSWORD_EN['auth.passwordProvided'] },
|
|
16
|
+
},
|
|
17
|
+
];
|
|
18
|
+
}
|
|
19
|
+
const policy = authConfig.passwordPolicy;
|
|
20
|
+
const min = policy?.minLength ?? 15;
|
|
21
|
+
const max = policy?.maxLength ?? 128;
|
|
22
|
+
if (!Number.isInteger(min) ||
|
|
23
|
+
min < 1 ||
|
|
24
|
+
!Number.isInteger(max) ||
|
|
25
|
+
max < min) {
|
|
26
|
+
throw new Error('Invalid auth.passwordPolicy: require 1 <= minLength <= maxLength');
|
|
27
|
+
}
|
|
28
|
+
// Count Unicode code points, without normalizing or truncating the secret.
|
|
29
|
+
const length = Array.from(password).length;
|
|
30
|
+
if (length >= min && length <= max) {
|
|
31
|
+
return [];
|
|
32
|
+
}
|
|
33
|
+
const message = length < min ? 'auth.passwordTooShort' : 'auth.passwordTooLong';
|
|
34
|
+
return [
|
|
35
|
+
{
|
|
36
|
+
message,
|
|
37
|
+
path: [field],
|
|
38
|
+
params: {
|
|
39
|
+
min,
|
|
40
|
+
max,
|
|
41
|
+
defaultValue: PASSWORD_EN[message]
|
|
42
|
+
.replace('{{min}}', String(min))
|
|
43
|
+
.replace('{{max}}', String(max)),
|
|
44
|
+
},
|
|
45
|
+
},
|
|
46
|
+
];
|
|
47
|
+
};
|
|
48
|
+
/**
|
|
49
|
+
* Check a new password against `auth.passwordPolicy` (`minLength`..`maxLength`
|
|
50
|
+
* Unicode code points). Returns `[]` when it passes, otherwise one issue at
|
|
51
|
+
* `field` whose message is an i18n key with an English default; a thrown
|
|
52
|
+
* `HttpError` translates it. Throws when the policy config is invalid.
|
|
53
|
+
*
|
|
54
|
+
* ```ts
|
|
55
|
+
* const issues = passwordPolicyIssues(req.appInfo.request.newPassword, 'newPassword');
|
|
56
|
+
* if (issues.length) {
|
|
57
|
+
* throw new BadRequestError({ code: 'VALIDATION_FAILED', message: 'Validation failed', errors: issues });
|
|
58
|
+
* }
|
|
59
|
+
* ```
|
|
60
|
+
*/
|
|
61
|
+
export const passwordPolicyIssues = (password, field = 'password') => passwordPolicyIssuesFor(getAppInstance().getConfig('auth'), password, field);
|
|
62
|
+
//# sourceMappingURL=passwordPolicy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"passwordPolicy.js","sourceRoot":"","sources":["../../src/helpers/passwordPolicy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,8FAA8F;AAC9F,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,uBAAuB,EAAE,2BAA2B;IACpD,uBAAuB,EAAE,8CAA8C;IACvE,sBAAsB,EAAE,6CAA6C;CAC7D,CAAC;AAEX,8EAA8E;AAC9E,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,UAAmC,EACnC,QAAiB,EACjB,KAAK,GAAG,UAAU,EACC,EAAE;IACrB,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;QACpD,OAAO;YACL;gBACE,OAAO,EAAE,uBAAuB;gBAChC,IAAI,EAAE,CAAC,KAAK,CAAC;gBACb,MAAM,EAAE,EAAE,YAAY,EAAE,WAAW,CAAC,uBAAuB,CAAC,EAAE;aAC/D;SACF,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,cAEb,CAAC;IACd,MAAM,GAAG,GAAG,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC;IACpC,MAAM,GAAG,GAAG,MAAM,EAAE,SAAS,IAAI,GAAG,CAAC;IACrC,IACE,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC;QACtB,GAAG,GAAG,CAAC;QACP,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC;QACtB,GAAG,GAAG,GAAG,EACT,CAAC;QACD,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;IACJ,CAAC;IACD,2EAA2E;IAC3E,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IAC3C,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,OAAO,GACX,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,sBAAsB,CAAC;IAClE,OAAO;QACL;YACE,OAAO;YACP,IAAI,EAAE,CAAC,KAAK,CAAC;YACb,MAAM,EAAE;gBACN,GAAG;gBACH,GAAG;gBACH,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC;qBAC/B,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;qBAC/B,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;aACnC;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,QAAiB,EACjB,KAAK,GAAG,UAAU,EACC,EAAE,CACrB,uBAAuB,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC"}
|
|
@@ -4,5 +4,6 @@ export declare const getRedisClient: () => Promise<RedisClientType>;
|
|
|
4
4
|
* Synchronous way to get redis client. Make sure to call connect on it before usage.
|
|
5
5
|
* Connection failure is logged (not an unhandled rejection), and concurrent async
|
|
6
6
|
* callers all await the same connect via {@link getRedisClient}.
|
|
7
|
+
* Throws when `redis.url` is malformed: the client parses it when built.
|
|
7
8
|
*/
|
|
8
9
|
export declare const getRedisClientSync: () => RedisClientType;
|
|
@@ -25,6 +25,7 @@ export const getRedisClient = () => {
|
|
|
25
25
|
* Synchronous way to get redis client. Make sure to call connect on it before usage.
|
|
26
26
|
* Connection failure is logged (not an unhandled rejection), and concurrent async
|
|
27
27
|
* callers all await the same connect via {@link getRedisClient}.
|
|
28
|
+
* Throws when `redis.url` is malformed: the client parses it when built.
|
|
28
29
|
*/
|
|
29
30
|
export const getRedisClientSync = () => {
|
|
30
31
|
if (!redisClient) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisConnection.js","sourceRoot":"","sources":["../../../src/helpers/redis/redisConnection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,gFAAgF;AAChF,gFAAgF;AAChF,iFAAiF;AACjF,+CAA+C;AAC/C,IAAI,aAAa,GAAoC,IAAI,CAAC;AAC1D,IAAI,WAAW,GAA2B,IAAI,CAAC;AAC/C,IAAI,sBAAsB,GAAG,KAAK,CAAC;AAEnC,MAAM,CAAC,MAAM,cAAc,GAAG,GAA6B,EAAE;IAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC;QAC7B,WAAW,GAAG,MAAM,CAAC;QACrB,aAAa,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;QACpD,2EAA2E;QAC3E,6EAA6E;QAC7E,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE;YACvB,aAAa,GAAG,IAAI,CAAC;YACrB,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"redisConnection.js","sourceRoot":"","sources":["../../../src/helpers/redis/redisConnection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,gFAAgF;AAChF,gFAAgF;AAChF,iFAAiF;AACjF,+CAA+C;AAC/C,IAAI,aAAa,GAAoC,IAAI,CAAC;AAC1D,IAAI,WAAW,GAA2B,IAAI,CAAC;AAC/C,IAAI,sBAAsB,GAAG,KAAK,CAAC;AAEnC,MAAM,CAAC,MAAM,cAAc,GAAG,GAA6B,EAAE;IAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC;QAC7B,WAAW,GAAG,MAAM,CAAC;QACrB,aAAa,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;QACpD,2EAA2E;QAC3E,6EAA6E;QAC7E,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE;YACvB,aAAa,GAAG,IAAI,CAAC;YACrB,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAoB,EAAE;IACtD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,4EAA4E;QAC5E,2EAA2E;QAC3E,wCAAwC;QACxC,cAAc,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3B,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,yBAAyB,CAAC,EAAE,CAAC,CACxD,CAAC;IACJ,CAAC;IACD,OAAO,WAA8B,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,GAAoB,EAAE;IACxC,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,OAAO,CAEhD,CAAC;IAEF,MAAM,MAAM,GAAoB,YAAY,CAAC;QAC3C,GAAG,EAAE,WAAW,CAAC,GAAG;KACrB,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;QACjC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACxB,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,4EAA4E;IAC5E,4DAA4D;IAC5D,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC5B,sBAAsB,GAAG,IAAI,CAAC;QAC9B,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE;YAC3C,IAAI,WAAW,EAAE,MAAM,EAAE,CAAC;gBACxB,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;YAC3B,CAAC;YACD,WAAW,GAAG,IAAI,CAAC;YACnB,aAAa,GAAG,IAAI,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
package/dist/helpers/yup.d.ts
CHANGED
|
@@ -3,13 +3,19 @@ import { Schema } from 'yup';
|
|
|
3
3
|
* Validator for an uploaded file (yup-specific).
|
|
4
4
|
*
|
|
5
5
|
* @deprecated Since 5.0.0-beta.51 — `YupFile` will be removed in v6. Validate
|
|
6
|
-
* files with the framework's vendor-neutral `File` type and
|
|
7
|
-
*
|
|
6
|
+
* files with the framework's vendor-neutral `File` type and an `instanceof`
|
|
7
|
+
* check instead (no yup required). A file field always arrives as an array;
|
|
8
|
+
* check the array as a whole, as `YupFile` does, so an error stays under the
|
|
9
|
+
* field name (a per-element check reports `avatar[0]`, not `avatar`):
|
|
8
10
|
*
|
|
9
11
|
* import { File } from '@adaptivestone/framework/types.js';
|
|
10
|
-
*
|
|
11
|
-
* //
|
|
12
|
-
* //
|
|
12
|
+
* const files = (v: unknown) => Array.isArray(v) && v.every((f) => f instanceof File);
|
|
13
|
+
* // zod: z.custom<File[]>(files, 'not a file')
|
|
14
|
+
* // valibot: v.custom<File[]>(files, 'not a file')
|
|
15
|
+
* // yup: mixed<File[]>().test('file', 'not a file', files)
|
|
16
|
+
*
|
|
17
|
+
* A missing field fails these checks; for an optional one, let `files` also
|
|
18
|
+
* accept `undefined`.
|
|
13
19
|
*
|
|
14
20
|
* @example
|
|
15
21
|
* request: yup.object().shape({
|
package/dist/helpers/yup.js
CHANGED
|
@@ -9,13 +9,19 @@ let deprecationWarned = false;
|
|
|
9
9
|
* Validator for an uploaded file (yup-specific).
|
|
10
10
|
*
|
|
11
11
|
* @deprecated Since 5.0.0-beta.51 — `YupFile` will be removed in v6. Validate
|
|
12
|
-
* files with the framework's vendor-neutral `File` type and
|
|
13
|
-
*
|
|
12
|
+
* files with the framework's vendor-neutral `File` type and an `instanceof`
|
|
13
|
+
* check instead (no yup required). A file field always arrives as an array;
|
|
14
|
+
* check the array as a whole, as `YupFile` does, so an error stays under the
|
|
15
|
+
* field name (a per-element check reports `avatar[0]`, not `avatar`):
|
|
14
16
|
*
|
|
15
17
|
* import { File } from '@adaptivestone/framework/types.js';
|
|
16
|
-
*
|
|
17
|
-
* //
|
|
18
|
-
* //
|
|
18
|
+
* const files = (v: unknown) => Array.isArray(v) && v.every((f) => f instanceof File);
|
|
19
|
+
* // zod: z.custom<File[]>(files, 'not a file')
|
|
20
|
+
* // valibot: v.custom<File[]>(files, 'not a file')
|
|
21
|
+
* // yup: mixed<File[]>().test('file', 'not a file', files)
|
|
22
|
+
*
|
|
23
|
+
* A missing field fails these checks; for an optional one, let `files` also
|
|
24
|
+
* accept `undefined`.
|
|
19
25
|
*
|
|
20
26
|
* @example
|
|
21
27
|
* request: yup.object().shape({
|
|
@@ -31,7 +37,7 @@ class YupFile extends Schema {
|
|
|
31
37
|
});
|
|
32
38
|
if (!deprecationWarned) {
|
|
33
39
|
deprecationWarned = true;
|
|
34
|
-
process.emitWarning(
|
|
40
|
+
process.emitWarning("YupFile is deprecated and will be removed in v6. Validate uploaded files with the `File` export from \"@adaptivestone/framework/types.js\" and an instanceof check. A file field arrives as an array; check the array as a whole so errors stay under the field name (e.g. mixed().test('file', 'not a file', (v) => Array.isArray(v) && v.every((f) => f instanceof File))).", { type: 'DeprecationWarning', code: 'ASF_DEP_YUPFILE' });
|
|
35
41
|
}
|
|
36
42
|
}
|
|
37
43
|
}
|
package/dist/helpers/yup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yup.js","sourceRoot":"","sources":["../../src/helpers/yup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAE7B,2EAA2E;AAC3E,+EAA+E;AAC/E,qEAAqE;AACrE,qEAAqE;AACrE,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B
|
|
1
|
+
{"version":3,"file":"yup.js","sourceRoot":"","sources":["../../src/helpers/yup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAE7B,2EAA2E;AAC3E,+EAA+E;AAC/E,qEAAqE;AACrE,qEAAqE;AACrE,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,OAAQ,SAAQ,MAAM;IAC1B;QACE,KAAK,CAAC;YACJ,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,CAAC,KAAc,EAAE,EAAE,CACxB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;gBACpB,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,cAAc,CAAC;SACxD,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,iBAAiB,GAAG,IAAI,CAAC;YACzB,OAAO,CAAC,WAAW,CACjB,+WAA+W,EAC/W,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,iBAAiB,EAAE,CACxD,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,OAAO,EAAE,OAAO,EAAE,CAAC"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
"passwordRecoveryTokenProvided": "Нужно указать токен восстановления пароля",
|
|
8
8
|
"passwordValid": "Неверный формат пароля,только a-z,A-Z,0-9,!,@,#,$,%,ˆ,&,*,(,),_,+,{,},[,],<,>",
|
|
9
9
|
"passwordTooShort": "Пароль должен быть не менее {{min}} символов",
|
|
10
|
+
"passwordTooLong": "Пароль должен быть не более {{max}} символов",
|
|
10
11
|
"emailValid": "Неверный формат Email-а",
|
|
11
12
|
"errorUPValid": "Не правильно указаны емэйл или пароль",
|
|
12
13
|
"messageSome": "Проблемы с сервером. Пожалуйста попробуйте позже",
|
|
@@ -24,5 +25,35 @@
|
|
|
24
25
|
"passwordChanged": "Пароль был изменен",
|
|
25
26
|
"passwordRecovery": "Восстановление пароля",
|
|
26
27
|
"emailConfirm": "Подтверждение Email"
|
|
28
|
+
},
|
|
29
|
+
"password": {
|
|
30
|
+
"wrongToken": "Неверный токен восстановления пароля"
|
|
31
|
+
},
|
|
32
|
+
"http": {
|
|
33
|
+
"notFound": "Не найдено",
|
|
34
|
+
"methodNotAllowed": "Метод не поддерживается",
|
|
35
|
+
"unsupportedContentType": "Неподдерживаемый Content-Type. Ожидается один из: {{types}}",
|
|
36
|
+
"malformedUrl": "Некорректный URL",
|
|
37
|
+
"serverError": "Что-то пошло не так. Пожалуйста, попробуйте позже.",
|
|
38
|
+
"validationFailed": "Ошибка проверки данных"
|
|
39
|
+
},
|
|
40
|
+
"middleware": {
|
|
41
|
+
"auth": {
|
|
42
|
+
"notLoggedIn": "Пожалуйста, войдите в приложение"
|
|
43
|
+
},
|
|
44
|
+
"role": {
|
|
45
|
+
"userRequired": "Требуется авторизованный пользователь",
|
|
46
|
+
"noAccess": "У вас нет доступа"
|
|
47
|
+
},
|
|
48
|
+
"rateLimiter": {
|
|
49
|
+
"tooManyRequests": "Слишком много запросов"
|
|
50
|
+
},
|
|
51
|
+
"requestParser": {
|
|
52
|
+
"entityTooLarge": "Слишком большой запрос. Загрузка превышает допустимые ограничения по размеру или количеству.",
|
|
53
|
+
"parseError": "Не удалось разобрать запрос. Указан неверный Content-Type или Content-Length. Пожалуйста, проверьте заголовки и тип содержимого запроса."
|
|
54
|
+
}
|
|
55
|
+
},
|
|
56
|
+
"health": {
|
|
57
|
+
"unauthorized": "Требуется авторизация"
|
|
27
58
|
}
|
|
28
59
|
}
|
package/dist/models/Lock.d.ts
CHANGED
|
@@ -49,7 +49,7 @@ declare class Lock extends BaseModel {
|
|
|
49
49
|
};
|
|
50
50
|
}, {}>, name: string) => Promise<boolean>;
|
|
51
51
|
/**
|
|
52
|
-
* Resolve once the named lock is gone. Optionally reject after
|
|
52
|
+
* Resolve once the named lock is gone or expires. Optionally reject after
|
|
53
53
|
* `timeoutMs` so callers can bound the wait.
|
|
54
54
|
* @param {string} name
|
|
55
55
|
* @param {number} [timeoutMs] reject after this many ms if still locked
|
|
@@ -62,7 +62,7 @@ declare class Lock extends BaseModel {
|
|
|
62
62
|
readonly expiredAt: {
|
|
63
63
|
readonly type: DateConstructor;
|
|
64
64
|
};
|
|
65
|
-
}, {}>, name: string, timeoutMs?: number) => Promise<
|
|
65
|
+
}, {}>, name: string, timeoutMs?: number) => Promise<boolean | undefined>;
|
|
66
66
|
/**
|
|
67
67
|
* get lock remaining time based on lock name
|
|
68
68
|
* @param {string} name
|
package/dist/models/Lock.js
CHANGED
|
@@ -59,7 +59,7 @@ class Lock extends BaseModel {
|
|
|
59
59
|
return false;
|
|
60
60
|
},
|
|
61
61
|
/**
|
|
62
|
-
* Resolve once the named lock is gone. Optionally reject after
|
|
62
|
+
* Resolve once the named lock is gone or expires. Optionally reject after
|
|
63
63
|
* `timeoutMs` so callers can bound the wait.
|
|
64
64
|
* @param {string} name
|
|
65
65
|
* @param {number} [timeoutMs] reject after this many ms if still locked
|
|
@@ -71,28 +71,77 @@ class Lock extends BaseModel {
|
|
|
71
71
|
// is missed forever. So: attach the listener (opening the cursor),
|
|
72
72
|
// wait for 'resumeTokenChanged' — the wrapper's first signal that the
|
|
73
73
|
// aggregate has run and the start point is fixed — and only then read.
|
|
74
|
-
// A delete after that point is guaranteed observed
|
|
75
|
-
//
|
|
74
|
+
// A delete after that point is guaranteed observed. The re-check also
|
|
75
|
+
// treats an expired record as unlocked, then schedules another check
|
|
76
|
+
// at a live lock's expiry so callers don't wait for Mongo's TTL reaper.
|
|
76
77
|
const stream = this.watch([
|
|
77
78
|
{ $match: { operationType: 'delete', 'documentKey._id': name } },
|
|
78
79
|
]);
|
|
79
80
|
try {
|
|
80
81
|
return await new Promise((resolve, reject) => {
|
|
81
|
-
|
|
82
|
+
let settled = false;
|
|
83
|
+
let expiryTimer;
|
|
84
|
+
let timeoutTimer;
|
|
85
|
+
const clearTimers = () => {
|
|
86
|
+
if (expiryTimer) {
|
|
87
|
+
clearTimeout(expiryTimer);
|
|
88
|
+
}
|
|
89
|
+
if (timeoutTimer) {
|
|
90
|
+
clearTimeout(timeoutTimer);
|
|
91
|
+
}
|
|
92
|
+
};
|
|
93
|
+
const finish = (value) => {
|
|
94
|
+
if (settled) {
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
settled = true;
|
|
98
|
+
clearTimers();
|
|
99
|
+
resolve(value);
|
|
100
|
+
};
|
|
101
|
+
const fail = (error) => {
|
|
102
|
+
if (settled) {
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
settled = true;
|
|
106
|
+
clearTimers();
|
|
107
|
+
reject(error);
|
|
108
|
+
};
|
|
109
|
+
const checkActiveLock = async () => {
|
|
110
|
+
if (settled) {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
try {
|
|
114
|
+
const activeLock = await this.findOne({
|
|
115
|
+
_id: name,
|
|
116
|
+
expiredAt: { $gt: new Date() },
|
|
117
|
+
});
|
|
118
|
+
if (settled) {
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
if (!activeLock?.expiredAt) {
|
|
122
|
+
finish(undefined);
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
const expiresAt = activeLock.expiredAt.getTime();
|
|
126
|
+
if (expiresAt <= Date.now()) {
|
|
127
|
+
finish(undefined);
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
expiryTimer = setTimeout(() => void checkActiveLock(), Math.min(2_147_483_647, Math.max(1, expiresAt - Date.now() + 1)));
|
|
131
|
+
expiryTimer.unref();
|
|
132
|
+
}
|
|
133
|
+
catch (error) {
|
|
134
|
+
fail(error);
|
|
135
|
+
}
|
|
136
|
+
};
|
|
137
|
+
stream.on('change', () => finish(true));
|
|
82
138
|
// A standalone Mongo (change streams need a replica set) or a stream
|
|
83
139
|
// failure emits 'error'; unhandled, it would crash the process.
|
|
84
|
-
stream.on('error',
|
|
85
|
-
stream.once('resumeTokenChanged', () =>
|
|
86
|
-
this.findOne({ _id: name })
|
|
87
|
-
.then((exists) => {
|
|
88
|
-
if (!exists) {
|
|
89
|
-
resolve(undefined);
|
|
90
|
-
}
|
|
91
|
-
})
|
|
92
|
-
.catch(reject);
|
|
93
|
-
});
|
|
140
|
+
stream.on('error', fail);
|
|
141
|
+
stream.once('resumeTokenChanged', () => void checkActiveLock());
|
|
94
142
|
if (timeoutMs) {
|
|
95
|
-
setTimeout(() =>
|
|
143
|
+
timeoutTimer = setTimeout(() => fail(new Error(`waitForUnlock('${name}') timed out`)), timeoutMs);
|
|
144
|
+
timeoutTimer.unref();
|
|
96
145
|
}
|
|
97
146
|
});
|
|
98
147
|
}
|
package/dist/models/Lock.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Lock.js","sourceRoot":"","sources":["../../src/models/Lock.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAIpD,MAAM,IAAK,SAAQ,SAAS;IAC1B,MAAM,CAAC,SAAS,CAAC,MAAc;QAC7B,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,kBAAkB,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO;YACL,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACrC,SAAS,EAAE;gBACT,IAAI,EAAE,IAAI;aACX;SACO,CAAC;IACb,CAAC;IAED,MAAM,KAAK,YAAY;QAMrB,OAAO;YACL;;;;;;;;eAQG;YACH,WAAW,EAAE,KAAK,WAEhB,IAAY,EACZ,UAAU,GAAG,EAAE;gBAEf,IAAI,CAAC;oBACH,mEAAmE;oBACnE,wEAAwE;oBACxE,qEAAqE;oBACrE,wEAAwE;oBACxE,kEAAkE;oBAClE,MAAM,IAAI,CAAC,gBAAgB,CACzB;wBACE,GAAG,EAAE,IAAI;wBACT,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;qBAC/D,EACD,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,EAAE,EACvD,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB,CAAC;gBACJ,CAAC;gBAAC,OAAO,KAAc,EAAE,CAAC;oBACxB,IAAK,KAAoB,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;wBACzC,oDAAoD;wBACpD,MAAM,KAAK,CAAC;oBACd,CAAC;oBACD,iDAAiD;oBACjD,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED;;;;;;eAMG;YACH,WAAW,EAAE,KAAK,WAAgC,IAAY;gBAC5D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChD,IAAI,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;oBACzC,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;YAED;;;;;eAKG;YACH,aAAa,EAAE,KAAK,WAElB,IAAY,EACZ,SAAkB;gBAElB,gEAAgE;gBAChE,qEAAqE;gBACrE,sEAAsE;gBACtE,mEAAmE;gBACnE,sEAAsE;gBACtE,uEAAuE;gBACvE,
|
|
1
|
+
{"version":3,"file":"Lock.js","sourceRoot":"","sources":["../../src/models/Lock.ts"],"names":[],"mappings":"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"}
|
package/dist/models/User.d.ts
CHANGED
|
@@ -62,10 +62,11 @@ export type UserAuthModel<TField extends UserAuthField = UserAuthField> = Model<
|
|
|
62
62
|
export type UserPublicDoc = Pick<InstanceType<UserModelLite>, 'avatar' | 'name' | 'email' | 'id' | 'isVerified' | 'permissions' | 'locale'>;
|
|
63
63
|
/**
|
|
64
64
|
* Augmentation point so `req.appInfo.user` follows a project's OWN `User` model
|
|
65
|
-
* when it replaces the framework's. `
|
|
66
|
-
* `genTypes.d.ts` (mirroring how it types
|
|
67
|
-
* hand only if you don't run codegen.
|
|
68
|
-
* so wrap the model class in
|
|
65
|
+
* when it replaces the framework's. `node src/cli.ts generatetypes` emits this
|
|
66
|
+
* automatically into `genTypes.d.ts` (mirroring how it types
|
|
67
|
+
* `app.getModel('User')`); declare it by hand only if you don't run codegen.
|
|
68
|
+
* `User` must be the hydrated DOCUMENT type, so wrap the model class in
|
|
69
|
+
* `InstanceType<GetModelTypeFromClass<…>>`:
|
|
69
70
|
*
|
|
70
71
|
* import type { GetModelTypeFromClass } from '@adaptivestone/framework/modules/BaseModel.js';
|
|
71
72
|
* declare module '@adaptivestone/framework/models/User.js' {
|
package/dist/models/User.js
CHANGED
|
@@ -62,10 +62,13 @@ const clearHydratedArray = (document, path) => Object.assign(document, { [path]:
|
|
|
62
62
|
class User extends BaseModel {
|
|
63
63
|
static initHooks(schema) {
|
|
64
64
|
schema.pre('save', async function userPreSaveHook() {
|
|
65
|
-
if (this.isModified('password')
|
|
65
|
+
if (this.isModified('password') &&
|
|
66
|
+
typeof this.password === 'string' &&
|
|
67
|
+
this.password.length > 0) {
|
|
66
68
|
this.password = await hashPassword(this.password);
|
|
67
69
|
}
|
|
68
70
|
});
|
|
71
|
+
schema.index({ 'sessionTokens.token': 1 });
|
|
69
72
|
}
|
|
70
73
|
static get modelSchema() {
|
|
71
74
|
return {
|
|
@@ -266,9 +269,6 @@ class User extends BaseModel {
|
|
|
266
269
|
generateToken: async function () {
|
|
267
270
|
const timestamp = new Date();
|
|
268
271
|
timestamp.setDate(timestamp.getDate() + 30);
|
|
269
|
-
if (!this.email) {
|
|
270
|
-
throw new Error('Email is required');
|
|
271
|
-
}
|
|
272
272
|
const token = createRandomToken();
|
|
273
273
|
if (!this.sessionTokens) {
|
|
274
274
|
clearHydratedArray(this, 'sessionTokens');
|
package/dist/models/User.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../src/models/User.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../src/models/User.ts"],"names":[],"mappings":"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"}
|
package/dist/models/UserOld.d.ts
CHANGED
|
@@ -46,6 +46,8 @@ interface IStatic extends IAbstractModel<IUser, IAbstractModelMethods<IUser>> {
|
|
|
46
46
|
until: Date;
|
|
47
47
|
}>;
|
|
48
48
|
}
|
|
49
|
+
/** @internal Emit the `UserOld` deprecation warning (code `ASF_DEP_USEROLD`). */
|
|
50
|
+
export declare const warnUserOldDeprecated: () => void;
|
|
49
51
|
/**
|
|
50
52
|
* @deprecated Use the `User` model instead. `UserOld` is kept for v5 and will be
|
|
51
53
|
* **removed in v6**.
|
package/dist/models/UserOld.js
CHANGED
|
@@ -1,15 +1,21 @@
|
|
|
1
1
|
import { appInstance } from '../helpers/appInstance.js';
|
|
2
2
|
import { burnPasswordVerify, scryptAsync } from '../helpers/crypto.js';
|
|
3
3
|
import AbstractModel from '../modules/AbstractModel.js';
|
|
4
|
+
/** @internal Emit the `UserOld` deprecation warning (code `ASF_DEP_USEROLD`). */
|
|
5
|
+
export const warnUserOldDeprecated = () => process.emitWarning('UserOld is deprecated and will be removed in v6 — migrate to the User model. ' +
|
|
6
|
+
'SECURITY: UserOld implements known-weak legacy auth (timing-unsafe password ' +
|
|
7
|
+
'compare, no per-user salt, plaintext non-expiring session tokens).', { type: 'DeprecationWarning', code: 'ASF_DEP_USEROLD' });
|
|
4
8
|
/**
|
|
5
9
|
* @deprecated Use the `User` model instead. `UserOld` is kept for v5 and will be
|
|
6
10
|
* **removed in v6**.
|
|
7
11
|
*/
|
|
8
12
|
class UserOld extends AbstractModel {
|
|
9
13
|
constructor(app) {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
14
|
+
// Every app auto-loads this class, so only a subclass is a use here;
|
|
15
|
+
// `getModel('UserOld')` warns on its first call.
|
|
16
|
+
if (new.target !== UserOld) {
|
|
17
|
+
warnUserOldDeprecated();
|
|
18
|
+
}
|
|
13
19
|
super(app);
|
|
14
20
|
}
|
|
15
21
|
initHooks() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserOld.js","sourceRoot":"","sources":["../../src/models/UserOld.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAKvE,OAAO,aAAa,MAAM,6BAA6B,CAAC;AA2DxD
|
|
1
|
+
{"version":3,"file":"UserOld.js","sourceRoot":"","sources":["../../src/models/UserOld.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,11 @@ export interface ParseArgsOptionsConfigExtended extends ParseArgsOptionDescripto
|
|
|
11
11
|
* Is it required?
|
|
12
12
|
*/
|
|
13
13
|
required?: boolean;
|
|
14
|
+
/**
|
|
15
|
+
* Mark a secret option so BaseCli substitutes `[REDACTED]` before composing
|
|
16
|
+
* Mongo's connection diagnostic name. Boolean flags remain visible.
|
|
17
|
+
*/
|
|
18
|
+
sensitive?: boolean;
|
|
14
19
|
}
|
|
15
20
|
declare class Cli extends Base {
|
|
16
21
|
server: Server;
|
package/dist/modules/BaseCli.js
CHANGED
|
@@ -137,7 +137,16 @@ class Cli extends Base {
|
|
|
137
137
|
console.info(`Command ${command} isShouldInitModels called. If you want to skip loading and init models, please set isShouldInitModels to false in your command`);
|
|
138
138
|
// Only set when the operator hasn't — don't clobber a user-provided value.
|
|
139
139
|
if (!process.env.MONGO_APP_NAME) {
|
|
140
|
-
|
|
140
|
+
const connectionArgs = Object.fromEntries(Object.entries(parsedArgs.values).map(([key, value]) => {
|
|
141
|
+
const option = finalArguments[key];
|
|
142
|
+
return [
|
|
143
|
+
key,
|
|
144
|
+
option?.sensitive && option.type !== 'boolean'
|
|
145
|
+
? '[REDACTED]'
|
|
146
|
+
: value,
|
|
147
|
+
];
|
|
148
|
+
}));
|
|
149
|
+
process.env.MONGO_APP_NAME = Command.getMongoConnectionName(command, connectionArgs);
|
|
141
150
|
}
|
|
142
151
|
await this.server.initAllModels({ waitForConnection: true });
|
|
143
152
|
}
|