@adaptivestone/framework 5.5.1 → 5.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (72) hide show
  1. package/CHANGELOG.md +129 -76
  2. package/README.md +41 -1
  3. package/dist/clusterRunner.js +7 -3
  4. package/dist/clusterRunner.js.map +1 -1
  5. package/dist/codegen/appTypes.js +9 -6
  6. package/dist/codegen/appTypes.js.map +1 -1
  7. package/dist/commands/CreateUser.d.ts +1 -0
  8. package/dist/commands/CreateUser.js +1 -0
  9. package/dist/commands/CreateUser.js.map +1 -1
  10. package/dist/commands/SyncIndexes.js +4 -12
  11. package/dist/commands/SyncIndexes.js.map +1 -1
  12. package/dist/commands/migration/Migrate.js +3 -2
  13. package/dist/commands/migration/Migrate.js.map +1 -1
  14. package/dist/config/http.d.ts +1 -0
  15. package/dist/config/http.js +8 -0
  16. package/dist/config/http.js.map +1 -1
  17. package/dist/controllers/Auth.js +33 -4
  18. package/dist/controllers/Auth.js.map +1 -1
  19. package/dist/controllers/index.js +129 -83
  20. package/dist/controllers/index.js.map +1 -1
  21. package/dist/helpers/crypto.js +3 -0
  22. package/dist/helpers/crypto.js.map +1 -1
  23. package/dist/models/Lock.d.ts +2 -2
  24. package/dist/models/Lock.js +64 -15
  25. package/dist/models/Lock.js.map +1 -1
  26. package/dist/models/User.d.ts +18 -6
  27. package/dist/models/User.js +24 -7
  28. package/dist/models/User.js.map +1 -1
  29. package/dist/modules/BaseCli.d.ts +5 -0
  30. package/dist/modules/BaseCli.js +10 -1
  31. package/dist/modules/BaseCli.js.map +1 -1
  32. package/dist/server.js +53 -8
  33. package/dist/server.js.map +1 -1
  34. package/dist/services/cache/Cache.js +20 -10
  35. package/dist/services/cache/Cache.js.map +1 -1
  36. package/dist/services/cache/drivers/MemoryDriver.js +3 -1
  37. package/dist/services/cache/drivers/MemoryDriver.js.map +1 -1
  38. package/dist/services/cache/drivers/RedisDriver.js +15 -11
  39. package/dist/services/cache/drivers/RedisDriver.js.map +1 -1
  40. package/dist/services/http/HttpServer.d.ts +2 -2
  41. package/dist/services/http/HttpServer.js.map +1 -1
  42. package/dist/services/http/builtinErrorHandlers.d.ts +9 -3
  43. package/dist/services/http/builtinErrorHandlers.js.map +1 -1
  44. package/dist/services/http/middleware/Cors.js +5 -0
  45. package/dist/services/http/middleware/Cors.js.map +1 -1
  46. package/dist/services/http/middleware/IpDetector.js +23 -4
  47. package/dist/services/http/middleware/IpDetector.js.map +1 -1
  48. package/dist/services/http/middleware/Pagination.js +4 -2
  49. package/dist/services/http/middleware/Pagination.js.map +1 -1
  50. package/dist/services/http/middleware/RateLimiter.js +8 -1
  51. package/dist/services/http/middleware/RateLimiter.js.map +1 -1
  52. package/dist/services/http/middleware/RequestParser.d.ts +4 -1
  53. package/dist/services/http/middleware/RequestParser.js +74 -20
  54. package/dist/services/http/middleware/RequestParser.js.map +1 -1
  55. package/dist/services/http/routing/RouteNode.d.ts +4 -3
  56. package/dist/services/http/routing/RouteRegistry.js +21 -10
  57. package/dist/services/http/routing/RouteRegistry.js.map +1 -1
  58. package/dist/services/http/routing/match.d.ts +7 -2
  59. package/dist/services/http/routing/match.js +58 -41
  60. package/dist/services/http/routing/match.js.map +1 -1
  61. package/dist/services/i18n/I18n.js.map +1 -1
  62. package/dist/services/i18n/types.d.ts +4 -2
  63. package/dist/services/validate/ValidateService.d.ts +2 -0
  64. package/dist/services/validate/ValidateService.js +2 -0
  65. package/dist/services/validate/ValidateService.js.map +1 -1
  66. package/dist/services/validate/ValidationError.d.ts +12 -1
  67. package/dist/services/validate/ValidationError.js +16 -3
  68. package/dist/services/validate/ValidationError.js.map +1 -1
  69. package/dist/tests/setupFramework.d.ts +4 -1
  70. package/dist/tests/setupFramework.js +15 -9
  71. package/dist/tests/setupFramework.js.map +1 -1
  72. package/package.json +5 -5
