@digitaldefiance/node-express-suite 2.2.22 → 2.2.25

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 CHANGED
@@ -692,6 +692,7 @@ yarn add -D @faker-js/faker
692
692
  📚 **Comprehensive documentation is available in the [`docs/`](./docs) directory.**
693
693
 
694
694
  ### Quick Links
695
+
695
696
  - **[📚 Documentation Index](./docs/INDEX.md)** - Complete documentation index
696
697
  - **[🏗️ Architecture](./docs/ARCHITECTURE.md)** - System design and architecture
697
698
  - **[🎮 Controllers](./docs/CONTROLLERS.md)** - Controller system and decorators
@@ -1127,6 +1128,24 @@ The following v1.x patterns still work in v2.0:
1127
1128
 
1128
1129
  ## ChangeLog
1129
1130
 
1131
+ ### Version 2.2.25
1132
+
1133
+ - Fix user schema validation/tests
1134
+
1135
+ ### Version 2.2.24
1136
+
1137
+ - Update user schema for currency
1138
+ - Update request user function for currency
1139
+
1140
+ ### Version 2.2.23
1141
+
1142
+ - Documentation, library updates
1143
+
1144
+ ### Version 2.2.22
1145
+
1146
+ - Documentation, library updates
1147
+ - Add settings endpoint
1148
+
1130
1149
  ### Version 2.2.21
1131
1150
 
1132
1151
  - Update libs
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@digitaldefiance/node-express-suite",
3
- "version": "2.2.22",
3
+ "version": "2.2.25",
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": "3.0.6",
36
- "@digitaldefiance/i18n-lib": "3.6.2",
37
- "@digitaldefiance/node-ecies-lib": "3.0.6",
38
- "@digitaldefiance/suite-core-lib": "^2.2.19",
35
+ "@digitaldefiance/ecies-lib": "3.0.7",
36
+ "@digitaldefiance/i18n-lib": "3.6.3",
37
+ "@digitaldefiance/node-ecies-lib": "3.0.7",
38
+ "@digitaldefiance/suite-core-lib": "^2.2.20",
39
39
  "@noble/curves": "^2.0.1",
40
40
  "@noble/hashes": "^2.0.1",
41
41
  "@subspace/reed-solomon-erasure.wasm": "^0.2.5",
@@ -22,7 +22,7 @@ function getSchemaMap(connection, options = {}) {
22
22
  Mnemonic: (0, mnemonic_2.createMnemonicSchema)(undefined, options?.constants),
23
23
  Role: (0, role_2.createRoleSchema)(undefined, options?.constants),
24
24
  UsedDirectLoginToken: (0, used_direct_login_token_2.createUsedDirectLoginTokenSchema)(undefined, options?.constants),
25
- User: (0, user_2.createUserSchema)(undefined, undefined, undefined, undefined, options?.constants),
25
+ User: (0, user_2.createUserSchema)(undefined, undefined, undefined, undefined, undefined, options?.constants),
26
26
  UserRole: (0, user_role_2.createUserRoleSchema)(undefined, options?.constants),
27
27
  };
28
28
  const { modelNames = {}, collections = {} } = options;
@@ -1 +1 @@
1
- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/schema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/schema.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ import { IConstants } from '../interfaces/constants';
5
5
  /**
6
6
  * Create a user schema with custom or default constants
7
7
  */
8
- export declare function createUserSchema<T extends IConstants = IConstants>(usernameValidationMessage?: () => string, emailValidationMessage?: () => string, timezoneValidationMessage?: () => string, supportedLanguages?: readonly string[], constants?: T): Schema<IUserDocument>;
8
+ export declare function createUserSchema<T extends IConstants = IConstants>(usernameValidationMessage?: () => string, emailValidationMessage?: () => string, timezoneValidationMessage?: () => string, currencyValidationMessage?: () => string, supportedLanguages?: readonly string[], constants?: T): Schema<IUserDocument>;
9
9
  /**
10
10
  * Default user schema with base configuration
11
11
  */
