@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/codegen/index.js
CHANGED
|
@@ -65,7 +65,7 @@ export async function generateAll(app, logger, options = {}) {
|
|
|
65
65
|
if (options.check) {
|
|
66
66
|
const drift = await collectDrift(outputs, plan.orphans);
|
|
67
67
|
if (drift.length > 0) {
|
|
68
|
-
throw new Error(`generatetypes --check: ${drift.length} generated file(s) out of date — run \`
|
|
68
|
+
throw new Error(`generatetypes --check: ${drift.length} generated file(s) out of date — run \`node src/cli.ts generatetypes\`:\n${drift.join('\n')}`);
|
|
69
69
|
}
|
|
70
70
|
logger?.info?.('generatetypes --check: all generated files up to date');
|
|
71
71
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAsB,WAAW,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EACL,aAAa,EACb,wBAAwB,EAExB,cAAc,EACd,YAAY,GACb,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,wBAAwB,EAAE,CAAC;AAQpC;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAS,EACT,MAA6B,EAC7B,OAAO,GAAuB,EAAE;IAEhC,sDAAsD;IACtD,MAAM,YAAY,GAAG,MAAM,WAAW,CACpC,GAAG,CAAC,kBAAkB,CAAC,OAAO,EAC9B,GAAG,CAAC,kBAAkB,CAAC,UAAU,EACjC,GAAG,CAAC,kBAAkB,CAAC,WAAW,EAClC,GAAG,CAAC,kBAAkB,CAAC,qBAAqB,CAC7C,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5E,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrE,MAAM,EAAE,IAAI,EAAE,CACZ,8BAA8B,IAAI,CAAC,SAAS,CAAC,MAAM,qDAAqD,KAAK,IAAI;YAC/G,oGAAoG;YACpG,wGAAwG;YACxG,6EAA6E,CAChF,CAAC;QACF,2EAA2E;QAC3E,2EAA2E;QAC3E,wEAAwE;QACxE,mEAAmE;QACnE,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CACvB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EACrB,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,gBAAgB,CACjE,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACzB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzB,CAAC;YAAC,MAAM,CAAC;gBACP,uDAAuD;YACzD,CAAC;QACH,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,EAAE,KAAK,EAAE,CACb,uBAAuB,QAAQ,CAAC,MAAM,gDAAgD;gBACpF,yFAAyF;gBACzF,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;gBAC/C,iGAAiG,CACpG,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAoB;QAC/B,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE;QAC1E,GAAG,IAAI,CAAC,OAAO;KAChB,CAAC;IAEF,sEAAsE;IACtE,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACb,0BAA0B,KAAK,CAAC,MAAM,4EAA4E,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACrI,CAAC;QACJ,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,CAAC,uDAAuD,CAAC,CAAC;QACxE,OAAO;IACT,CAAC;IAED,0DAA0D;IAC1D,MAAM,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACpC,MAAM,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC1C,MAAM,EAAE,IAAI,EAAE,CAAC,0DAA0D,CAAC,CAAC;AAC7E,CAAC;AAED,kFAAkF;AAClF,KAAK,UAAU,YAAY,CACzB,OAAwB,EACxB,OAAiB;IAEjB,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC;QACxC,IAAI,MAAM,GAAkB,IAAI,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC9C,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,GAAG,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,KAAK,CAAC,IAAI,CAAC,cAAc,OAAO,EAAE,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAC3B,KAAK,CAAC,IAAI,CAAC,cAAc,OAAO,EAAE,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,KAAK,CAAC,IAAI,CAAC,cAAc,MAAM,EAAE,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateUser.js","sourceRoot":"","sources":["../../src/commands/CreateUser.ts"],"names":[],"mappings":"AACA,OAAO,eAAe,EAAE,EAEvB,MAAM,+BAA+B,CAAC;AAEvC,iIAAiI;AACjI,MAAM,UAAW,SAAQ,eAAe;IACtC,MAAM,KAAK,WAAW;QACpB,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,MAAM,KAAK,gBAAgB;QACzB,OAAO;YACL,EAAE,EAAE;gBACF,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,sBAAsB;aACpC;YACD,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,6BAA6B;aAC3C;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,uBAAuB;
|
|
1
|
+
{"version":3,"file":"CreateUser.js","sourceRoot":"","sources":["../../src/commands/CreateUser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,10 @@
|
|
|
1
|
-
import path from 'node:path';
|
|
2
|
-
import * as url from 'node:url';
|
|
3
1
|
import AbstractCommand from '../modules/AbstractCommand.js';
|
|
4
2
|
class SyncIndexes extends AbstractCommand {
|
|
5
3
|
async run() {
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
for (const
|
|
10
|
-
models.push(path.basename(file.file, path.extname(file.file)));
|
|
11
|
-
}
|
|
12
|
-
models = models.sort();
|
|
13
|
-
this.logger?.info(`Total found ${models.length} models`);
|
|
14
|
-
for (const modelName of models) {
|
|
15
|
-
const Model = this.app.getModelOrThrow(modelName);
|
|
4
|
+
const models = this.app.internalFilesCache.models;
|
|
5
|
+
const modelEntries = Array.from(models).sort(([a], [b]) => a.localeCompare(b));
|
|
6
|
+
this.logger?.info(`Total found ${modelEntries.length} models`);
|
|
7
|
+
for (const [modelName, Model] of modelEntries) {
|
|
16
8
|
const removedIndexes = await Model.syncIndexes(); // await in loop not a bug. Lets do one by one
|
|
17
9
|
if (removedIndexes.length) {
|
|
18
10
|
this.logger?.info(`Model - ${modelName} removed indexes: ${removedIndexes}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SyncIndexes.js","sourceRoot":"","sources":["../../src/commands/SyncIndexes.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"SyncIndexes.js","sourceRoot":"","sources":["../../src/commands/SyncIndexes.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,MAAM,WAAY,SAAQ,eAAe;IACvC,KAAK,CAAC,GAAG;QACP,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,MAAM,CAAC;QAClD,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxD,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CACnB,CAAC;QACF,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,YAAY,CAAC,MAAM,SAAS,CAAC,CAAC;QAE/D,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,YAAY,EAAE,CAAC;YAC9C,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,8CAA8C;YAChG,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,WAAW,SAAS,qBAAqB,cAAc,EAAE,CAC1D,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,SAAS,qBAAqB,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,iOAAiO,CAAC;IAC3O,CAAC;CACF;AAED,eAAe,WAAW,CAAC"}
|
|
@@ -9,6 +9,7 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
|
|
|
9
9
|
import path from 'node:path';
|
|
10
10
|
import * as url from 'node:url';
|
|
11
11
|
import AbstractCommand from '../../modules/AbstractCommand.js';
|
|
12
|
+
const migrationIdentity = (file) => file.replace(/\.[jt]s$/, '');
|
|
12
13
|
class Migrate extends AbstractCommand {
|
|
13
14
|
static get description() {
|
|
14
15
|
return 'Run all pending migrations';
|
|
@@ -44,12 +45,12 @@ class Migrate extends AbstractCommand {
|
|
|
44
45
|
// against the *set* of applied filenames — not the timestamp of the most
|
|
45
46
|
// recent one — means a branch-merged migration with an older timestamp is
|
|
46
47
|
// still run instead of silently skipped. Order by filename timestamp.
|
|
47
|
-
const applied = new Set(await MigrationModel.distinct('migrationFile'));
|
|
48
|
+
const applied = new Set((await MigrationModel.distinct('migrationFile')).map(migrationIdentity));
|
|
48
49
|
// Discovery is recursive, so a migration can arrive as a subfolder-relative
|
|
49
50
|
// path (`2024/1699…_x.ts`). Order by the numeric timestamp prefix of the
|
|
50
51
|
// *basename* (strip directory segments), not the whole path.
|
|
51
52
|
const pending = files
|
|
52
|
-
.filter((f) => !applied.has(f.file))
|
|
53
|
+
.filter((f) => !applied.has(migrationIdentity(f.file)))
|
|
53
54
|
.map((f) => {
|
|
54
55
|
const prefix = /^(\d+)_/.exec(path.basename(f.file));
|
|
55
56
|
return { ...f, order: prefix ? Number(prefix[1]) : NaN };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Migrate.js","sourceRoot":"","sources":["../../../src/commands/migration/Migrate.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAGhC,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAE/D,MAAM,OAAQ,SAAQ,eAAe;IACnC,MAAM,KAAK,WAAW;QACpB,OAAO,4BAA4B,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAEjE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAClD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,EACvC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,UAAU,CAClC,CAAC;QACF,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CACtC,WAAW,CACa,CAAC;QAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAqB,CAAC;QAEhE,2EAA2E;QAC3E,6EAA6E;QAC7E,2EAA2E;QAC3E,8EAA8E;QAC9E,6EAA6E;QAC7E,6DAA6D;QAC7D,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,SAAS,CAAC,aAAa,EAAE;YACzB,cAAc,CAAC,aAAa,EAAE;SAC/B,CAAC,CAAC;QAEH,6EAA6E;QAC7E,4EAA4E;QAC5E,uEAAuE;QACvE,oCAAoC;QACpC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QAC/D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,wEAAwE;YACxE,qEAAqE;YACrE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,iDAAiD,CAAC,CAAC;YACrE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACH,0EAA0E;YAC1E,yEAAyE;YACzE,0EAA0E;YAC1E,sEAAsE;YACtE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Migrate.js","sourceRoot":"","sources":["../../../src/commands/migration/Migrate.ts"],"names":[],"mappings":"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"}
|
package/dist/config/http.d.ts
CHANGED
package/dist/config/http.js
CHANGED
|
@@ -28,17 +28,28 @@ export default {
|
|
|
28
28
|
},
|
|
29
29
|
// Limits for request parsing (formidable). Conservative defaults bound
|
|
30
30
|
// unauthenticated requests (formidable's own defaults allow ~200 MB/file with
|
|
31
|
-
// no cap).
|
|
32
|
-
//
|
|
31
|
+
// no cap). To change them, copy this file into your app: the global parser
|
|
32
|
+
// runs before any route and answers 413 first, so per-mount RequestParser
|
|
33
|
+
// params cannot raise them.
|
|
33
34
|
// NOTE: `maxFieldsSize` doubles as the total body ceiling for JSON and
|
|
34
35
|
// urlencoded requests — formidable only enforces it on multipart field data,
|
|
35
36
|
// so RequestParser applies it to the whole body for those content types.
|
|
37
|
+
// An `application/octet-stream` body is one file: RequestParser bounds it by
|
|
38
|
+
// `maxFileSize` (or `maxTotalFileSize`, if lower).
|
|
36
39
|
requestParser: {
|
|
37
40
|
maxFileSize: 20 * 1024 * 1024, // 20 MB per file
|
|
38
41
|
maxTotalFileSize: 50 * 1024 * 1024, // 50 MB across all files
|
|
39
42
|
maxFiles: 10,
|
|
40
43
|
maxFields: 1000,
|
|
41
44
|
maxFieldsSize: 2 * 1024 * 1024, // 2 MB of field data / JSON / urlencoded body
|
|
45
|
+
// Media types parsed as 'json' or 'urlencoded' in addition to
|
|
46
|
+
// `application/json`, any `+json` type and
|
|
47
|
+
// `application/x-www-form-urlencoded`. Keep these entries when you copy
|
|
48
|
+
// this file into your app.
|
|
49
|
+
mediaTypes: {
|
|
50
|
+
// Browsers send CSP `report-uri` violation reports as JSON.
|
|
51
|
+
'application/csp-report': 'json',
|
|
52
|
+
},
|
|
42
53
|
},
|
|
43
54
|
};
|
|
44
55
|
//# sourceMappingURL=http.js.map
|
package/dist/config/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/config/http.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,IAAI;IACnC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,SAAS;IAC5C,sEAAsE;IACtE,0EAA0E;IAC1E,+EAA+E;IAC/E,8EAA8E;IAC9E,oEAAoE;IACpE,WAAW,EAAE,CAAC,uBAAuB,CAAC;IACtC,2EAA2E;IAC3E,wEAAwE;IACxE,8EAA8E;IAC9E,kBAAkB,EAAE,CAAC,aAAa,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,uBAAuB;IAC5D,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,uBAAuB;IAC/D,6EAA6E;IAC7E,8EAA8E;IAC9E,eAAe;IACf,eAAe,EAAE;QACf,OAAO,EAAE,IAAI;QACb,wBAAwB,EAAE,SAAS;QACnC,iBAAiB,EAAE,MAAM;QACzB,iBAAiB,EAAE,aAAa;QAChC,0EAA0E;QAC1E,6CAA6C;QAC7C,2EAA2E;QAC3E,2BAA2B,EAAE,IAAqB;KACnD;IACD,uEAAuE;IACvE,8EAA8E;IAC9E,
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/config/http.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,IAAI;IACnC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,SAAS;IAC5C,sEAAsE;IACtE,0EAA0E;IAC1E,+EAA+E;IAC/E,8EAA8E;IAC9E,oEAAoE;IACpE,WAAW,EAAE,CAAC,uBAAuB,CAAC;IACtC,2EAA2E;IAC3E,wEAAwE;IACxE,8EAA8E;IAC9E,kBAAkB,EAAE,CAAC,aAAa,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,uBAAuB;IAC5D,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,uBAAuB;IAC/D,6EAA6E;IAC7E,8EAA8E;IAC9E,eAAe;IACf,eAAe,EAAE;QACf,OAAO,EAAE,IAAI;QACb,wBAAwB,EAAE,SAAS;QACnC,iBAAiB,EAAE,MAAM;QACzB,iBAAiB,EAAE,aAAa;QAChC,0EAA0E;QAC1E,6CAA6C;QAC7C,2EAA2E;QAC3E,2BAA2B,EAAE,IAAqB;KACnD;IACD,uEAAuE;IACvE,8EAA8E;IAC9E,2EAA2E;IAC3E,0EAA0E;IAC1E,4BAA4B;IAC5B,uEAAuE;IACvE,6EAA6E;IAC7E,yEAAyE;IACzE,6EAA6E;IAC7E,mDAAmD;IACnD,aAAa,EAAE;QACb,WAAW,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,iBAAiB;QAChD,gBAAgB,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,yBAAyB;QAC7D,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,IAAI;QACf,aAAa,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,8CAA8C;QAC9E,8DAA8D;QAC9D,2CAA2C;QAC3C,wEAAwE;QACxE,2BAA2B;QAC3B,UAAU,EAAE;YACV,4DAA4D;YAC5D,wBAAwB,EAAE,MAAM;SACQ;KAC3C;CACF,CAAC"}
|
|
@@ -2,19 +2,27 @@ import type { Response } from 'express';
|
|
|
2
2
|
import AbstractController from '../modules/AbstractController.ts';
|
|
3
3
|
import GetUserByToken from '../services/http/middleware/GetUserByToken.ts';
|
|
4
4
|
import RateLimiter from '../services/http/middleware/RateLimiter.ts';
|
|
5
|
+
import { HttpResponse } from '../services/http/responses.ts';
|
|
5
6
|
import type { PostLoginRequest, PostLogoutRequest, PostRegisterRequest, RecoverPasswordRequest, SendPasswordRecoveryEmailRequest, SendVerificationRequest, VerifyUserRequest } from './Auth.routes.gen.ts';
|
|
7
|
+
/**
|
|
8
|
+
* What the auth handlers answer. They return an `HttpResponse`; `Response`
|
|
9
|
+
* stays in the type (and `res` an optional parameter) so overrides written
|
|
10
|
+
* against `res` still fit. An override that calls a handler must return its
|
|
11
|
+
* result (`return super.postLogin(req, res)`).
|
|
12
|
+
*/
|
|
13
|
+
type AuthAnswer = HttpResponse | Response;
|
|
6
14
|
declare class Auth extends AbstractController {
|
|
7
15
|
get routes(): {
|
|
8
16
|
post: {
|
|
9
17
|
'/login': {
|
|
10
|
-
handler: (req: PostLoginRequest, res
|
|
18
|
+
handler: (req: PostLoginRequest, res?: Response) => Promise<AuthAnswer>;
|
|
11
19
|
request: import("../services/validate/defineSchema.ts").DefinedSchema<{
|
|
12
20
|
email: string;
|
|
13
21
|
password: string;
|
|
14
22
|
}>;
|
|
15
23
|
};
|
|
16
24
|
'/register': {
|
|
17
|
-
handler: (req: PostRegisterRequest, res
|
|
25
|
+
handler: (req: PostRegisterRequest, res?: Response) => Promise<AuthAnswer>;
|
|
18
26
|
request: import("../services/validate/defineSchema.ts").DefinedSchema<{
|
|
19
27
|
email: string;
|
|
20
28
|
password: string;
|
|
@@ -23,36 +31,36 @@ declare class Auth extends AbstractController {
|
|
|
23
31
|
lastName?: string;
|
|
24
32
|
}>;
|
|
25
33
|
};
|
|
26
|
-
'/logout': (req: PostLogoutRequest, res
|
|
27
|
-
'/verify': (req: VerifyUserRequest, res
|
|
34
|
+
'/logout': (req: PostLogoutRequest, res?: Response) => Promise<AuthAnswer>;
|
|
35
|
+
'/verify': (req: VerifyUserRequest, res?: Response) => Promise<AuthAnswer>;
|
|
28
36
|
'/send-recovery-email': {
|
|
29
|
-
handler: (req: SendPasswordRecoveryEmailRequest, res
|
|
37
|
+
handler: (req: SendPasswordRecoveryEmailRequest, res?: Response) => Promise<AuthAnswer>;
|
|
30
38
|
request: import("../services/validate/defineSchema.ts").DefinedSchema<{
|
|
31
39
|
email: string;
|
|
32
40
|
}>;
|
|
33
41
|
};
|
|
34
42
|
'/recover-password': {
|
|
35
|
-
handler: (req: RecoverPasswordRequest, res
|
|
43
|
+
handler: (req: RecoverPasswordRequest, res?: Response) => Promise<AuthAnswer>;
|
|
36
44
|
request: import("../services/validate/defineSchema.ts").DefinedSchema<{
|
|
37
45
|
password: string;
|
|
38
46
|
passwordRecoveryToken: string;
|
|
39
47
|
}>;
|
|
40
48
|
};
|
|
41
49
|
'/send-verification': {
|
|
42
|
-
handler: (req: SendVerificationRequest, res
|
|
50
|
+
handler: (req: SendVerificationRequest, res?: Response) => Promise<AuthAnswer>;
|
|
43
51
|
request: import("../services/validate/defineSchema.ts").DefinedSchema<{
|
|
44
52
|
email: string;
|
|
45
53
|
}>;
|
|
46
54
|
};
|
|
47
55
|
};
|
|
48
56
|
};
|
|
49
|
-
postLogin(req: PostLoginRequest, res
|
|
50
|
-
postRegister(req: PostRegisterRequest, res
|
|
51
|
-
postLogout(req: PostLogoutRequest, res
|
|
52
|
-
verifyUser(req: VerifyUserRequest, res
|
|
53
|
-
sendPasswordRecoveryEmail(req: SendPasswordRecoveryEmailRequest, res
|
|
54
|
-
recoverPassword(req: RecoverPasswordRequest, res
|
|
55
|
-
sendVerification(req: SendVerificationRequest, res
|
|
57
|
+
postLogin(req: PostLoginRequest, res?: Response): Promise<AuthAnswer>;
|
|
58
|
+
postRegister(req: PostRegisterRequest, res?: Response): Promise<AuthAnswer>;
|
|
59
|
+
postLogout(req: PostLogoutRequest, res?: Response): Promise<AuthAnswer>;
|
|
60
|
+
verifyUser(req: VerifyUserRequest, res?: Response): Promise<AuthAnswer>;
|
|
61
|
+
sendPasswordRecoveryEmail(req: SendPasswordRecoveryEmailRequest, res?: Response): Promise<AuthAnswer>;
|
|
62
|
+
recoverPassword(req: RecoverPasswordRequest, res?: Response): Promise<AuthAnswer>;
|
|
63
|
+
sendVerification(req: SendVerificationRequest, res?: Response): Promise<AuthAnswer>;
|
|
56
64
|
static get middleware(): Map<string, (typeof GetUserByToken | typeof RateLimiter)[]>;
|
|
57
65
|
}
|
|
58
66
|
export default Auth;
|
package/dist/controllers/Auth.js
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import mongoose from 'mongoose';
|
|
2
|
+
import { PASSWORD_EN, passwordPolicyIssuesFor, } from '../helpers/passwordPolicy.js';
|
|
2
3
|
import { translateWithDefault } from '../helpers/translate.js';
|
|
3
4
|
import { hashToken } from '../models/User.js';
|
|
4
5
|
import AbstractController from '../modules/AbstractController.js';
|
|
6
|
+
import { builtInResponse } from '../services/http/builtInResponse.js';
|
|
5
7
|
import GetUserByToken from '../services/http/middleware/GetUserByToken.js';
|
|
6
8
|
import RateLimiter from '../services/http/middleware/RateLimiter.js';
|
|
9
|
+
import { HttpResponse } from '../services/http/responses.js';
|
|
7
10
|
import { defineSchema } from '../services/validate/defineSchema.js';
|
|
8
11
|
// Zero-dependency validation for the built-in auth routes. Messages are i18n
|
|
9
12
|
// keys; the framework auto-translates them via the request's `i18n.t` before
|
|
@@ -15,9 +18,7 @@ import { defineSchema } from '../services/validate/defineSchema.js';
|
|
|
15
18
|
const EN = {
|
|
16
19
|
'auth.emailProvided': 'Email must be provided',
|
|
17
20
|
'auth.emailValid': 'Email is not valid',
|
|
18
|
-
|
|
19
|
-
'auth.passwordTooShort': 'Password must be at least {{min}} characters',
|
|
20
|
-
'auth.passwordTooLong': 'Password must be at most {{max}} characters',
|
|
21
|
+
...PASSWORD_EN,
|
|
21
22
|
'auth.passwordRecoveryTokenProvided': 'Password recovery token must be provided',
|
|
22
23
|
'auth.nickNameValid': 'Nick name is not valid,only a-z,A-Z,0-9',
|
|
23
24
|
'auth.nameValid': 'Name is not valid',
|
|
@@ -71,42 +72,6 @@ const pushEmailIssues = (email, issues) => {
|
|
|
71
72
|
});
|
|
72
73
|
}
|
|
73
74
|
};
|
|
74
|
-
/** Shared registration/reset policy; login intentionally keeps legacy compatibility. */
|
|
75
|
-
const pushPasswordIssues = (password, issues, authConfig) => {
|
|
76
|
-
if (isMissing(password) || typeof password !== 'string') {
|
|
77
|
-
issues.push({
|
|
78
|
-
message: 'auth.passwordProvided',
|
|
79
|
-
path: ['password'],
|
|
80
|
-
params: { defaultValue: EN['auth.passwordProvided'] },
|
|
81
|
-
});
|
|
82
|
-
return;
|
|
83
|
-
}
|
|
84
|
-
const policy = authConfig.passwordPolicy;
|
|
85
|
-
const min = policy?.minLength ?? 15;
|
|
86
|
-
const max = policy?.maxLength ?? 128;
|
|
87
|
-
if (!Number.isInteger(min) ||
|
|
88
|
-
min < 1 ||
|
|
89
|
-
!Number.isInteger(max) ||
|
|
90
|
-
max < min) {
|
|
91
|
-
throw new Error('Invalid auth.passwordPolicy: require 1 <= minLength <= maxLength');
|
|
92
|
-
}
|
|
93
|
-
// Count Unicode code points, without normalizing or truncating the secret.
|
|
94
|
-
const length = Array.from(password).length;
|
|
95
|
-
if (length < min || length > max) {
|
|
96
|
-
const message = length < min ? 'auth.passwordTooShort' : 'auth.passwordTooLong';
|
|
97
|
-
issues.push({
|
|
98
|
-
message,
|
|
99
|
-
path: ['password'],
|
|
100
|
-
params: {
|
|
101
|
-
min,
|
|
102
|
-
max,
|
|
103
|
-
defaultValue: EN[message]
|
|
104
|
-
.replace('{{min}}', String(min))
|
|
105
|
-
.replace('{{max}}', String(max)),
|
|
106
|
-
},
|
|
107
|
-
});
|
|
108
|
-
}
|
|
109
|
-
};
|
|
110
75
|
// Back-compat: the auth config key was misspelled `isAuthWithVefificationFlow`
|
|
111
76
|
// through 5.0.0-rc. The corrected key is `isAuthWithVerificationFlow`. The
|
|
112
77
|
// default config now ships only the corrected key; an explicit old-spelling
|
|
@@ -135,6 +100,7 @@ class Auth extends AbstractController {
|
|
|
135
100
|
const password = coerceStr(v.password);
|
|
136
101
|
const issues = [];
|
|
137
102
|
pushEmailIssues(email, issues);
|
|
103
|
+
// No password policy here: existing passwords stay valid at login.
|
|
138
104
|
if (isMissing(password) || typeof password !== 'string') {
|
|
139
105
|
issues.push({
|
|
140
106
|
message: 'auth.passwordProvided',
|
|
@@ -164,7 +130,7 @@ class Auth extends AbstractController {
|
|
|
164
130
|
const lastName = coerceStr(v.lastName);
|
|
165
131
|
const issues = [];
|
|
166
132
|
pushEmailIssues(email, issues);
|
|
167
|
-
|
|
133
|
+
issues.push(...passwordPolicyIssuesFor(this.app.getConfig('auth'), password));
|
|
168
134
|
// nickName is optional, but an empty string is invalid (matches the
|
|
169
135
|
// old yup `.matches()` behavior — only `null`/`undefined` skip).
|
|
170
136
|
if (nickName != null &&
|
|
@@ -228,7 +194,7 @@ class Auth extends AbstractController {
|
|
|
228
194
|
const password = coerceStr(v.password);
|
|
229
195
|
const passwordRecoveryToken = coerceStr(v.passwordRecoveryToken);
|
|
230
196
|
const issues = [];
|
|
231
|
-
|
|
197
|
+
issues.push(...passwordPolicyIssuesFor(this.app.getConfig('auth'), password));
|
|
232
198
|
if (isMissing(passwordRecoveryToken)) {
|
|
233
199
|
issues.push({
|
|
234
200
|
message: 'auth.passwordRecoveryTokenProvided',
|
|
@@ -270,24 +236,24 @@ class Auth extends AbstractController {
|
|
|
270
236
|
const userResult = await User.getUserByEmailAndPassword(req.appInfo.request.email, // we do a request casting
|
|
271
237
|
req.appInfo.request.password);
|
|
272
238
|
if (!userResult) {
|
|
273
|
-
return
|
|
239
|
+
return builtInResponse(req, HttpResponse.json(400, {
|
|
274
240
|
message: translateWithDefault(req, 'auth.errorUPValid', EN['auth.errorUPValid']),
|
|
275
|
-
});
|
|
241
|
+
}), res);
|
|
276
242
|
}
|
|
277
243
|
// TypeScript now knows userResult is not false, so it has the instance methods
|
|
278
244
|
const user = userResult;
|
|
279
245
|
const isAuthWithVerificationFlow = isVerificationFlowEnabled(this.app.getConfig('auth'));
|
|
280
246
|
if (isAuthWithVerificationFlow && !user.isVerified) {
|
|
281
|
-
return
|
|
247
|
+
return builtInResponse(req, HttpResponse.json(400, {
|
|
282
248
|
error: 'EMAIL_NOT_VERIFIED',
|
|
283
249
|
message: translateWithDefault(req, 'email.notVerified', EN['email.notVerified']),
|
|
284
250
|
// @deprecated in favor of `error`; removed in v6.
|
|
285
251
|
notVerified: true,
|
|
286
|
-
});
|
|
252
|
+
}), res);
|
|
287
253
|
}
|
|
288
254
|
// A password changed meanwhile rejects with the wrong-password 400.
|
|
289
255
|
const token = await user.generateToken();
|
|
290
|
-
return
|
|
256
|
+
return builtInResponse(req, HttpResponse.json(200, { data: { token, user: user.getPublic() } }), res);
|
|
291
257
|
}
|
|
292
258
|
async postRegister(req, res) {
|
|
293
259
|
const User = req.appInfo.app.getModel('User');
|
|
@@ -298,18 +264,18 @@ class Auth extends AbstractController {
|
|
|
298
264
|
// forbids registration enumeration, move to an email-verification-first flow.
|
|
299
265
|
let user = (await User.getUserByEmail(req.appInfo.request.email));
|
|
300
266
|
if (user) {
|
|
301
|
-
return
|
|
267
|
+
return builtInResponse(req, HttpResponse.json(400, {
|
|
302
268
|
message: translateWithDefault(req, 'email.registered', EN['email.registered']),
|
|
303
|
-
});
|
|
269
|
+
}), res);
|
|
304
270
|
}
|
|
305
271
|
if (req.appInfo.request.nickName) {
|
|
306
272
|
user = (await User.findOne({
|
|
307
273
|
'name.nick': req.appInfo.request.nickName,
|
|
308
274
|
}));
|
|
309
275
|
if (user) {
|
|
310
|
-
return
|
|
276
|
+
return builtInResponse(req, HttpResponse.json(400, {
|
|
311
277
|
message: translateWithDefault(req, 'auth.nicknameExists', EN['auth.nicknameExists']),
|
|
312
|
-
});
|
|
278
|
+
}), res);
|
|
313
279
|
}
|
|
314
280
|
}
|
|
315
281
|
try {
|
|
@@ -331,14 +297,14 @@ class Auth extends AbstractController {
|
|
|
331
297
|
// so the error-handler registry keeps returning its honest 500.
|
|
332
298
|
const dupFields = duplicateKeyFields(err);
|
|
333
299
|
if (dupFields?.includes('email')) {
|
|
334
|
-
return
|
|
300
|
+
return builtInResponse(req, HttpResponse.json(400, {
|
|
335
301
|
message: translateWithDefault(req, 'email.registered', EN['email.registered']),
|
|
336
|
-
});
|
|
302
|
+
}), res);
|
|
337
303
|
}
|
|
338
304
|
if (dupFields?.includes('name.nick')) {
|
|
339
|
-
return
|
|
305
|
+
return builtInResponse(req, HttpResponse.json(400, {
|
|
340
306
|
message: translateWithDefault(req, 'auth.nicknameExists', EN['auth.nicknameExists']),
|
|
341
|
-
});
|
|
307
|
+
}), res);
|
|
342
308
|
}
|
|
343
309
|
throw err;
|
|
344
310
|
}
|
|
@@ -350,7 +316,7 @@ class Auth extends AbstractController {
|
|
|
350
316
|
this.logger?.error(e);
|
|
351
317
|
});
|
|
352
318
|
}
|
|
353
|
-
return
|
|
319
|
+
return builtInResponse(req, HttpResponse.empty(201), res);
|
|
354
320
|
}
|
|
355
321
|
async postLogout(req, res) {
|
|
356
322
|
const user = req.appInfo.user;
|
|
@@ -365,7 +331,7 @@ class Auth extends AbstractController {
|
|
|
365
331
|
await UserModel.updateOne({ _id: user._id }, { $pull: { sessionTokens: { token: hashToken(rawToken) } } });
|
|
366
332
|
}
|
|
367
333
|
}
|
|
368
|
-
return
|
|
334
|
+
return builtInResponse(req, HttpResponse.json(200, { message: 'Ok' }), res);
|
|
369
335
|
}
|
|
370
336
|
async verifyUser(req, res) {
|
|
371
337
|
const User = req.appInfo.app.getModel('User');
|
|
@@ -376,15 +342,15 @@ class Auth extends AbstractController {
|
|
|
376
342
|
user = (await User.getUserByVerificationToken(req.query.verification_token, { save: false }));
|
|
377
343
|
}
|
|
378
344
|
catch {
|
|
379
|
-
return
|
|
345
|
+
return builtInResponse(req, HttpResponse.json(400, {
|
|
380
346
|
message: translateWithDefault(req, 'email.alreadyVerifiedOrWrongToken', EN['email.alreadyVerifiedOrWrongToken']),
|
|
381
|
-
});
|
|
347
|
+
}), res);
|
|
382
348
|
}
|
|
383
349
|
this.logger?.debug(`Verify user ${user?.id}`);
|
|
384
350
|
if (!user) {
|
|
385
|
-
return
|
|
351
|
+
return builtInResponse(req, HttpResponse.json(400, {
|
|
386
352
|
message: translateWithDefault(req, 'email.alreadyVerifiedOrWrongToken', EN['email.alreadyVerifiedOrWrongToken']),
|
|
387
|
-
});
|
|
353
|
+
}), res);
|
|
388
354
|
}
|
|
389
355
|
user.isVerified = true;
|
|
390
356
|
try {
|
|
@@ -394,13 +360,13 @@ class Auth extends AbstractController {
|
|
|
394
360
|
// A concurrent use of the same link saved first: answer like a used link.
|
|
395
361
|
if (err instanceof mongoose.Error.VersionError ||
|
|
396
362
|
err instanceof mongoose.Error.DocumentNotFoundError) {
|
|
397
|
-
return
|
|
363
|
+
return builtInResponse(req, HttpResponse.json(400, {
|
|
398
364
|
message: translateWithDefault(req, 'email.alreadyVerifiedOrWrongToken', EN['email.alreadyVerifiedOrWrongToken']),
|
|
399
|
-
});
|
|
365
|
+
}), res);
|
|
400
366
|
}
|
|
401
367
|
throw err;
|
|
402
368
|
}
|
|
403
|
-
return
|
|
369
|
+
return builtInResponse(req, HttpResponse.empty(200), res);
|
|
404
370
|
}
|
|
405
371
|
async sendPasswordRecoveryEmail(req, res) {
|
|
406
372
|
const User = req.appInfo.app.getModel('User');
|
|
@@ -419,9 +385,9 @@ class Auth extends AbstractController {
|
|
|
419
385
|
catch (e) {
|
|
420
386
|
this.logger?.error(e);
|
|
421
387
|
}
|
|
422
|
-
return
|
|
388
|
+
return builtInResponse(req, HttpResponse.json(200, {
|
|
423
389
|
message: translateWithDefault(req, 'auth.recoveryEmailSent', EN['auth.recoveryEmailSent']),
|
|
424
|
-
});
|
|
390
|
+
}), res);
|
|
425
391
|
}
|
|
426
392
|
async recoverPassword(req, res) {
|
|
427
393
|
const User = this.app.getModel('User');
|
|
@@ -431,9 +397,9 @@ class Auth extends AbstractController {
|
|
|
431
397
|
this.logger?.error(e);
|
|
432
398
|
});
|
|
433
399
|
if (!user) {
|
|
434
|
-
return
|
|
400
|
+
return builtInResponse(req, HttpResponse.json(400, {
|
|
435
401
|
message: translateWithDefault(req, 'password.wrongToken', EN['password.wrongToken']),
|
|
436
|
-
});
|
|
402
|
+
}), res);
|
|
437
403
|
}
|
|
438
404
|
this.logger?.debug(`Password recovery user ${user.id}`);
|
|
439
405
|
user.password = req.appInfo.request.password;
|
|
@@ -449,13 +415,13 @@ class Auth extends AbstractController {
|
|
|
449
415
|
// A concurrent use of the same link saved first: answer like a used link.
|
|
450
416
|
if (err instanceof mongoose.Error.VersionError ||
|
|
451
417
|
err instanceof mongoose.Error.DocumentNotFoundError) {
|
|
452
|
-
return
|
|
418
|
+
return builtInResponse(req, HttpResponse.json(400, {
|
|
453
419
|
message: translateWithDefault(req, 'password.wrongToken', EN['password.wrongToken']),
|
|
454
|
-
});
|
|
420
|
+
}), res);
|
|
455
421
|
}
|
|
456
422
|
throw err;
|
|
457
423
|
}
|
|
458
|
-
return
|
|
424
|
+
return builtInResponse(req, HttpResponse.empty(200), res);
|
|
459
425
|
}
|
|
460
426
|
async sendVerification(req, res) {
|
|
461
427
|
const User = this.app.getModel('User');
|
|
@@ -472,9 +438,9 @@ class Auth extends AbstractController {
|
|
|
472
438
|
catch (e) {
|
|
473
439
|
this.logger?.error(e);
|
|
474
440
|
}
|
|
475
|
-
return
|
|
441
|
+
return builtInResponse(req, HttpResponse.json(200, {
|
|
476
442
|
message: translateWithDefault(req, 'auth.verificationEmailSent', EN['auth.verificationEmailSent']),
|
|
477
|
-
});
|
|
443
|
+
}), res);
|
|
478
444
|
}
|
|
479
445
|
static get middleware() {
|
|
480
446
|
return new Map([['/{*splat}', [GetUserByToken, RateLimiter]]]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/controllers/Auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/controllers/Auth.ts"],"names":[],"mappings":"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"}
|