@digitaldefiance/node-express-suite 2.2.36 → 3.5.7
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/README.md +32 -3
- package/package.json +5 -5
- package/src/application.d.ts +2 -2
- package/src/application.d.ts.map +1 -1
- package/src/application.js +11 -5
- package/src/application.js.map +1 -1
- package/src/backup-code.d.ts +4 -3
- package/src/backup-code.d.ts.map +1 -1
- package/src/backup-code.js.map +1 -1
- package/src/constants.d.ts +1 -1
- package/src/constants.d.ts.map +1 -1
- package/src/constants.js +2 -0
- package/src/constants.js.map +1 -1
- package/src/controllers/base.d.ts +1 -1
- package/src/controllers/base.d.ts.map +1 -1
- package/src/controllers/base.js +4 -3
- package/src/controllers/base.js.map +1 -1
- package/src/controllers/user.d.ts.map +1 -1
- package/src/controllers/user.js +11 -8
- package/src/controllers/user.js.map +1 -1
- package/src/decorators/base-controller.d.ts.map +1 -1
- package/src/decorators/base-controller.js +1 -1
- package/src/decorators/base-controller.js.map +1 -1
- package/src/defaults.d.ts.map +1 -1
- package/src/defaults.js +28 -0
- package/src/defaults.js.map +1 -1
- package/src/documents/email-token.d.ts +1 -1
- package/src/documents/email-token.d.ts.map +1 -1
- package/src/documents/mnemonic.d.ts +1 -1
- package/src/documents/mnemonic.d.ts.map +1 -1
- package/src/documents/role.d.ts +1 -1
- package/src/documents/role.d.ts.map +1 -1
- package/src/documents/used-direct-login-token.d.ts +1 -1
- package/src/documents/used-direct-login-token.d.ts.map +1 -1
- package/src/documents/user-role.d.ts +1 -1
- package/src/documents/user-role.d.ts.map +1 -1
- package/src/documents/user.d.ts +1 -1
- package/src/documents/user.d.ts.map +1 -1
- package/src/environment.d.ts +14 -12
- package/src/environment.d.ts.map +1 -1
- package/src/environment.js +24 -17
- package/src/environment.js.map +1 -1
- package/src/get-timezone.d.ts.map +1 -1
- package/src/get-timezone.js +2 -1
- package/src/get-timezone.js.map +1 -1
- package/src/interfaces/backend-objects/email-token.d.ts +1 -1
- package/src/interfaces/backend-objects/email-token.d.ts.map +1 -1
- package/src/interfaces/backend-objects/request-user.d.ts +1 -1
- package/src/interfaces/backend-objects/request-user.d.ts.map +1 -1
- package/src/interfaces/backend-objects/role.d.ts +1 -1
- package/src/interfaces/backend-objects/role.d.ts.map +1 -1
- package/src/interfaces/backend-objects/user.d.ts +1 -1
- package/src/interfaces/backend-objects/user.d.ts.map +1 -1
- package/src/interfaces/constants.d.ts +3 -0
- package/src/interfaces/constants.d.ts.map +1 -1
- package/src/interfaces/environment.d.ts +14 -10
- package/src/interfaces/environment.d.ts.map +1 -1
- package/src/interfaces/server-init-result.d.ts +14 -13
- package/src/interfaces/server-init-result.d.ts.map +1 -1
- package/src/middlewares/authenticate-crypto.d.ts +2 -1
- package/src/middlewares/authenticate-crypto.d.ts.map +1 -1
- package/src/middlewares/authenticate-crypto.js +1 -1
- package/src/middlewares/authenticate-crypto.js.map +1 -1
- package/src/middlewares/authenticate-token.d.ts +1 -1
- package/src/middlewares/authenticate-token.d.ts.map +1 -1
- package/src/middlewares/authenticate-token.js +10 -10
- package/src/middlewares/authenticate-token.js.map +1 -1
- package/src/middlewares/cleanup-crypto.d.ts.map +1 -1
- package/src/middlewares/cleanup-crypto.js +1 -1
- package/src/middlewares/cleanup-crypto.js.map +1 -1
- package/src/responses/response-builder.d.ts.map +1 -1
- package/src/responses/response-builder.js +2 -1
- package/src/responses/response-builder.js.map +1 -1
- package/src/schemas/email-token.d.ts +8 -5
- package/src/schemas/email-token.d.ts.map +1 -1
- package/src/schemas/email-token.js +2 -2
- package/src/schemas/email-token.js.map +1 -1
- package/src/schemas/mnemonic.d.ts +6 -5
- package/src/schemas/mnemonic.d.ts.map +1 -1
- package/src/schemas/mnemonic.js.map +1 -1
- package/src/schemas/role.d.ts +9 -6
- package/src/schemas/role.d.ts.map +1 -1
- package/src/schemas/role.js +4 -4
- package/src/schemas/role.js.map +1 -1
- package/src/schemas/schema.js +1 -1
- package/src/schemas/schema.js.map +1 -1
- package/src/schemas/used-direct-login-token.d.ts +8 -5
- package/src/schemas/used-direct-login-token.d.ts.map +1 -1
- package/src/schemas/used-direct-login-token.js +2 -2
- package/src/schemas/used-direct-login-token.js.map +1 -1
- package/src/schemas/user-role.d.ts +8 -5
- package/src/schemas/user-role.d.ts.map +1 -1
- package/src/schemas/user-role.js +6 -6
- package/src/schemas/user-role.js.map +1 -1
- package/src/schemas/user.d.ts +6 -5
- package/src/schemas/user.d.ts.map +1 -1
- package/src/schemas/user.js +5 -5
- package/src/schemas/user.js.map +1 -1
- package/src/services/backup-code.d.ts +9 -9
- package/src/services/backup-code.d.ts.map +1 -1
- package/src/services/backup-code.js +3 -2
- package/src/services/backup-code.js.map +1 -1
- package/src/services/checksum.d.ts +1 -1
- package/src/services/checksum.d.ts.map +1 -1
- package/src/services/database-initialization.d.ts +20 -20
- package/src/services/database-initialization.d.ts.map +1 -1
- package/src/services/database-initialization.js +100 -119
- package/src/services/database-initialization.js.map +1 -1
- package/src/services/db-init-cache.d.ts +1 -1
- package/src/services/db-init-cache.d.ts.map +1 -1
- package/src/services/direct-login-token.d.ts +1 -1
- package/src/services/direct-login-token.d.ts.map +1 -1
- package/src/services/direct-login-token.js.map +1 -1
- package/src/services/jwt.d.ts +2 -2
- package/src/services/jwt.d.ts.map +1 -1
- package/src/services/jwt.js.map +1 -1
- package/src/services/mnemonic.d.ts +7 -7
- package/src/services/mnemonic.d.ts.map +1 -1
- package/src/services/mnemonic.js.map +1 -1
- package/src/services/request-user.d.ts +7 -4
- package/src/services/request-user.d.ts.map +1 -1
- package/src/services/request-user.js +5 -4
- package/src/services/request-user.js.map +1 -1
- package/src/services/role.d.ts +16 -16
- package/src/services/role.d.ts.map +1 -1
- package/src/services/role.js +9 -7
- package/src/services/role.js.map +1 -1
- package/src/services/system-user.d.ts +4 -3
- package/src/services/system-user.d.ts.map +1 -1
- package/src/services/system-user.js +1 -1
- package/src/services/system-user.js.map +1 -1
- package/src/services/user.d.ts +30 -24
- package/src/services/user.d.ts.map +1 -1
- package/src/services/user.js +34 -21
- package/src/services/user.js.map +1 -1
- package/src/transactions/transaction-manager.d.ts.map +1 -1
- package/src/transactions/transaction-manager.js +1 -1
- package/src/transactions/transaction-manager.js.map +1 -1
- package/src/types/environment-variables.d.ts +31 -0
- package/src/types/environment-variables.d.ts.map +1 -0
- package/src/types/environment-variables.js +39 -0
- package/src/types/environment-variables.js.map +1 -0
- package/src/types/id-converters.d.ts +28 -0
- package/src/types/id-converters.d.ts.map +1 -0
- package/src/types/id-converters.js +45 -0
- package/src/types/id-converters.js.map +1 -0
- package/src/types/mongoose-helpers.d.ts +11 -0
- package/src/types/mongoose-helpers.d.ts.map +1 -0
- package/src/types/mongoose-helpers.js +6 -0
- package/src/types/mongoose-helpers.js.map +1 -0
- package/src/utils.d.ts +2 -2
- package/src/utils.d.ts.map +1 -1
- package/src/utils.js +15 -6
- package/src/utils.js.map +1 -1
package/README.md
CHANGED
|
@@ -11,9 +11,9 @@ It is an 'out of the box' solution with a specific recipe (Mongo, Express, React
|
|
|
11
11
|
|
|
12
12
|
Part of [Express Suite](https://github.com/Digital-Defiance/express-suite)
|
|
13
13
|
|
|
14
|
-
## What's New in
|
|
14
|
+
## What's New in v3.0
|
|
15
15
|
|
|
16
|
-
✨ **
|
|
16
|
+
✨ **Major Dependency Upgrade** - Upgraded to `@digitaldefiance/suite-core-lib` v3.0.0 and `@digitaldefiance/ecies-lib` v4.1.0. This brings significant improvements in type safety, performance, and security.
|
|
17
17
|
|
|
18
18
|
## Features
|
|
19
19
|
|
|
@@ -1128,6 +1128,35 @@ The following v1.x patterns still work in v2.0:
|
|
|
1128
1128
|
|
|
1129
1129
|
## ChangeLog
|
|
1130
1130
|
|
|
1131
|
+
### Version 3.5.7
|
|
1132
|
+
|
|
1133
|
+
- Library updates
|
|
1134
|
+
|
|
1135
|
+
### Version 3.5.0
|
|
1136
|
+
|
|
1137
|
+
**Type Safety Improvements**
|
|
1138
|
+
|
|
1139
|
+
- **ELIMINATED**: All unsafe `as any` type casts from production code
|
|
1140
|
+
- **IMPROVED**: Mongoose query patterns - replaced projection objects with `.select()` method
|
|
1141
|
+
- **ENHANCED**: Generic type handling in `SystemUserService` and `BackupCodeService`
|
|
1142
|
+
- **FIXED**: Type compatibility between Mongoose documents and service interfaces
|
|
1143
|
+
- **ADDED**: Explanatory comments for necessary type assertions
|
|
1144
|
+
- **VERIFIED**: All 1164 tests passing with full type safety
|
|
1145
|
+
- **VERIFIED**: Build successful with strict TypeScript checking
|
|
1146
|
+
|
|
1147
|
+
**Technical Details**
|
|
1148
|
+
|
|
1149
|
+
- Replaced `{ password: 0 } as any` with `.select('-password')` in authentication middleware
|
|
1150
|
+
- Made `SystemUserService.setSystemUser` generic to accept different ID types
|
|
1151
|
+
- Updated test mocks to support new query method chains
|
|
1152
|
+
- Documented remaining `as unknown` casts (2 instances, both necessary for generic compatibility)
|
|
1153
|
+
|
|
1154
|
+
### Version 3.0.0
|
|
1155
|
+
|
|
1156
|
+
- Upgrade to `@digitaldefiance/suite-core-lib` v3.0.0
|
|
1157
|
+
- Upgrade to `@digitaldefiance/ecies-lib` v4.1.0
|
|
1158
|
+
- Upgrade to `@digitaldefiance/node-ecies-lib` v4.1.0
|
|
1159
|
+
|
|
1131
1160
|
### Version 2.2.36
|
|
1132
1161
|
|
|
1133
1162
|
- Update suite-core-lib
|
|
@@ -1389,7 +1418,7 @@ The following v1.x patterns still work in v2.0:
|
|
|
1389
1418
|
|
|
1390
1419
|
- Minor bugfixes for database-initialization
|
|
1391
1420
|
|
|
1392
|
-
### Version 2.1.
|
|
1421
|
+
### Version 2.1.19
|
|
1393
1422
|
|
|
1394
1423
|
- minor bugfix for translation in database-initialization
|
|
1395
1424
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@digitaldefiance/node-express-suite",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.5.7",
|
|
4
4
|
"description": "Generic express application and routing library with decorator support",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"types": "src/index.d.ts",
|
|
@@ -32,10 +32,10 @@
|
|
|
32
32
|
"publish:public": "npm publish --access public"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@digitaldefiance/ecies-lib": "
|
|
36
|
-
"@digitaldefiance/i18n-lib": "3.
|
|
37
|
-
"@digitaldefiance/node-ecies-lib": "
|
|
38
|
-
"@digitaldefiance/suite-core-lib": "
|
|
35
|
+
"@digitaldefiance/ecies-lib": "4.2.7",
|
|
36
|
+
"@digitaldefiance/i18n-lib": "3.7.5",
|
|
37
|
+
"@digitaldefiance/node-ecies-lib": "4.2.7",
|
|
38
|
+
"@digitaldefiance/suite-core-lib": "3.5.7",
|
|
39
39
|
"@noble/curves": "^2.0.1",
|
|
40
40
|
"@noble/hashes": "^2.0.1",
|
|
41
41
|
"@subspace/reed-solomon-erasure.wasm": "^0.2.5",
|
package/src/application.d.ts
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { Application as ExpressApplication } from 'express';
|
|
2
|
+
import { HelmetOptions } from 'helmet';
|
|
2
3
|
import mongoose from 'mongoose';
|
|
3
4
|
import { BaseApplication } from './application-base';
|
|
4
5
|
import { IBaseDocument } from './documents/base';
|
|
5
6
|
import { Environment } from './environment';
|
|
6
7
|
import { IApplication, ICSPConfig, IFailableResult, IServerInitResult } from './interfaces';
|
|
7
8
|
import { IConstants } from './interfaces/constants';
|
|
9
|
+
import { IFlexibleCSP } from './interfaces/flexible-csp';
|
|
8
10
|
import { initMiddleware } from './middlewares';
|
|
9
11
|
import { AppRouter } from './routers/app';
|
|
10
12
|
import { BaseRouter } from './routers/base';
|
|
11
13
|
import { SchemaMap } from './types';
|
|
12
|
-
import { HelmetOptions } from 'helmet';
|
|
13
|
-
import { IFlexibleCSP } from './interfaces/flexible-csp';
|
|
14
14
|
export declare class Application<TInitResults extends IServerInitResult, TModelDocs extends Record<string, IBaseDocument<any>>, TEnvironment extends Environment = Environment, TConstants extends IConstants = IConstants, TAppRouter extends AppRouter = AppRouter> extends BaseApplication<TModelDocs, TInitResults, TConstants> implements IApplication {
|
|
15
15
|
readonly expressApp: ExpressApplication;
|
|
16
16
|
private server;
|
package/src/application.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/application.ts"],"names":[],"mappings":"AAQA,OAAgB,EACd,WAAW,IAAI,kBAAkB,EAIlC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/application.ts"],"names":[],"mappings":"AAQA,OAAgB,EACd,WAAW,IAAI,kBAAkB,EAIlC,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAGvC,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EACL,YAAY,EACZ,UAAU,EACV,eAAe,EAEf,iBAAiB,EAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAiB,MAAM,2BAA2B,CAAC;AACxE,OAAO,EAAE,cAAc,EAAmB,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAQpC,qBAAa,WAAW,CACpB,YAAY,SAAS,iBAAiB,EACtC,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,EACrD,YAAY,SAAS,WAAW,GAAG,WAAW,EAC9C,UAAU,SAAS,UAAU,GAAG,UAAU,EAC1C,UAAU,SAAS,SAAS,GAAG,SAAS,CAE1C,SAAQ,eAAe,CAAC,UAAU,EAAE,YAAY,EAAE,UAAU,CAC5D,YAAW,YAAY;IAEvB,SAAgB,UAAU,EAAE,kBAAkB,CAAC;IAC/C,OAAO,CAAC,MAAM,CAAwC;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA4C;IACvE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoC;IACtE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAwC;IAC1E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAwB;IACxD,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC,IAAoB,WAAW,IAAI,YAAY,CAE9C;IAED,SAAS,CAAC,gBAAgB,IAAI,IAAI;gBAMhC,WAAW,EAAE,YAAY,EACzB,gBAAgB,EAAE,CAAC,GAAG,EAAE,YAAY,KAAK,UAAU,EACnD,gBAAgB,EAAE,CAChB,UAAU,EAAE,QAAQ,CAAC,UAAU,KAC5B,SAAS,CAAC,UAAU,CAAC,EAC1B,oBAAoB,EAAE,CACpB,WAAW,EAAE,eAAe,CAAC,UAAU,EAAE,YAAY,CAAC,KACnD,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,EAC3C,sBAAsB,EAAE,CAAC,WAAW,EAAE,YAAY,KAAK,MAAM,EAC7D,SAAS,GAAE,UAAU,GAAG,aAAa,GAAG,YAWvC,EACD,SAAS,GAAE,UAAoC,EAC/C,gBAAgB,GAAE,CAAC,SAAS,EAAE,UAAU,KAAK,UACL,EACxC,oBAAoB,GAAE,OAAO,cAA+B;IAkBxC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqKvC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAyC5C"}
|
package/src/application.js
CHANGED
|
@@ -10,11 +10,11 @@ const https_1 = require("https");
|
|
|
10
10
|
const path_1 = require("path");
|
|
11
11
|
const application_base_1 = require("./application-base");
|
|
12
12
|
const interfaces_1 = require("./interfaces");
|
|
13
|
+
const flexible_csp_1 = require("./interfaces/flexible-csp");
|
|
13
14
|
const middlewares_1 = require("./middlewares");
|
|
14
15
|
const app_1 = require("./routers/app");
|
|
15
|
-
const utils_1 = require("./utils");
|
|
16
|
-
const flexible_csp_1 = require("./interfaces/flexible-csp");
|
|
17
16
|
const services_1 = require("./services");
|
|
17
|
+
const utils_1 = require("./utils");
|
|
18
18
|
class Application extends application_base_1.BaseApplication {
|
|
19
19
|
expressApp;
|
|
20
20
|
server = null;
|
|
@@ -56,7 +56,7 @@ class Application extends application_base_1.BaseApplication {
|
|
|
56
56
|
await super.start(mongoUri, true);
|
|
57
57
|
if (this.devDatabase) {
|
|
58
58
|
const result = await this.initializeDevDatabase();
|
|
59
|
-
services_1.DatabaseInitializationService.printServerInitResults(result, false);
|
|
59
|
+
services_1.DatabaseInitializationService.printServerInitResults(result, false, (id) => this.constants.idProvider.idToString(id));
|
|
60
60
|
}
|
|
61
61
|
try {
|
|
62
62
|
this._apiRouter = this._apiRouterFactory(this);
|
|
@@ -69,7 +69,9 @@ class Application extends application_base_1.BaseApplication {
|
|
|
69
69
|
const appRouter = this._appRouterFactory(this._apiRouter);
|
|
70
70
|
appRouter.init(this.expressApp);
|
|
71
71
|
this.expressApp.use((err, req, res, next) => {
|
|
72
|
-
if (res.headersSent ||
|
|
72
|
+
if (res.headersSent ||
|
|
73
|
+
err
|
|
74
|
+
._errorHandlerProcessing) {
|
|
73
75
|
return;
|
|
74
76
|
}
|
|
75
77
|
err._errorHandlerProcessing = true;
|
|
@@ -83,7 +85,11 @@ class Application extends application_base_1.BaseApplication {
|
|
|
83
85
|
catch {
|
|
84
86
|
res.status(500).json({
|
|
85
87
|
message: engine.translate(suite_core_lib_1.SuiteCoreComponentId, suite_core_lib_1.SuiteCoreStringKey.Error_RecursiveErrorHandlingDetected),
|
|
86
|
-
error: {
|
|
88
|
+
error: {
|
|
89
|
+
message: err instanceof Error
|
|
90
|
+
? err.message
|
|
91
|
+
: engine.translate(suite_core_lib_1.SuiteCoreComponentId, suite_core_lib_1.SuiteCoreStringKey.Common_UnexpectedError),
|
|
92
|
+
},
|
|
87
93
|
});
|
|
88
94
|
}
|
|
89
95
|
};
|
package/src/application.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/application.ts"],"names":[],"mappings":";;;;AAAA,wDAA4D;AAC5D,oEAMyC;AACzC,8DAKiB;AACjB,2BAAkC;
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/application.ts"],"names":[],"mappings":"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"}
|
package/src/backup-code.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Member as BackendMember } from '@digitaldefiance/node-ecies-lib';
|
|
2
2
|
import { BackupCodeString, IBackupCode } from '@digitaldefiance/suite-core-lib';
|
|
3
|
+
import { Types } from 'mongoose';
|
|
3
4
|
import { IConstants } from './interfaces';
|
|
4
5
|
/**
|
|
5
6
|
* Class representing a backup code string with associated operations.
|
|
@@ -39,7 +40,7 @@ export declare class BackupCode extends BackupCodeString {
|
|
|
39
40
|
* v1: Compute a 32-byte checksum/tag for a normalized code using HKDF-SHA256(codeUtf8, salt, "backup-checksum").
|
|
40
41
|
*/
|
|
41
42
|
private static computeChecksumV1;
|
|
42
|
-
encrypt(backupUser: BackendMember
|
|
43
|
+
encrypt<TID extends string | Types.ObjectId | Buffer | Uint8Array = Buffer>(backupUser: BackendMember<TID>, systemUser: BackendMember<TID>, constants?: IConstants): Promise<IBackupCode>;
|
|
43
44
|
/**
|
|
44
45
|
* v1: Encrypt and wrap backup codes for a user.
|
|
45
46
|
* - Validates code format (display or normalized)
|
|
@@ -47,9 +48,9 @@ export declare class BackupCode extends BackupCodeString {
|
|
|
47
48
|
* - Derives Argon2id encryption key (32 bytes) from UTF-8 code
|
|
48
49
|
* - Encrypts the private key with AEAD and wraps with system user
|
|
49
50
|
*/
|
|
50
|
-
static encryptBackupCodesV1(backupUser: BackendMember
|
|
51
|
+
static encryptBackupCodesV1<TID extends string | Types.ObjectId | Buffer | Uint8Array = Buffer>(backupUser: BackendMember<TID>, systemUser: BackendMember<TID>, codes: Array<BackupCode>): Promise<Array<IBackupCode>>;
|
|
51
52
|
/** Delegate to current version. */
|
|
52
|
-
static encryptBackupCodes(backupUser: BackendMember
|
|
53
|
+
static encryptBackupCodes<TID extends string | Types.ObjectId | Buffer | Uint8Array = Buffer>(backupUser: BackendMember<TID>, systemUser: BackendMember<TID>, codes: Array<BackupCode>): Promise<Array<IBackupCode>>;
|
|
53
54
|
/**
|
|
54
55
|
* v1: Validate whether a backup code exists (unused) in the provided collection.
|
|
55
56
|
* Uses constant-time comparison of binary checksums (codeUtf8 + salt).
|
package/src/backup-code.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backup-code.d.ts","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/backup-code.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,MAAM,IAAI,aAAa,EACxB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,gBAAgB,EAChB,WAAW,EAKZ,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"backup-code.d.ts","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/backup-code.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,MAAM,IAAI,aAAa,EACxB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,gBAAgB,EAChB,WAAW,EAKZ,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAGjC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C;;;;;;;;;GASG;AACH,qBAAa,UAAW,SAAQ,gBAAgB;IAC9C,sEAAsE;IACtE,gBAAuB,iBAAiB,WAAW;IAEnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAOzB;gBAEC,IAAI,EAAE,MAAM;IAIxB;;;OAGG;WACoB,mBAAmB,CACxC,SAAS,GAAE,UAA+B,GACzC,KAAK,CAAC,UAAU,CAAC;IAQpB;;;;;;;OAOG;WACW,UAAU,CACtB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,MAAM;IA2BT;;;OAGG;WACiB,cAAc,CAChC,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,EACtB,SAAS,GAAE,UAA+B,GACzC,OAAO,CAAC,MAAM,CAAC;IAiBlB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAiBnB,OAAO,CAClB,GAAG,SAAS,MAAM,GAAG,KAAK,CAAC,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,EAElE,UAAU,EAAE,aAAa,CAAC,GAAG,CAAC,EAC9B,UAAU,EAAE,aAAa,CAAC,GAAG,CAAC,EAC9B,SAAS,GAAE,UAA+B,GACzC,OAAO,CAAC,WAAW,CAAC;IAiDvB;;;;;;OAMG;WACiB,oBAAoB,CACtC,GAAG,SAAS,MAAM,GAAG,KAAK,CAAC,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,EAElE,UAAU,EAAE,aAAa,CAAC,GAAG,CAAC,EAC9B,UAAU,EAAE,aAAa,CAAC,GAAG,CAAC,EAC9B,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,GACvB,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAQ9B,mCAAmC;WACrB,kBAAkB,CAC9B,GAAG,SAAS,MAAM,GAAG,KAAK,CAAC,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,EAElE,UAAU,EAAE,aAAa,CAAC,GAAG,CAAC,EAC9B,UAAU,EAAE,aAAa,CAAC,GAAG,CAAC,EAC9B,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,GACvB,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAI9B;;;OAGG;WACW,oBAAoB,CAChC,oBAAoB,EAAE,KAAK,CAAC,WAAW,CAAC,EACxC,UAAU,EAAE,MAAM,EAClB,SAAS,GAAE,UAA+B,GACzC,OAAO;IA6BV;;OAEG;WACW,kBAAkB,CAC9B,oBAAoB,EAAE,KAAK,CAAC,WAAW,CAAC,EACxC,UAAU,EAAE,MAAM,EAClB,SAAS,GAAE,UAA+B,GACzC,OAAO;IAoBV;;OAEG;WACW,uBAAuB,CACnC,oBAAoB,EAAE,KAAK,CAAC,WAAW,CAAC,EACxC,UAAU,EAAE,MAAM,EAClB,SAAS,GAAE,UAA+B,GACzC,MAAM;CA0CV"}
|
package/src/backup-code.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backup-code.js","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/backup-code.ts"],"names":[],"mappings":";;;;AAAA,0DAAwD;AACxD,oEAGyC;AACzC,oEAOyC;AACzC,uDAAiC;AACjC,mCAAkE;
|
|
1
|
+
{"version":3,"file":"backup-code.js","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/backup-code.ts"],"names":[],"mappings":"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"}
|
package/src/constants.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ import { IJwtConsts } from './interfaces/jwt-consts';
|
|
|
10
10
|
export declare const CHECKSUM: IChecksumConsts;
|
|
11
11
|
export declare const JWT: IJwtConsts;
|
|
12
12
|
export declare const FEC: IFECConsts;
|
|
13
|
-
export declare const ECIES:
|
|
13
|
+
export declare const ECIES: any;
|
|
14
14
|
export declare const createExpressConstants: (siteDomain: string, siteHostname: string, overrides?: Partial<IConstants>) => IConstants;
|
|
15
15
|
export declare const LocalhostConstants: IConstants;
|
|
16
16
|
//# sourceMappingURL=constants.d.ts.map
|
package/src/constants.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/constants.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD;;;;GAIG;AACH,eAAO,MAAM,QAAQ,EAAE,eAYZ,CAAC;AAEZ,eAAO,MAAM,GAAG,EAAE,UAUR,CAAC;AAEX,eAAO,MAAM,GAAG,EAAE,UAKR,CAAC;AAGX,eAAO,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/constants.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD;;;;GAIG;AACH,eAAO,MAAM,QAAQ,EAAE,eAYZ,CAAC;AAEZ,eAAO,MAAM,GAAG,EAAE,UAUR,CAAC;AAEX,eAAO,MAAM,GAAG,EAAE,UAKR,CAAC;AAGX,eAAO,MAAM,KAAK,KAA+B,CAAC;AAElD,eAAO,MAAM,sBAAsB,GACjC,YAAY,MAAM,EAClB,cAAc,MAAM,EACpB,YAAY,OAAO,CAAC,UAAU,CAAC,KAC9B,UAWF,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,UAGhC,CAAC"}
|
package/src/constants.js
CHANGED
|
@@ -44,6 +44,8 @@ const createExpressConstants = (siteDomain, siteHostname, overrides) => {
|
|
|
44
44
|
JWT: exports.JWT,
|
|
45
45
|
FEC: exports.FEC,
|
|
46
46
|
ECIES: exports.ECIES,
|
|
47
|
+
ECIES_VERSION_SIZE: 1,
|
|
48
|
+
ECIES_CIPHER_SUITE_SIZE: 1,
|
|
47
49
|
...(0, suite_core_lib_1.createConstants)(siteDomain, siteHostname, overrides),
|
|
48
50
|
});
|
|
49
51
|
};
|
package/src/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/constants.ts"],"names":[],"mappings":";;;AAAA,0DAAoE;AACpE,oEAAkF;AAClF,oEAIyC;AAMzC;;;;GAIG;AACU,QAAA,QAAQ,GAAoB,MAAM,CAAC,MAAM,CAAC;IACrD,iCAAiC;IACjC,sBAAsB,EAAE,GAAY;IAEpC,gDAAgD;IAChD,kBAAkB,EAAE,EAAW;IAE/B,oCAAoC;IACpC,SAAS,EAAE,UAAmB;IAE9B,mCAAmC;IACnC,QAAQ,EAAE,KAAc;CAChB,CAAC,CAAC;AAEC,QAAA,GAAG,GAAe;IAC7B;;OAEG;IACH,SAAS,EAAE,OAAgB;IAE3B;;OAEG;IACH,cAAc,EAAE,KAAc;CACtB,CAAC;AAEE,QAAA,GAAG,GAAe;IAC7B;;OAEG;IACH,cAAc,EAAE,OAAgB;CACxB,CAAC;AAEX,8BAA8B;AACjB,QAAA,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAa,CAAC,CAAC;AAE3C,MAAM,sBAAsB,GAAG,CACpC,UAAkB,EAClB,YAAoB,EACpB,SAA+B,EACnB,EAAE;IACd,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,GAAG,0BAAkB;QACrB,QAAQ,EAAE,gBAAQ;QAClB,GAAG,EAAE,WAAG;QACR,GAAG,EAAE,WAAG;QACR,KAAK,EAAE,aAAK;QACZ,GAAG,IAAA,gCAAe,EAAC,UAAU,EAAE,YAAY,EAAE,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/constants.ts"],"names":[],"mappings":";;;AAAA,0DAAoE;AACpE,oEAAkF;AAClF,oEAIyC;AAMzC;;;;GAIG;AACU,QAAA,QAAQ,GAAoB,MAAM,CAAC,MAAM,CAAC;IACrD,iCAAiC;IACjC,sBAAsB,EAAE,GAAY;IAEpC,gDAAgD;IAChD,kBAAkB,EAAE,EAAW;IAE/B,oCAAoC;IACpC,SAAS,EAAE,UAAmB;IAE9B,mCAAmC;IACnC,QAAQ,EAAE,KAAc;CAChB,CAAC,CAAC;AAEC,QAAA,GAAG,GAAe;IAC7B;;OAEG;IACH,SAAS,EAAE,OAAgB;IAE3B;;OAEG;IACH,cAAc,EAAE,KAAc;CACtB,CAAC;AAEE,QAAA,GAAG,GAAe;IAC7B;;OAEG;IACH,cAAc,EAAE,OAAgB;CACxB,CAAC;AAEX,8BAA8B;AACjB,QAAA,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAa,CAAC,CAAC;AAE3C,MAAM,sBAAsB,GAAG,CACpC,UAAkB,EAClB,YAAoB,EACpB,SAA+B,EACnB,EAAE;IACd,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,GAAG,0BAAkB;QACrB,QAAQ,EAAE,gBAAQ;QAClB,GAAG,EAAE,WAAG;QACR,GAAG,EAAE,WAAG;QACR,KAAK,EAAE,aAAK;QACZ,kBAAkB,EAAE,CAAC;QACrB,uBAAuB,EAAE,CAAC;QAC1B,GAAG,IAAA,gCAAe,EAAC,UAAU,EAAE,YAAY,EAAE,SAAS,CAAC;KAC1C,CAAC,CAAC;AACnB,CAAC,CAAC;AAfW,QAAA,sBAAsB,0BAejC;AAEW,QAAA,kBAAkB,GAAe,IAAA,8BAAsB,EAClE,WAAW,EACX,WAAW,CACZ,CAAC;AAEF,IACE,gBAAQ,CAAC,kBAAkB,KAAK,gBAAQ,CAAC,sBAAsB,GAAG,CAAC;IACnE,gBAAQ,CAAC,kBAAkB,KAAK,gBAAQ,CAAC,sBAAsB,GAAG,CAAC,EACnE,CAAC;IACD,MAAM,IAAI,uCAAsB,CAC9B,mCAAkB,CAAC,8BAA8B,CAClD,CAAC;AACJ,CAAC"}
|
|
@@ -2,10 +2,10 @@ import { PluginI18nEngine } from '@digitaldefiance/i18n-lib';
|
|
|
2
2
|
import { IRequestUserDTO } from '@digitaldefiance/suite-core-lib';
|
|
3
3
|
import { NextFunction, Request, Response, Router } from 'express';
|
|
4
4
|
import { ClientSession } from 'mongoose';
|
|
5
|
-
import { TransactionManager } from '../transactions';
|
|
6
5
|
import { IUserDocument } from '../documents/user';
|
|
7
6
|
import { IConstants } from '../interfaces';
|
|
8
7
|
import { IApplication } from '../interfaces/application';
|
|
8
|
+
import { TransactionManager } from '../transactions';
|
|
9
9
|
import { ApiResponse, FlexibleValidationChain, RouteConfig, TransactionCallback } from '../types';
|
|
10
10
|
import { TransactionOptions } from '../utils';
|
|
11
11
|
export declare abstract class BaseController<T extends ApiResponse, H extends object, TLanguage extends string> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/controllers/base.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,gBAAgB,EAEjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAGL,eAAe,EAMhB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,YAAY,EACZ,OAAO,EAEP,QAAQ,EACR,MAAM,EACP,MAAM,SAAS,CAAC;AAMjB,OAAO,EAAE,aAAa,EAAS,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/controllers/base.ts"],"names":[],"mappings":"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"}
|
package/src/controllers/base.js
CHANGED
|
@@ -6,7 +6,6 @@ const i18n_lib_1 = require("@digitaldefiance/i18n-lib");
|
|
|
6
6
|
const suite_core_lib_1 = require("@digitaldefiance/suite-core-lib");
|
|
7
7
|
const express_1 = require("express");
|
|
8
8
|
const express_validator_1 = require("express-validator");
|
|
9
|
-
const transactions_1 = require("../transactions");
|
|
10
9
|
const base_model_name_1 = require("../enumerations/base-model-name");
|
|
11
10
|
const express_validation_1 = require("../errors/express-validation");
|
|
12
11
|
const missing_validated_data_1 = require("../errors/missing-validated-data");
|
|
@@ -14,6 +13,7 @@ const authenticate_crypto_1 = require("../middlewares/authenticate-crypto");
|
|
|
14
13
|
const authenticate_token_1 = require("../middlewares/authenticate-token");
|
|
15
14
|
const set_global_context_language_1 = require("../middlewares/set-global-context-language");
|
|
16
15
|
const model_registry_1 = require("../model-registry");
|
|
16
|
+
const transactions_1 = require("../transactions");
|
|
17
17
|
const utils_1 = require("../utils");
|
|
18
18
|
class BaseController {
|
|
19
19
|
router;
|
|
@@ -146,12 +146,13 @@ class BaseController {
|
|
|
146
146
|
? utils_1.sendRawJsonResponse.bind(this)
|
|
147
147
|
: utils_1.sendApiMessageResponse.bind(this);
|
|
148
148
|
const handlerArgs = config.handlerArgs ?? [];
|
|
149
|
+
const typedHandler = handler;
|
|
149
150
|
let result;
|
|
150
151
|
if (config.useTransaction) {
|
|
151
152
|
result = await this.transactionManager.execute(async (session) => {
|
|
152
153
|
this.activeSession = session;
|
|
153
154
|
try {
|
|
154
|
-
return await
|
|
155
|
+
return await typedHandler(req, ...handlerArgs);
|
|
155
156
|
}
|
|
156
157
|
finally {
|
|
157
158
|
this.activeSession = undefined;
|
|
@@ -159,7 +160,7 @@ class BaseController {
|
|
|
159
160
|
}, { timeoutMs: config.transactionTimeout });
|
|
160
161
|
}
|
|
161
162
|
else {
|
|
162
|
-
result = await
|
|
163
|
+
result = await typedHandler(req, ...handlerArgs);
|
|
163
164
|
}
|
|
164
165
|
const { statusCode, response, headers } = result;
|
|
165
166
|
if (headers) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/controllers/base.ts"],"names":[],"mappings":";;;AAAA,sCAAsC;AACtC,wDAMmC;AACnC,oEASyC;AACzC,qCAMiB;AACjB,yDAI2B;
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/controllers/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/controllers/user.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/controllers/user.ts"],"names":[],"mappings":"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"}
|
package/src/controllers/user.js
CHANGED
|
@@ -8,7 +8,6 @@ const i18n_lib_1 = require("@digitaldefiance/i18n-lib");
|
|
|
8
8
|
const node_ecies_lib_1 = require("@digitaldefiance/node-ecies-lib");
|
|
9
9
|
const suite_core_lib_1 = require("@digitaldefiance/suite-core-lib");
|
|
10
10
|
const express_validator_1 = require("express-validator");
|
|
11
|
-
const mongoose_1 = require("mongoose");
|
|
12
11
|
const zod_1 = require("zod");
|
|
13
12
|
const backup_code_1 = require("../backup-code");
|
|
14
13
|
const base_controller_1 = require("../decorators/base-controller");
|
|
@@ -96,9 +95,7 @@ let UserController = class UserController extends base_controller_1.DecoratorBas
|
|
|
96
95
|
throw new suite_core_lib_1.GenericValidationError((0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Validation_TokenInvalid));
|
|
97
96
|
}
|
|
98
97
|
const UserModel = this.application.getModel(base_model_name_1.BaseModelName.User);
|
|
99
|
-
const userDoc = await UserModel.findById(tokenUser.userId
|
|
100
|
-
password: 0,
|
|
101
|
-
});
|
|
98
|
+
const userDoc = await UserModel.findById(tokenUser.userId).select('-password');
|
|
102
99
|
if (!userDoc || userDoc.accountStatus !== suite_core_lib_1.AccountStatus.Active) {
|
|
103
100
|
throw new suite_core_lib_1.GenericValidationError((0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Validation_UserNotFound));
|
|
104
101
|
}
|
|
@@ -210,17 +207,21 @@ let UserController = class UserController extends base_controller_1.DecoratorBas
|
|
|
210
207
|
}
|
|
211
208
|
async updateSettings(req, res, next) {
|
|
212
209
|
return await (0, utils_1.withTransaction)(this.application.db.connection, this.application.environment.mongo.useTransactions, undefined, async (sess) => {
|
|
213
|
-
const { email, timezone, siteLanguage, currency, darkMode, directChallenge } = this.validatedBody;
|
|
210
|
+
const { email, timezone, siteLanguage, currency, darkMode, directChallenge, } = this.validatedBody;
|
|
214
211
|
if (!req.user) {
|
|
215
212
|
throw new i18n_lib_1.HandleableError(new Error((0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Common_NoUserOnRequest)), { statusCode: 401 });
|
|
216
213
|
}
|
|
217
214
|
const user = await this.userService.updateUserSettings(req.user.id, {
|
|
218
215
|
...(email !== undefined && { email: email }),
|
|
219
216
|
...(timezone !== undefined && { timezone: timezone }),
|
|
220
|
-
...(siteLanguage !== undefined && {
|
|
217
|
+
...(siteLanguage !== undefined && {
|
|
218
|
+
siteLanguage: siteLanguage,
|
|
219
|
+
}),
|
|
221
220
|
...(currency !== undefined && { currency: currency }),
|
|
222
221
|
...(darkMode !== undefined && { darkMode: darkMode }),
|
|
223
|
-
...(directChallenge !== undefined && {
|
|
222
|
+
...(directChallenge !== undefined && {
|
|
223
|
+
directChallenge: directChallenge,
|
|
224
|
+
}),
|
|
224
225
|
}, sess);
|
|
225
226
|
return {
|
|
226
227
|
statusCode: 200,
|
|
@@ -272,7 +273,7 @@ let UserController = class UserController extends base_controller_1.DecoratorBas
|
|
|
272
273
|
if (!isString(password)) {
|
|
273
274
|
throw new suite_core_lib_1.GenericValidationError((0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Validation_MissingValidatedData));
|
|
274
275
|
}
|
|
275
|
-
const userDoc = await this.userService.findUserById(
|
|
276
|
+
const userDoc = await this.userService.findUserById(this.userService.toId(req.user.id), true, sess);
|
|
276
277
|
const mnemonic = await this.userService.recoverMnemonic(req.eciesUser, userDoc.mnemonicRecovery);
|
|
277
278
|
return {
|
|
278
279
|
statusCode: 200,
|
|
@@ -436,6 +437,8 @@ let UserController = class UserController extends base_controller_1.DecoratorBas
|
|
|
436
437
|
},
|
|
437
438
|
};
|
|
438
439
|
}
|
|
440
|
+
// Mongoose document type doesn't exactly match IUserDocument generic signature
|
|
441
|
+
// but the document has all required properties
|
|
439
442
|
await this.userService.createAndSendEmailToken(user, suite_core_lib_1.EmailTokenType.PasswordReset, sess, this.application.environment.debug);
|
|
440
443
|
return {
|
|
441
444
|
statusCode: 200,
|