@@ -1 +1 @@
1
- {"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/user.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EAGd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAChE,yBAAyB,CAAC,EAAE,MAAM,MAAM,EACxC,sBAAsB,CAAC,EAAE,MAAM,MAAM,EACrC,yBAAyB,CAAC,EAAE,MAAM,MAAM,EACxC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,EACtC,SAAS,GAAE,CAAqB,GAC/B,MAAM,CAAC,aAAa,CAAC,CAwLvB;AAED;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;EAAqB,CAAC"}
1
+ {"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/user.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EAGd,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAChE,yBAAyB,CAAC,EAAE,MAAM,MAAM,EACxC,sBAAsB,CAAC,EAAE,MAAM,MAAM,EACrC,yBAAyB,CAAC,EAAE,MAAM,MAAM,EACxC,yBAAyB,CAAC,EAAE,MAAM,MAAM,EACxC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,EACtC,SAAS,GAAE,CAAqB,GAC/B,MAAM,CAAC,aAAa,CAAC,CAuMvB;AAED;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;EAAqB,CAAC"}
@@ -5,6 +5,7 @@ exports.createUserSchema = createUserSchema;
5
5
  const tslib_1 = require("tslib");
6
6
  const i18n_lib_1 = require("@digitaldefiance/i18n-lib");
7
7
  const suite_core_lib_1 = require("@digitaldefiance/suite-core-lib");
8
+ const currency_codes_1 = require("currency-codes");
8
9
  const mongoose_1 = require("mongoose");
9
10
  const validator_1 = tslib_1.__importDefault(require("validator"));
10
11
  const constants_1 = require("../constants");
@@ -12,7 +13,7 @@ const enumerations_1 = require("../enumerations");
12
13
  /**
13
14
  * Create a user schema with custom or default constants
14
15
  */