package/README.md CHANGED
@@ -32,7 +32,7 @@ Node-only, as of Bun 1.4:
32
32
  - **`cluster.js` / `runCluster`** — the multi-process production entry point. It
33
33
  imports fine under Bun, but only the Node path is tested; run single-process
34
34
  under Bun (or put the process manager outside the app).
35
- - **Node's test-runner CLI.** Bun implements the `node:test` *API* but not
35
+ - **Node's test-runner CLI.** Bun implements the `node:test` _API_ but not
36
36
  `node --test`, so a Bun project runs its suite with `bun test` and the
37
37
  framework preloads rather than the flags the Node docs show. Four framework
38
38
  test files need `mock.module()` (Node's `--experimental-test-module-mocks`),
@@ -70,6 +70,46 @@ To add the framework to an existing project instead:
70
70
  npm install @adaptivestone/framework
71
71
  ```
72
72
 
73
+ ## Upgrade notes (5.6.1)
74
+
75
+ See the [5.6.1 release notes](CHANGELOG.md). Check these when you upgrade:
76
+
77
+ - To accept browser CSP violation reports (`application/csp-report`) in an app
78
+ with its own `config/http.ts`, add
79
+ `mediaTypes: { 'application/csp-report': 'json' }` to its `requestParser`.
80
+ Your file replaces the framework's, so the new default does not reach it.
81
+ - Child routes now validate middleware schemas inherited from parent
82
+ controllers. Input those schemas reject now receives a validation 400.
83
+ - Cache misses return the same serialized value as hits (dates as strings,
84
+ `toJSON()` applied, undefined properties omitted).
85
+ - The `User` model declares an index on `sessionTokens.token`. With automatic
86
+ index creation it is built on startup; plan the build for large collections.
87
+ - The optional peers accept `oxc-parser` 0.156 or any later 0.x release and
88
+ i18next 26 or 27. Before moving to i18next 27, read its migration guide:
89
+ empty translations now fall back, and `/` is no longer escaped.
90
+ - `TranslationFunction` (`req.appInfo.i18n.t`) splits `t(key, options?)` into
91
+ `t(key)` and `t(key, options)`, as i18next 27 does. A call that passes options
92
+ which may be `undefined` no longer compiles; pass them only when defined.
93
+ - A failed test database drop now fails the shipped teardown hook instead of
94
+ being ignored.
95
+
96
+ ## Upgrade notes (5.6.0)
97
+
98
+ See the [5.6.0 release notes](CHANGELOG.md). Check these when you upgrade:
99
+
100
+ - Register custom validator drivers (`ValidateService.register`) at module
101
+ scope, before `startServer()`. Routes now pick their driver once at boot, so
102
+ a driver registered inside the `bootHttp` hook no longer reaches them, and a
103
+ schema no driver matches fails `startServer()` instead of answering 500.
104
+ - A static route answers only for the methods it defines. With
105
+ `GET /events/new` and `DELETE /events/:slug`, `DELETE /events/new` now reaches
106
+ the `:slug` route instead of answering 405.
107
+ - A per-mount `RateLimiter` `consumeKeyComponents.request` list replaces the
108
+ configured list instead of adding to it. A mount that relied on both lists
109
+ must name every field.
110
+ - Projects that run `npm run gen` must update the optional peer:
111
+ `npm i -D oxc-parser@^0.156.0`.
112
+
73
113
  ## Upgrade notes (5.5.1)
74
114
 
75
115
  See the [5.5.1 release notes](CHANGELOG.md). Most need no action:
@@ -49,7 +49,6 @@ function supervisePrimary(workerCount, shutdownTimeoutMs, emit) {
49
49
  const restartTimers = new Set();
50
50
  let restartTimes = [];
51
51
  let shutdownTimer;
52
- let shutdownSignal;
53
52
  let shuttingDown = false;
54
53
  let exitCode = 0;
55
54
  let finished = false;
@@ -93,7 +92,6 @@ function supervisePrimary(workerCount, shutdownTimeoutMs, emit) {
93
92
  return;
94
93
  }
95
94
  shuttingDown = true;
96
- shutdownSignal = signal;
97
95
  report('cluster:shutdown', code === 0 ? 'info' : 'error', `Cluster shutting down with ${signal}.`);
98
96
  for (const timer of restartTimers) {
99
97
  clearTimeout(timer);
@@ -144,7 +142,13 @@ function supervisePrimary(workerCount, shutdownTimeoutMs, emit) {
144
142
  const signal = rawSignal;
145
143
  activeWorkers.delete(worker.id);
146
144
  if (shuttingDown) {
147
- if (code !== 0 || (signal && signal !== shutdownSignal)) {
145
+ // Node reports code=null when a worker exits because it received a
146
+ // signal. A worker may receive the shutdown signal directly as part
147
+ // of a process-group signal, as well as through the primary's
148
+ // forwarding; that is still a clean shutdown if no non-zero exit code
149
+ // was reported. The timeout path already sets exitCode=1 before it
150
+ // sends SIGKILL.
151
+ if (code !== null && code !== 0) {
148
152
  exitCode = 1;
149
153
  }
150
154
  finishIfIdle();
@@ -1 +1 @@
1
- {"version":3,"file":"clusterRunner.js","sourceRoot":"","sources":["../src/clusterRunner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"clusterRunner.js","sourceRoot":"","sources":["../src/clusterRunner.ts"],"names":[],"mappings":"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"}
@@ -9,15 +9,18 @@ import { isPlainObject } from '../helpers/objects.js';
9
9
  import { envShapeToType, extractConfigEnvShape, mergeEnvShapes, } from './astConfig.js';
10
10
  import { isBaseModelSource } from './astModel.js';
11
11
  import { sq } from './emit.js';
12
- /** A `./`-rooted, forward-slash specifier from `dir` to `target` for the emitted
13
- * `import('…')`. Throws if `target` is outside `dir` (can't be a relative import)
14
- * — better a clear error than an accidental absolute path baked into the file. */
12
+ /** A relative, forward-slash specifier from `dir` to `target` for the emitted
13
+ * `import('…')`. Targets may be in a sibling package (for example a hoisted
14
+ * framework install); only paths on a different volume lack a relative form. */
15
15
  function toRelativeSpecifier(dir, target) {
16
16
  const rel = path.relative(dir, target);
17
- if (rel.startsWith('..') || path.isAbsolute(rel)) {
18
- throw new Error(`Model path "${target}" is outside the project root "${dir}"; cannot emit a relative import into genTypes.d.ts`);
17
+ if (path.isAbsolute(rel)) {
18
+ throw new Error(`Model path "${target}" is on a different volume from the project root "${dir}"; cannot emit a relative import into genTypes.d.ts`);
19
19
  }
20
- return `./${rel.split(path.sep).join('/')}`;
20
+ const specifier = rel.split(path.sep).join('/');
21
+ return specifier === '..' || specifier.startsWith('../')
22
+ ? specifier
23
+ : `./${specifier}`;
21
24
  }
22
25
  /**
23
26
  * Render a TypeScript type from a runtime config value's **shape** — value
@@ -1 +1 @@
1
- {"version":3,"file":"appTypes.js","sourceRoot":"","sources":["../../src/codegen/appTypes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"appTypes.js","sourceRoot":"","sources":["../../src/codegen/appTypes.ts"],"names":[],"mappings":"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"}
@@ -16,6 +16,7 @@ declare class CreateUser extends AbstractCommand {
16
16
  readonly password: {
17
17
  readonly type: 'string';
18
18
  readonly description: 'New password for user';
19
+ readonly sensitive: true;
19
20
  };
20
21
  readonly roles: {
21
22
  readonly type: 'string';
@@ -20,6 +20,7 @@ class CreateUser extends AbstractCommand {
20
20
  password: {
21
21
  type: 'string',
22
22
  description: 'New password for user',
23
+ sensitive: true,
23
24
  },
24
25
  roles: {
25
26
  type: 'string',
@@ -1 +1 @@
1
- {"version":3,"file":"CreateUser.js","sourceRoot":"","sources":["../../src/commands/CreateUser.ts"],"names":[],"mappings":"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"}
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 dirname = url.fileURLToPath(new URL('.', import.meta.url));
7
- const files = await this.getFilesPathWithInheritance(path.join(dirname, '/../models'), this.app.foldersConfig.models);
8
- let models = [];
9
- for (const file of files) {
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,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAEhC,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,MAAM,WAAY,SAAQ,eAAe;IACvC,KAAK,CAAC,GAAG;QACP,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACjE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAClD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,EAChC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,CAC9B,CAAC;QACF,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,MAAM,CAAC,MAAM,SAAS,CAAC,CAAC;QAEzD,KAAK,MAAM,SAAS,IAAI,MAAM,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,SAAS,CAAoB,CAAC;YACrE,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"}
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":"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"}
1
+ {"version":3,"file":"Migrate.js","sourceRoot":"","sources":["../../../src/commands/migration/Migrate.ts"],"names":[],"mappings":"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"}
@@ -18,6 +18,7 @@ declare const _default: {
18
18
  maxFiles: number;
19
19
  maxFields: number;
20
20
  maxFieldsSize: number;
21
+ mediaTypes: Record<string, 'json' | 'urlencoded'>;
21
22
  };
22
23
  };
23
24
  export default _default;
@@ -39,6 +39,14 @@ export default {
39
39
  maxFiles: 10,
40
40
  maxFields: 1000,
41
41
  maxFieldsSize: 2 * 1024 * 1024, // 2 MB of field data / JSON / urlencoded body
42
+ // Media types parsed as 'json' or 'urlencoded' in addition to
43
+ // `application/json`, any `+json` type and
44
+ // `application/x-www-form-urlencoded`. Keep these entries when you copy
45
+ // this file into your app.
46
+ mediaTypes: {
47
+ // Browsers send CSP `report-uri` violation reports as JSON.
48
+ 'application/csp-report': 'json',
49
+ },
42
50
  },
43
51
  };
44
52
  //# sourceMappingURL=http.js.map
@@ -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,yEAAyE;IACzE,0CAA0C;IAC1C,uEAAuE;IACvE,6EAA6E;IAC7E,yEAAyE;IACzE,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;KAC/E;CACF,CAAC"}
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,yEAAyE;IACzE,0CAA0C;IAC1C,uEAAuE;IACvE,6EAA6E;IAC7E,yEAAyE;IACzE,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"}
@@ -1,3 +1,4 @@
1
+ import mongoose from 'mongoose';
1
2
  import { translateWithDefault } from '../helpers/translate.js';
2
3
  import { hashToken } from '../models/User.js';
3
4
  import AbstractController from '../modules/AbstractController.js';
@@ -370,7 +371,9 @@ class Auth extends AbstractController {
370
371
  const User = req.appInfo.app.getModel('User');
371
372
  let user;
372
373
  try {
373
- user = (await User.getUserByVerificationToken(req.query.verification_token));
374
+ // Consume the token in the same write as the verification, so a failed
375
+ // save leaves the link usable for a retry.
376
+ user = (await User.getUserByVerificationToken(req.query.verification_token, { save: false }));
374
377
  }
375
378
  catch {
376
379
  return res.status(400).json({
@@ -384,7 +387,19 @@ class Auth extends AbstractController {
384
387
  });
385
388
  }
386
389
  user.isVerified = true;
387
- await user.save();
390
+ try {
391
+ await user.save();
392
+ }
393
+ catch (err) {
394
+ // A concurrent use of the same link saved first: answer like a used link.
395
+ if (err instanceof mongoose.Error.VersionError ||
396
+ err instanceof mongoose.Error.DocumentNotFoundError) {
397
+ return res.status(400).json({
398
+ message: translateWithDefault(req, 'email.alreadyVerifiedOrWrongToken', EN['email.alreadyVerifiedOrWrongToken']),
399
+ });
400
+ }
401
+ throw err;
402
+ }
388
403
  return res.status(200).json();
389
404
  }
390
405
  async sendPasswordRecoveryEmail(req, res) {
@@ -410,7 +425,9 @@ class Auth extends AbstractController {
410
425
  }
411
426
  async recoverPassword(req, res) {
412
427
  const User = this.app.getModel('User');
413
- const user = await User.getUserByPasswordRecoveryToken(req.appInfo.request.passwordRecoveryToken).catch((e) => {
428
+ // Consume the token in the same write as the new password, so a failed
429
+ // save leaves the link usable for a retry.
430
+ const user = await User.getUserByPasswordRecoveryToken(req.appInfo.request.passwordRecoveryToken, { save: false }).catch((e) => {
414
431
  this.logger?.error(e);
415
432
  });
416
433
  if (!user) {
@@ -425,7 +442,19 @@ class Auth extends AbstractController {
425
442
  // precisely because the account is compromised, so any token issued before
426
443
  // the reset must stop working.
427
444
  user.set('sessionTokens', []);
428
- await user.save();
445
+ try {
446
+ await user.save();
447
+ }
448
+ catch (err) {
449
+ // A concurrent use of the same link saved first: answer like a used link.
450
+ if (err instanceof mongoose.Error.VersionError ||
451
+ err instanceof mongoose.Error.DocumentNotFoundError) {
452
+ return res.status(400).json({
453
+ message: translateWithDefault(req, 'password.wrongToken', EN['password.wrongToken']),
454
+ });
455
+ }
456
+ throw err;
457
+ }
429
458
  return res.status(200).json();
430
459
  }
431
460
  async sendVerification(req, res) {
@@ -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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"}