15
- function createUserSchema(usernameValidationMessage, emailValidationMessage, timezoneValidationMessage, supportedLanguages, constants = constants_1.LocalhostConstants) {
16
+ function createUserSchema(usernameValidationMessage, emailValidationMessage, timezoneValidationMessage, currencyValidationMessage, supportedLanguages, constants = constants_1.LocalhostConstants) {
16
17
  /**
17
18
  * Schema for users
18
19
  */
@@ -66,6 +67,17 @@ function createUserSchema(usernameValidationMessage, emailValidationMessage, tim
66
67
  ((props) => (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Common_NotValidTimeZoneTemplate, { timezone: props.value })),
67
68
  },
68
69
  },
70
+ currency: {
71
+ type: String,
72
+ required: true,
73
+ default: 'USD',
74
+ validate: {
75
+ validator: function (v) {
76
+ return (0, currency_codes_1.codes)().includes(v);
77
+ },
78
+ message: currencyValidationMessage || ((props) => (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Common_NotValidCurrencyTemplate, { currency: props.value })),
79
+ }
80
+ },
69
81
  /**
70
82
  * The language of the site for the user
71
83
  */
@@ -1 +1 @@
1
- {"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/user.ts"],"names":[],"mappings":";;;AAgBA,4CA8LC;;AA9MD,wDAA2E;AAC3E,oEAIyC;AACzC,uCAAkC;AAClC,kEAAkC;AAClC,4CAAkE;AAElE,kDAAgD;AAGhD;;GAEG;AACH,SAAgB,gBAAgB,CAC9B,yBAAwC,EACxC,sBAAqC,EACrC,yBAAwC,EACxC,kBAAsC,EACtC,YAAe,8BAAiB;IAEhC;;OAEG;IACH,OAAO,IAAI,iBAAM,CACf;QACE;;WAEG;QACH,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE;gBACR,SAAS,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzD,OAAO,EACL,yBAAyB;oBACzB,CAAC,GAAG,EAAE,CACJ,IAAA,wCAAuB,EACrB,mCAAkB,CAAC,qCAAqC,CACzD,CAAC;aACP;SACF;QACD;;WAEG;QACH,KAAK,EAAE;YACL,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE;gBACR,SAAS,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,mBAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC9C,OAAO,EACL,sBAAsB;oBACtB,CAAC,CAAC,KAAwB,EAAE,EAAE,CAC5B,IAAA,wCAAuB,EACrB,mCAAkB,CAAC,0BAA0B,EAC7C,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CACvB,CAAC;aACP;SACF;QACD;;WAEG;QACH,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb;QACD;;WAEG;QACH,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE;gBACR,SAAS,EAAE,UAAU,CAAS;oBAC5B,OAAO,IAAA,0BAAe,EAAC,CAAC,CAAC,CAAC;gBAC5B,CAAC;gBACD,OAAO,EACL,yBAAyB;oBACzB,CAAC,CAAC,KAAwB,EAAE,EAAE,CAC5B,IAAA,wCAAuB,EACrB,mCAAkB,CAAC,+BAA+B,EAClD,EAAE,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,CAC1B,CAAC;aACP;SACF;QACD;;WAEG;QACH,YAAY,EAAE;YACZ,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,kBAAkB,IAAI,MAAM,CAAC,MAAM,CAAC,wBAAa,CAAC;YACxD,OAAO,EAAE,wBAAa,CAAC,KAAK;YAC5B,QAAQ,EAAE,IAAI;SACf;QACD;;WAEG;QACH,QAAQ,EAAE;YACR,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,IAAI;SACf;QACD;;WAEG;QACH,eAAe,EAAE;YACf,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,IAAI;SACf;QACD;;WAEG;QACH,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;QAC1C;;WAEG;QACH,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE;QAChD;;WAEG;QACH,aAAa,EAAE;YACb,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,8BAAa,CAAC;YAClC,OAAO,EAAE,8BAAa,CAAC,wBAAwB;SAChD;QACD;;WAEG;QACH,SAAS,EAAE;YACT,IAAI,EAAE,iBAAM,CAAC,KAAK,CAAC,QAAQ;YAC3B,GAAG,EAAE,4BAAa,CAAC,IAAI;YACvB,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAChB;QACD;;WAEG;QACH,SAAS,EAAE;YACT,IAAI,EAAE,iBAAM,CAAC,KAAK,CAAC,QAAQ;YAC3B,GAAG,EAAE,4BAAa,CAAC,IAAI;YACvB,QAAQ,EAAE,IAAI;SACf;QACD;;WAEG;QACH,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;QACzC;;WAEG;QACH,SAAS,EAAE;YACT,IAAI,EAAE,iBAAM,CAAC,KAAK,CAAC,QAAQ;YAC3B,GAAG,EAAE,4BAAa,CAAC,IAAI;YACvB,QAAQ,EAAE,IAAI;SACf;QACD;;WAEG;QACH,UAAU,EAAE;YACV,IAAI,EAAE,iBAAM,CAAC,KAAK,CAAC,QAAQ;YAC3B,GAAG,EAAE,4BAAa,CAAC,QAAQ;YAC3B,QAAQ,EAAE,KAAK;SAChB;QACD;;WAEG;QACH,gBAAgB,EAAE;YAChB,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;SAChB;QACD;;WAEG;QACH,yBAAyB,EAAE;YACzB,IAAI,EAAE;gBACJ,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;gBACtC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;gBACpC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;gBACzC,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;gBAC5C,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;aAC7C;YACD,QAAQ,EAAE,KAAK;SAChB;QACD;;WAEG;QACH,WAAW,EAAE;YACX,IAAI,EAAE;gBACJ;oBACE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;oBACzC,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC9C,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC1C,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;iBAC5C;aACF;YACD,OAAO,EAAE,EAAE;SACZ;KACF,EACD,EAAE,UAAU,EAAE,IAAI,EAAE,CACrB,CAAC;AACJ,CAAC;AAED;;GAEG;AACU,QAAA,UAAU,GAAG,gBAAgB,EAAE,CAAC"}
1
+ {"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/user.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"request-user.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/request-user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAY,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAExF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AAGvF,qBAAa,kBAAkB,CAAC,CAAC,EAAE,UAAU,SAAS,UAAU,CAAC,CAAC,CAAC;IACjE;;;;OAIG;WACW,kBAAkB,CAC9B,CAAC,EACD,UAAU,SAAS,UAAU,CAAC,CAAC,CAAC,EAChC,eAAe,SAAS,eAAe,EACvC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,eAAe;IAiB/D;;;;OAIG;WACW,kBAAkB,CAC9B,CAAC,SAAS,MAAM,EAChB,eAAe,SAAS,eAAe,GAAG;QAAE,YAAY,EAAE,CAAC,CAAA;KAAE,EAC7D,WAAW,EAAE,eAAe,GAAG,yBAAyB,CAAC,CAAC,CAAC;CAsB9D"}
1
+ {"version":3,"file":"request-user.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/request-user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAY,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAExF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AAGvF,qBAAa,kBAAkB,CAAC,CAAC,EAAE,UAAU,SAAS,UAAU,CAAC,CAAC,CAAC;IACjE;;;;OAIG;WACW,kBAAkB,CAC9B,CAAC,EACD,UAAU,SAAS,UAAU,CAAC,CAAC,CAAC,EAChC,eAAe,SAAS,eAAe,EACvC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,eAAe;IAmB/D;;;;OAIG;WACW,kBAAkB,CAC9B,CAAC,SAAS,MAAM,EAChB,eAAe,SAAS,eAAe,GAAG;QAAE,YAAY,EAAE,CAAC,CAAA;KAAE,EAC7D,WAAW,EAAE,eAAe,GAAG,yBAAyB,CAAC,CAAC,CAAC;CAsB9D"}
@@ -19,10 +19,12 @@ class RequestUserService {
19
19
  roles: roles.map((r) => role_1.RoleService.roleToRoleDTO(r)),
20
20
  username: userDoc.username,
21
21
  timezone: userDoc.timezone,
22
- ...(userDoc.lastLogin && { lastLogin: userDoc.lastLogin.toString() }),
22
+ currency: userDoc.currency,
23
+ directChallenge: userDoc.directChallenge,
23
24
  emailVerified: userDoc.emailVerified,
24
25
  darkMode: userDoc.darkMode,
25
26
  siteLanguage: userDoc.siteLanguage,
27
+ ...(userDoc.lastLogin && { lastLogin: userDoc.lastLogin.toString() }),
26
28
  };
27
29
  }
28
30
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"request-user.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/request-user.ts"],"names":[],"mappings":";;;AACA,uCAAiC;AAGjC,iCAAqC;AAErC,MAAa,kBAAkB;IAC7B;;;;OAIG;IACI,MAAM,CAAC,kBAAkB,CAI9B,OAAsB,EAAE,KAAmB;QAC3C,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QACD,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YACrD,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC;YACrE,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,YAAY,EAAE,OAAO,CAAC,YAAsB;SAC1B,CAAC;IACvB,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,kBAAkB,CAG9B,WAA4B;QAC5B,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAc,EAAE,EAAE,CAC7D,kBAAW,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAC1C,CAAC;QAEF,MAAM,YAAY,GAAiC;YACjD,EAAE,EAAE,IAAI,gBAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACtC,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,KAAK,EAAE,aAAa;YACpB,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,YAAY,EAAE,WAAW,CAAC,YAAY;SACvC,CAAC;QAEF,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;YAC1B,YAAY,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AAzDD,gDAyDC"}
1
+ {"version":3,"file":"request-user.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/request-user.ts"],"names":[],"mappings":";;;AACA,uCAAiC;AAGjC,iCAAqC;AAErC,MAAa,kBAAkB;IAC7B;;;;OAIG;IACI,MAAM,CAAC,kBAAkB,CAI9B,OAAsB,EAAE,KAAmB;QAC3C,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QACD,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YACrD,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,YAAY,EAAE,OAAO,CAAC,YAAsB;YAC5C,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC;SACnD,CAAC;IACvB,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,kBAAkB,CAG9B,WAA4B;QAC5B,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAc,EAAE,EAAE,CAC7D,kBAAW,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAC1C,CAAC;QAEF,MAAM,YAAY,GAAiC;YACjD,EAAE,EAAE,IAAI,gBAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACtC,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,KAAK,EAAE,aAAa;YACpB,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,YAAY,EAAE,WAAW,CAAC,YAAY;SACvC,CAAC;QAEF,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;YAC1B,YAAY,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AA3DD,gDA2DC"}