npm - @digitaldefiance/node-express-suite - Versions diffs - 2.2.36 → 3.5.7 - Mend

@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.

Files changed (154) hide show

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/src/services/database-initialization.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"database-initialization.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/database-initialization.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"database-initialization.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/database-initialization.ts"],"names":[],"mappings":"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"}

package/src/services/db-init-cache.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import type { SecureString } from '@digitaldefiance/ecies-lib';
 import type { Member as BackendMember } from '@digitaldefiance/node-ecies-lib';
 declare global {
     var __MEMBER_CACHE__: Map<string, {
-        member: BackendMember;
+        member: BackendMember<any>;
         mnemonic: SecureString;
     }> | undefined;
 }

package/src/services/db-init-cache.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"db-init-cache.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/db-init-cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAE/E,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,gBAAgB,EAChB,GAAG,CACD,MAAM,EACN;QACE,MAAM,EAAE,aAAa,CAAC;~~QACtB~~,QAAQ,EAAE,YAAY,CAAC;KACxB,CACF,GACD,SAAS,CAAC;CACf;AAED,OAAO,EAAE,CAAC"}
1	+ {"version":3,"file":"db-init-cache.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/db-init-cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAE/E,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,gBAAgB,EAChB,GAAG,CACD,MAAM,EACN;QACE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;QAC3B,QAAQ,EAAE,YAAY,CAAC;KACxB,CACF,GACD,SAAS,CAAC;CACf;AAED,OAAO,EAAE,CAAC"}

package/src/services/direct-login-token.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { ClientSession, Types } from 'mongoose';
 import { IApplication } from '../interfaces/application';
 export declare abstract class DirectLoginTokenService {
-    static useToken(app: IApplication, userId: Types.ObjectId, token: string, session?: ClientSession): Promise<void>;
+    static useToken<I extends string | Types.ObjectId = Types.ObjectId>(app: IApplication, userId: I, token: string, session?: ClientSession): Promise<void>;
 }
 //# sourceMappingURL=direct-login-token.d.ts.map

package/src/services/direct-login-token.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"direct-login-token.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/direct-login-token.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAMhD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,8BAAsB,uBAAuB;WACvB,QAAQ,~~CAC1B~~,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,~~KAAK,~~CAAC,~~QAAQ~~,~~EACtB,~~KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,IAAI,CAAC;CAyCjB"}
1	+ {"version":3,"file":"direct-login-token.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/direct-login-token.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAMhD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,8BAAsB,uBAAuB;WACvB,QAAQ,CAAC,CAAC,SAAS,MAAM,GAAG,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAC7E,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,IAAI,CAAC;CAyCjB"}

package/src/services/direct-login-token.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"direct-login-token.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/direct-login-token.ts"],"names":[],"mappings":";;;AAAA,oEAIyC;AAIzC,qEAAgE;AAIhE,sDAAkD;AAClD,oCAA2C;AAC3C,MAAsB,uBAAuB;IACpC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAC1B,GAAiB,EACjB,~~MAAsB~~,~~EACtB~~,KAAa,EACb,OAAuB;QAEvB,OAAO,IAAA,uBAAe,EACpB,GAAG,CAAC,EAAE,CAAC,UAAU,EACjB,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,eAAe,EACrC,OAAO,EACP,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,MAAM,yBAAyB,GAAG,8BAAa,CAAC,QAAQ,CAAC,GAAG,CAG1D,+BAAa,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC;YAC5C,MAAM,WAAW,GAAG,MAAM,yBAAyB,CAAC,MAAM,CAAC;gBACzD,MAAM;gBACN,KAAK;aACN,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;YACzB,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,IAAI,qCAAoB,EAAE,CAAC;YACnC,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,yBAAyB,CAAC,MAAM,CACtD,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EACnB;oBACE,OAAO,EAAE,IAAI;iBACd,CACF,CAAC;gBACF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC3B,MAAM,IAAI,4CAA2B,EAAE,CAAC;gBAC1C,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,uCAAuC;gBACvC,IAAI,GAAG,YAAY,4CAA2B,EAAE,CAAC;oBAC/C,MAAM,GAAG,CAAC;gBACZ,CAAC;gBACD,2EAA2E;gBAC3E,MAAM,IAAI,4CAA2B,EAAE,CAAC;YAC1C,CAAC;QACH,CAAC,EACD;YACE,SAAS,EAAE,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,kBAAkB;SACpD,CACF,CAAC;IACJ,CAAC;CACF;AA/CD,0DA+CC"}
1	+ {"version":3,"file":"direct-login-token.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/direct-login-token.ts"],"names":[],"mappings":";;;AAAA,oEAIyC;AAIzC,qEAAgE;AAIhE,sDAAkD;AAClD,oCAA2C;AAC3C,MAAsB,uBAAuB;IACpC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAC1B,GAAiB,EACjB,MAAS,EACT,KAAa,EACb,OAAuB;QAEvB,OAAO,IAAA,uBAAe,EACpB,GAAG,CAAC,EAAE,CAAC,UAAU,EACjB,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,eAAe,EACrC,OAAO,EACP,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,MAAM,yBAAyB,GAAG,8BAAa,CAAC,QAAQ,CAAC,GAAG,CAG1D,+BAAa,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC;YAC5C,MAAM,WAAW,GAAG,MAAM,yBAAyB,CAAC,MAAM,CAAC;gBACzD,MAAM;gBACN,KAAK;aACN,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;YACzB,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,IAAI,qCAAoB,EAAE,CAAC;YACnC,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,yBAAyB,CAAC,MAAM,CACtD,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EACnB;oBACE,OAAO,EAAE,IAAI;iBACd,CACF,CAAC;gBACF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC3B,MAAM,IAAI,4CAA2B,EAAE,CAAC;gBAC1C,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,uCAAuC;gBACvC,IAAI,GAAG,YAAY,4CAA2B,EAAE,CAAC;oBAC/C,MAAM,GAAG,CAAC;gBACZ,CAAC;gBACD,2EAA2E;gBAC3E,MAAM,IAAI,4CAA2B,EAAE,CAAC;YAC1C,CAAC;QACH,CAAC,EACD;YACE,SAAS,EAAE,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,kBAAkB;SACpD,CACF,CAAC;IACJ,CAAC;CACF;AA/CD,0DA+CC"}

package/src/services/jwt.d.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import { IUserDocument } from '../documents/user';
 import { IApplication } from '../interfaces/application';
 import { IJwtSignResponse } from '../interfaces/jwt-sign-response';
 import { BaseService } from './base';
-export declare class JwtService<I = Types.ObjectId, D extends Date = Date, TTokenRole extends ITokenRole<I, D> = ITokenRole<I, D>, TTokenUser extends ITokenUser = ITokenUser, TApplication extends IApplication = IApplication> extends BaseService {
+export declare class JwtService<I extends string | Types.ObjectId = Types.ObjectId, D extends Date = Date, TTokenRole extends ITokenRole<I, D> = ITokenRole<I, D>, TTokenUser extends ITokenUser = ITokenUser, TApplication extends IApplication = IApplication> extends BaseService {
     private readonly roleService;
     /**
      * Constructor for the JWT service
@@ -18,7 +18,7 @@ export declare class JwtService<I = Types.ObjectId, D extends Date = Date, TToke
      * @param overrideLanguage Optional language to use for role translations
      * @returns The signed token
      */
-    signToken(userDoc: IUserDocument, jwtSecret: string, overrideLanguage?: string): Promise<IJwtSignResponse<I, D, TTokenRole>>;
+    signToken(userDoc: IUserDocument<string, I>, jwtSecret: string, overrideLanguage?: string): Promise<IJwtSignResponse<I, D, TTokenRole>>;
     /**
      * Verify a JWT token and return the user data
      * @param token The token to verify

package/src/services/jwt.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"jwt.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/jwt.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,UAAU,EACX,MAAM,iCAAiC,CAAC;AASzC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAGjC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAKlD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAUrC,qBAAa,UAAU,CACrB,CAAC,GAAG,KAAK,CAAC,QAAQ,~~EAClB~~,CAAC,SAAS,IAAI,GAAG,IAAI,EACrB,UAAU,SAAS,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,EACtD,UAAU,SAAS,UAAU,GAAG,UAAU,EAC1C,YAAY,SAAS,YAAY,GAAG,YAAY,CAChD,SAAQ,WAAW;IACnB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgC;IAE5D;;;OAGG;gBACS,WAAW,EAAE,YAAY;IAKrC;;;;;;OAMG;IACU,SAAS,CACpB,OAAO,EAAE,aAAa,~~EACtB~~,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;IAgC9C;;;;;OAKG;IACU,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAgCpE"}
1	+ {"version":3,"file":"jwt.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/jwt.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,UAAU,EACX,MAAM,iCAAiC,CAAC;AASzC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAGjC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAKlD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAUrC,qBAAa,UAAU,CACrB,CAAC,SAAS,MAAM,GAAG,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAClD,CAAC,SAAS,IAAI,GAAG,IAAI,EACrB,UAAU,SAAS,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,EACtD,UAAU,SAAS,UAAU,GAAG,UAAU,EAC1C,YAAY,SAAS,YAAY,GAAG,YAAY,CAChD,SAAQ,WAAW;IACnB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgC;IAE5D;;;OAGG;gBACS,WAAW,EAAE,YAAY;IAKrC;;;;;;OAMG;IACU,SAAS,CACpB,OAAO,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,EACjC,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;IAgC9C;;;;;OAKG;IACU,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAgCpE"}

package/src/services/jwt.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/jwt.ts"],"names":[],"mappings":";;;AAKA,+CAOsB;AAEtB,+BAAiC;AAIjC,mEAAmE;AACnE,2DAA4D;AAI5D,iCAAqC;AACrC,iCAAqC;AAErC,MAAM,WAAW,GAAG,IAAA,gBAAS,EAK3B,qBAAM,CAAC,CAAC;AAEV,MAAa,UAMX,SAAQ,kBAAW;IACF,WAAW,CAAgC;IAE5D;;;OAGG;IACH,YAAY,WAAyB;QACnC,KAAK,CAAC,WAAW,CAAC,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,IAAI,kBAAW,CAAmB,WAAW,CAAC,CAAC;IACpE,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,SAAS,CACpB,~~OAAsB~~,~~EACtB~~,SAAiB,EACjB,gBAAyB;QAEzB,mGAAmG;QACnG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAsB,IAAI,CAAC,WAAW,CAAC,iBAAiB,CACtE,KAAK,EACL,gBAAgB,CACjB,CAAC;QACF,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC5C,kBAAW,CAAC,aAAa,CAAO,IAAI,CAAC,CACtC,CAAC;QACF,MAAM,mBAAmB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1E,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,SAAS,GAAG;YAChB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC9B,KAAK,EAAE,aAAa;SACP,CAAC;QAChB,0CAA0C;QAC1C,MAAM,KAAK,GAAG,IAAA,mBAAI,EAAC,SAAS,EAAE,SAAS,EAAE;YACvC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS;YACnD,qBAAqB,EAAE,KAAK;YAC5B,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc;SACzD,CAAC,CAAC;QACH,OAAO;YACL,KAAK;YACL,SAAS;YACT,SAAS;YACT,mBAAmB;YACnB,KAAK,EAAE,UAAU;YACjB,QAAQ,EAAE,aAAa;SACxB,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,WAAW,CAAC,KAAa;QACpC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,CAAC,MAAM,WAAW,CAChC,KAAK,EACL,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,EACtC;gBACE,UAAU,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC;aACvD,CACF,CAAe,CAAC;YAEjB,IACE,OAAO,OAAO,KAAK,QAAQ;gBAC3B,OAAO,KAAK,IAAI;gBAChB,QAAQ,IAAI,OAAO;gBACnB,OAAO,IAAI,OAAO,EAClB,CAAC;gBACD,OAAO;oBACL,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAW;oBACnC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAoB;iBAC7B,CAAC;YAClB,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,gCAAoB,EAAE,CAAC;gBACxC,MAAM,IAAI,iCAAiB,EAAE,CAAC;YAChC,CAAC;iBAAM,IAAI,GAAG,YAAY,gCAAiB,EAAE,CAAC;gBAC5C,MAAM,GAAG,CAAC;YACZ,CAAC;YACD,MAAM,IAAI,wCAAoB,EAAE,CAAC;QACnC,CAAC;IACH,CAAC;CACF;AAnGD,gCAmGC"}
1	+ {"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/jwt.ts"],"names":[],"mappings":"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"}

package/src/services/mnemonic.d.ts CHANGED Viewed

@@ -1,16 +1,16 @@
 import { SecureBuffer, SecureString } from '@digitaldefiance/ecies-lib';
-import { ClientSession, Model } from 'mongoose';
+import { ClientSession, Model, Types } from 'mongoose';
 import { IMnemonicDocument } from '../documents/mnemonic';
 import { IConstants } from '../interfaces';
 /**
  * Encrypts and stores mnemonics securely, using an HMAC to check for
  * uniqueness without exposing the mnemonic itself.
  */
-export declare class MnemonicService {
+export declare class MnemonicService<I extends string | Types.ObjectId = Types.ObjectId> {
     private readonly hmacSecret;
     private readonly MnemonicModel;
     private readonly constants;
-    constructor(mnemonicModel: Model<IMnemonicDocument>, hmacSecret: SecureBuffer, constants: IConstants);
+    constructor(mnemonicModel: Model<IMnemonicDocument<I>>, hmacSecret: SecureBuffer, constants: IConstants);
     /**
      * Disposes of the secure secrets held by this service.
      */
@@ -33,20 +33,20 @@ export declare class MnemonicService {
      * @param session Optional Mongoose session for transaction support.
      */
     addMnemonicWithPassword(mnemonic: SecureString, _password: SecureString, session?: ClientSession): Promise<{
-        document: IMnemonicDocument | null;
+        document: IMnemonicDocument<I> | null;
     }>;
     /**
      * Adds a new, unique mnemonic to the database.
      * @param mnemonic The mnemonic to add, wrapped in a SecureString.
      * @param session Optional Mongoose session for transaction support.
      */
-    addMnemonic(mnemonic: SecureString, session?: ClientSession): Promise<IMnemonicDocument | null>;
+    addMnemonic(mnemonic: SecureString, session?: ClientSession): Promise<IMnemonicDocument<I> | null>;
     /**
      * Retrieves a mnemonic document by ID.
      * @param mnemonicId The ID of the mnemonic document.
      * @param session Optional Mongoose session for transaction support.
      */
-    getMnemonicDocument(mnemonicId: string, session?: ClientSession): Promise<IMnemonicDocument | null>;
+    getMnemonicDocument(mnemonicId: I, session?: ClientSession): Promise<IMnemonicDocument<I> | null>;
     /**
      * Decrypts a mnemonic from a document using the service's master encryption key.
      * @param doc The mnemonic document.
@@ -56,6 +56,6 @@ export declare class MnemonicService {
      * @param mnemonicId The ID of the mnemonic document.
      * @param session Optional Mongoose session for transaction support.
      */
-    deleteMnemonicDocument(mnemonicId: string, session?: ClientSession): Promise<void>;
+    deleteMnemonicDocument(mnemonicId: I, session?: ClientSession): Promise<void>;
 }
 //# sourceMappingURL=mnemonic.d.ts.map

package/src/services/mnemonic.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mnemonic.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/mnemonic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAMxE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;~~AAChD~~,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;;GAGG;AACH,qBAAa,eAAe;~~IAC1B~~,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa,~~CAA2B~~;~~IACzD~~,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;gBAGrC,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,~~EACvC~~,UAAU,EAAE,YAAY,EACxB,SAAS,EAAE,UAAU;IAQvB;;OAEG;IACI,OAAO,IAAI,IAAI;IAItB;;;OAGG;IACI,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM;IAOtD;;;;OAIG;IACU,cAAc,CACzB,QAAQ,EAAE,YAAY,EACtB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,OAAO,CAAC;IAQnB;;;;;OAKG;IACU,uBAAuB,CAClC,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,YAAY,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC;QACT,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAC;~~KACpC~~,CAAC;IA2BF;;;;OAIG;IACU,WAAW,CACtB,QAAQ,EAAE,YAAY,EACtB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;~~IAsBpC~~;;;;OAIG;IACU,mBAAmB,CAC9B,UAAU,EAAE,~~MAAM~~,~~EAClB~~,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;~~IAMpC~~;;;OAGG;IAEH;;;;OAIG;IACU,sBAAsB,CACjC,UAAU,EAAE,~~MAAM~~,~~EAClB~~,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,IAAI,CAAC;CAKjB"}
1	+ {"version":3,"file":"mnemonic.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/mnemonic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAMxE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;;GAGG;AACH,qBAAa,eAAe,CAAC,CAAC,SAAS,MAAM,GAAG,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ;IAC7E,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA8B;IAC5D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;gBAGrC,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC1C,UAAU,EAAE,YAAY,EACxB,SAAS,EAAE,UAAU;IAQvB;;OAEG;IACI,OAAO,IAAI,IAAI;IAItB;;;OAGG;IACI,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM;IAOtD;;;;OAIG;IACU,cAAc,CACzB,QAAQ,EAAE,YAAY,EACtB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,OAAO,CAAC;IAQnB;;;;;OAKG;IACU,uBAAuB,CAClC,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,YAAY,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC;QACT,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;KACvC,CAAC;IA2BF;;;;OAIG;IACU,WAAW,CACtB,QAAQ,EAAE,YAAY,EACtB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAsBvC;;;;OAIG;IACU,mBAAmB,CAC9B,UAAU,EAAE,CAAC,EACb,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAMvC;;;OAGG;IAEH;;;;OAIG;IACU,sBAAsB,CACjC,UAAU,EAAE,CAAC,EACb,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,IAAI,CAAC;CAKjB"}

package/src/services/mnemonic.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mnemonic.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/mnemonic.ts"],"names":[],"mappings":";;;AACA,oEAGyC;AACzC,mCAAoC;AAKpC;;;GAGG;AACH,MAAa,eAAe;IACT,UAAU,CAAe;IACzB,aAAa,~~CAA2B~~;~~IACxC~~,SAAS,CAAa;IAEvC,YACE,~~aAAuC~~,~~EACvC~~,UAAwB,EACxB,SAAqB;QAErB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,gDAAgD;QAChD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED;;OAEG;IACI,OAAO;QACZ,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACI,eAAe,CAAC,QAAsB;QAC3C,yCAAyC;QACzC,OAAO,IAAA,mBAAU,EAAC,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;aAC/C,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,qCAAqC;aACxE,MAAM,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,cAAc,CACzB,QAAsB,EACtB,OAAuB;QAEvB,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CACrE,OAAO,IAAI,IAAI,CAChB,CAAC;QACF,OAAO,KAAK,GAAG,CAAC,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,uBAAuB,CAClC,QAAsB,EACtB,SAAuB,EACvB,OAAuB;QAIvB,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1E,MAAM,IAAI,uCAAsB,CAC9B,mCAAkB,CAAC,wBAAwB,CAC5C,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YACjD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAC9C;gBACE;oBACE,IAAI,EAAE,IAAI;iBACX;aACF,EACD,EAAE,OAAO,EAAE,CACZ,CAAC;YACF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QAC9B,CAAC;gBAAS,CAAC;YACT,qBAAqB;QACvB,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,WAAW,CACtB,QAAsB,EACtB,OAAuB;QAEvB,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1E,MAAM,IAAI,uCAAsB,CAC9B,mCAAkB,CAAC,wBAAwB,CAC5C,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAC9C;YACE;gBACE,IAAI,EAAE,IAAI;aACX;SACF,EACD,EAAE,OAAO,EAAE,CACZ,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,mBAAmB,CAC9B,~~UAAkB~~,~~EAClB~~,OAAuB;QAEvB,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,CAC1D,OAAO,IAAI,IAAI,CAChB,CAAC;IACJ,CAAC;IAED;;;OAGG;IAEH;;;;OAIG;IACI,KAAK,CAAC,sBAAsB,CACjC,~~UAAkB~~,~~EAClB~~,OAAuB;QAEvB,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,OAAO,CAC5D,OAAO,IAAI,IAAI,CAChB,CAAC;IACJ,CAAC;CACF;AAvJD,0CAuJC"}
1	+ {"version":3,"file":"mnemonic.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/mnemonic.ts"],"names":[],"mappings":"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"}

package/src/services/request-user.d.ts CHANGED Viewed

@@ -1,20 +1,23 @@
 import { IRequestUserDTO, ITokenRole } from '@digitaldefiance/suite-core-lib';
+import { Types } from 'mongoose';
 import { IUserDocument } from '../documents';
 import { IRequestUserBackendObject } from '../interfaces/backend-objects/request-user';
-export declare class RequestUserService<I, TTokenRole extends ITokenRole<I>> {
+export declare class RequestUserService<I extends string | Types.ObjectId, TTokenRole extends ITokenRole<I>> {
     /**
      * Given a user document and an array of role documents, create the IRequestUser
      * @param userDoc
      * @returns
      */
-    static makeRequestUserDTO<I, TTokenRole extends ITokenRole<I>, TRequestUserDTO extends IRequestUserDTO>(userDoc: IUserDocument, roles: TTokenRole[]): TRequestUserDTO;
+    static makeRequestUserDTO<I extends string | Types.ObjectId, S extends string, TTokenRole extends ITokenRole<I>, TRequestUserDTO extends IRequestUserDTO>(userDoc: IUserDocument<S, I> | (Pick<IUserDocument<S, I>, keyof IUserDocument<S, I>> & {
+        _id: any;
+    }), roles: TTokenRole[]): TRequestUserDTO;
     /**
      * Given a request user, reconstitute dates, objectids, and enums
      * @param requestUser a RequestUser DTO
      * @returns An IRequestUserBackendObject
      */
-    static hydrateRequestUser<S extends string, TRequestUserDTO extends IRequestUserDTO & {
+    static hydrateRequestUser<I extends string | Types.ObjectId, S extends string, TRequestUserDTO extends IRequestUserDTO & {
         siteLanguage: S;
-    }>(requestUser: TRequestUserDTO): IRequestUserBackendObject<S>;
+    }>(requestUser: TRequestUserDTO, idConverter?: (id: string) => I): IRequestUserBackendObject<S, I>;
 }
 //# sourceMappingURL=request-user.d.ts.map

package/src/services/request-user.d.ts.map CHANGED Viewed

	@@ -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;~~IA6B/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;~~CAyB9D~~"}
1	+ {"version":3,"file":"request-user.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/request-user.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,UAAU,EACX,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AAIvF,qBAAa,kBAAkB,CAC7B,CAAC,SAAS,MAAM,GAAG,KAAK,CAAC,QAAQ,EACjC,UAAU,SAAS,UAAU,CAAC,CAAC,CAAC;IAEhC;;;;OAIG;WACW,kBAAkB,CAC9B,CAAC,SAAS,MAAM,GAAG,KAAK,CAAC,QAAQ,EACjC,CAAC,SAAS,MAAM,EAChB,UAAU,SAAS,UAAU,CAAC,CAAC,CAAC,EAChC,eAAe,SAAS,eAAe,EAEvC,OAAO,EACH,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,GACnB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG;QAAE,GAAG,EAAE,GAAG,CAAA;KAAE,CAAC,EACzE,KAAK,EAAE,UAAU,EAAE,GAClB,eAAe;IA6BlB;;;;OAIG;WACW,kBAAkB,CAC9B,CAAC,SAAS,MAAM,GAAG,KAAK,CAAC,QAAQ,EACjC,CAAC,SAAS,MAAM,EAChB,eAAe,SAAS,eAAe,GAAG;QAAE,YAAY,EAAE,CAAC,CAAA;KAAE,EAE7D,WAAW,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,CAAC,GAC9B,yBAAyB,CAAC,CAAC,EAAE,CAAC,CAAC;CA2BnC"}

package/src/services/request-user.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestUserService = void 0;
-const mongoose_1 = require("mongoose");
+const id_converters_1 = require("../types/id-converters");
 const role_1 = require("./role");
 class RequestUserService {
     /**
@@ -40,10 +40,11 @@ class RequestUserService {
      * @param requestUser a RequestUser DTO
      * @returns An IRequestUserBackendObject
      */
-    static hydrateRequestUser(requestUser) {
-        const hydratedRoles = requestUser.roles.map((role) => role_1.RoleService.hydrateRoleDTOToBackend(role));
+    static hydrateRequestUser(requestUser, idConverter) {
+        const convert = idConverter ?? ((id) => (0, id_converters_1.convertStringToGenericId)(id));
+        const hydratedRoles = requestUser.roles.map((role) => role_1.RoleService.hydrateRoleDTOToBackend(role, convert));
         const hydratedUser = {
-            id: new mongoose_1.Types.ObjectId(requestUser.id),
+            id: convert(requestUser.id),
             email: requestUser.email,
             roles: hydratedRoles,
             rolePrivileges: requestUser.rolePrivileges,

package/src/services/request-user.js.map CHANGED Viewed

	@@ -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;QAED,sDAAsD;QACtD,MAAM,cAAc,GAAG;YACrB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YACjC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YACnC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YACjC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;SACpC,CAAC;QAEF,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,cAAc;YACd,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,cAAc,EAAE,WAAW,CAAC,cAAc;YAC1C,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,eAAe,EAAE,WAAW,CAAC,eAAe;YAC5C,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;~~AAxED~~,~~gDAwEC~~"}
1	+ {"version":3,"file":"request-user.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/request-user.ts"],"names":[],"mappings":";;;AAQA,0DAAkE;AAClE,iCAAqC;AAErC,MAAa,kBAAkB;IAI7B;;;;OAIG;IACI,MAAM,CAAC,kBAAkB,CAM9B,OAEyE,EACzE,KAAmB;QAEnB,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QAED,sDAAsD;QACtD,MAAM,cAAc,GAAG;YACrB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YACjC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YACnC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YACjC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;SACpC,CAAC;QAEF,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,cAAc;YACd,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,CAK9B,WAA4B,EAC5B,WAA+B;QAE/B,MAAM,OAAO,GACX,WAAW,IAAI,CAAC,CAAC,EAAU,EAAE,EAAE,CAAC,IAAA,wCAAwB,EAAI,EAAE,CAAC,CAAC,CAAC;QACnE,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAc,EAAE,EAAE,CAC7D,kBAAW,CAAC,uBAAuB,CAAI,IAAI,EAAE,OAAO,CAAC,CACtD,CAAC;QAEF,MAAM,YAAY,GAAoC;YACpD,EAAE,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC3B,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,KAAK,EAAE,aAAa;YACpB,cAAc,EAAE,WAAW,CAAC,cAAc;YAC1C,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,eAAe,EAAE,WAAW,CAAC,eAAe;YAC5C,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;AAvFD,gDAuFC"}

package/src/services/role.d.ts CHANGED Viewed

@@ -10,32 +10,32 @@ import { BaseService } from './base';
 /**
  * Service for managing roles
  */
-export declare class RoleService<I = Types.ObjectId, D extends Date = Date, TTokenRole extends ITokenRole<I, D> = ITokenRole<I, D>> extends BaseService {
+export declare class RoleService<I extends string | Types.ObjectId = Types.ObjectId, D extends Date = Date, TTokenRole extends ITokenRole<I, D> = ITokenRole<I, D>> extends BaseService {
     /**
      * Constructor for the role service
      * @param application The application object
      */
     constructor(application: IApplication);
-    static roleToRoleDTO<I = Types.ObjectId, D extends Date = Date>(role: ITokenRole<I, D> | IRoleDocument | Partial<IRoleBase<I>>): ITokenRoleDTO;
+    static roleToRoleDTO<I extends string | Types.ObjectId = Types.ObjectId, D extends Date = Date>(role: ITokenRole<I, D> | IRoleDocument<I> | Partial<IRoleBase<I>>): ITokenRoleDTO;
     /**
      * Given a Role DTO, reconstitute ids and dates
      * @param role The Role DTO
      * @returns An IRoleBackendObject
      */
-    static hydrateRoleDTOToBackend(role: ITokenRoleDTO): IRoleBackendObject;
+    static hydrateRoleDTOToBackend<I extends string | Types.ObjectId = Types.ObjectId>(role: ITokenRoleDTO, idConverter?: (id: string) => I): IRoleBackendObject<I>;
     /**
      * Gets the role ID by name
      * @param roleName The name of the role
      * @returns The role ID or null if not found
      */
-    getRoleIdByName(roleName: Role, session?: ClientSession): Promise<Types.ObjectId | null>;
+    getRoleIdByName(roleName: Role, session?: ClientSession): Promise<I | null>;
     /**
      * Creates a new role
      * @param roleData The role data
      * @param session Optional mongoose session
      * @returns The created role document
      */
-    createRole(roleData: IRoleBase<Types.ObjectId, Date, Role>, session?: ClientSession | null): Promise<IRoleDocument>;
+    createRole(roleData: IRoleBase<I, D, Role>, session?: ClientSession | null): Promise<IRoleDocument<I>>;
     /**
      * Adds a user to a role
      * @param roleId - The role id
@@ -43,7 +43,7 @@ export declare class RoleService<I = Types.ObjectId, D extends Date = Date, TTok
      * @param createdBy - The user creating the relationship
      * @param session Optional mongoose session
      */
-    addUserToRole(roleId: Types.ObjectId, userId: Types.ObjectId, createdBy: Types.ObjectId, session?: ClientSession, overrideId?: Types.ObjectId): Promise<IUserRoleDocument>;
+    addUserToRole(roleId: I, userId: I, createdBy: I, session?: ClientSession, overrideId?: I): Promise<IUserRoleDocument<I>>;
     /**
      * Removes a user from a role
      * @param roleId - The role id
@@ -52,7 +52,7 @@ export declare class RoleService<I = Types.ObjectId, D extends Date = Date, TTok
      * @param session Optional mongoose session
      * @throws LastAdminError if attempting to remove the last admin
      */
-    removeUserFromRole(roleId: Types.ObjectId, userId: Types.ObjectId, deletedBy: Types.ObjectId, session?: ClientSession): Promise<void>;
+    removeUserFromRole(roleId: I, userId: I, deletedBy: I, session?: ClientSession): Promise<void>;
     /**
      * Deletes a role by ID
      * @param roleId The role ID
@@ -60,27 +60,27 @@ export declare class RoleService<I = Types.ObjectId, D extends Date = Date, TTok
      * @param hardDelete Whether to hard delete the role
      * @param session Optional mongoose session
      */
-    deleteRole(roleId: Types.ObjectId, deleter: Types.ObjectId, hardDelete: boolean, session?: ClientSession): Promise<void>;
+    deleteRole(roleId: I, deleter: I, hardDelete: boolean, session?: ClientSession): Promise<void>;
     /**
      * Gets all roles for a user
      * @param userId The user ID
      * @param session Optional mongoose session
      * @returns The roles the user is a member of
      */
-    getUserRoles(userId: Types.ObjectId, session?: ClientSession): Promise<IRoleDocument[]>;
+    getUserRoles(userId: I, session?: ClientSession): Promise<IRoleDocument<I>[]>;
     /**
      * Gets all users for a role
      * @param roleId The role ID
      * @param session Optional mongoose session
      * @returns The user IDs that are members of the role
      */
-    getRoleUsers(roleId: Types.ObjectId, session?: ClientSession): Promise<Types.ObjectId[]>;
+    getRoleUsers(roleId: I, session?: ClientSession): Promise<I[]>;
     /** Convert roles to translated TokenRoles */
-    rolesToTokenRoles(roles: Array<IRoleBackendObject>, overrideLanguage?: string): Array<TTokenRole>;
-    isUserAdmin(userDoc: IUserDocument, session?: ClientSession, providedRoles?: Array<IRoleDocument>): Promise<boolean>;
-    isUserMember(userDoc: IUserDocument, session?: ClientSession, providedRoles?: Array<IRoleDocument>): Promise<boolean>;
-    isUserChild(userDoc: IUserDocument, session?: ClientSession, providedRoles?: Array<IRoleDocument>): Promise<boolean>;
-    isSystemUser(userDoc: IUserDocument, session?: ClientSession, providedRoles?: Array<IRoleDocument>): Promise<boolean>;
-    getMemberType(userDoc: IUserDocument, session?: ClientSession, providedRoles?: Array<IRoleDocument>): Promise<MemberType>;
+    rolesToTokenRoles(roles: Array<IRoleBackendObject<I>>, overrideLanguage?: string): Array<TTokenRole>;
+    isUserAdmin(userDoc: IUserDocument<string, I>, session?: ClientSession, providedRoles?: Array<IRoleDocument<I>>): Promise<boolean>;
+    isUserMember(userDoc: IUserDocument<string, I>, session?: ClientSession, providedRoles?: Array<IRoleDocument<I>>): Promise<boolean>;
+    isUserChild(userDoc: IUserDocument<string, I>, session?: ClientSession, providedRoles?: Array<IRoleDocument<I>>): Promise<boolean>;
+    isSystemUser(userDoc: IUserDocument<string, I>, session?: ClientSession, providedRoles?: Array<IRoleDocument<I>>): Promise<boolean>;
+    getMemberType(userDoc: IUserDocument<string, I>, session?: ClientSession, providedRoles?: Array<IRoleDocument<I>>): Promise<MemberType>;
 }
 //# sourceMappingURL=role.d.ts.map

package/src/services/role.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/role.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAMxD,OAAO,EACL,SAAS,EAET,UAAU,EACV,aAAa,~~EAGb~~,IAAI,EACL,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,aAAa,EAAY,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,~~EAAiB~~,aAAa,EAAE,MAAM,cAAc,CAAC;~~AAC5D~~,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;~~AAI3D~~,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;~~AAGxE~~,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAErC;;GAEG;AACH,qBAAa,WAAW,CACtB,CAAC,GAAG,KAAK,CAAC,QAAQ,~~EAClB~~,CAAC,SAAS,IAAI,GAAG,IAAI,EACrB,UAAU,SAAS,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CACtD,SAAQ,WAAW;IACnB;;;OAGG;~~gBAED~~,WAAW,EAAE,YAAY;~~WAKb~~,aAAa,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,~~EAAE~~,CAAC,SAAS,IAAI,GAAG,IAAI,~~EACnE~~,IAAI,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,~~GAC7D~~,aAAa;IA0ChB;;;;OAIG;WACW,uBAAuB,CACnC,IAAI,EAAE,aAAa,~~GAClB~~,kBAAkB;~~IAoBrB~~;;;;OAIG;IACU,eAAe,CAC1B,QAAQ,EAAE,IAAI,EACd,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,~~KAAK,~~CAAC,~~QAAQ,~~GAAG,IAAI,CAAC;~~IAcjC~~;;;;;OAKG;IACU,UAAU,CACrB,QAAQ,EAAE,SAAS,CAAC,~~KAAK,~~CAAC,~~QAAQ,~~EAAE,~~IAAI~~,EAAE,IAAI,CAAC,EAC/C,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,GAC7B,OAAO,CAAC,aAAa,CAAC;~~IAUzB~~;;;;;;OAMG;IACU,aAAa,CACxB,MAAM,EAAE,~~KAAK,~~CAAC,~~QAAQ~~,~~EACtB,~~MAAM,EAAE,~~KAAK,~~CAAC,~~QAAQ~~,~~EACtB,~~SAAS,EAAE,~~KAAK,~~CAAC,~~QAAQ~~,~~EACzB,~~OAAO,CAAC,EAAE,aAAa,EACvB,UAAU,CAAC,EAAE,~~KAAK,~~CAAC,~~QAAQ~~,~~GAC1B,~~OAAO,CAAC,iBAAiB,CAAC;~~IA6B7B~~;;;;;;;OAOG;IACU,kBAAkB,CAC7B,MAAM,EAAE,~~KAAK,~~CAAC,~~QAAQ~~,~~EACtB,~~MAAM,EAAE,~~KAAK,~~CAAC,~~QAAQ~~,~~EACtB,~~SAAS,EAAE,~~KAAK,~~CAAC,~~QAAQ~~,~~EACzB,~~OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,IAAI,CAAC;~~IA4BhB~~;;;;;;OAMG;IACU,UAAU,CACrB,MAAM,EAAE,~~KAAK,~~CAAC,~~QAAQ~~,~~EACtB,~~OAAO,EAAE,~~KAAK,~~CAAC,~~QAAQ~~,~~EACvB,~~UAAU,EAAE,OAAO,EACnB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,IAAI,CAAC;~~IAehB~~;;;;;OAKG;IACU,YAAY,CACvB,MAAM,EAAE,~~KAAK,~~CAAC,~~QAAQ~~,~~EACtB,~~OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,aAAa,EAAE,CAAC;~~IA0B3B~~;;;;;OAKG;IACU,YAAY,~~CACvB~~,MAAM,EAAE,~~KAAK,~~CAAC,~~QAAQ~~,~~EACtB,~~OAAO,CAAC,EAAE,aAAa,~~GACtB~~,OAAO,CAAC,~~KAAK,~~CAAC,~~QAAQ,~~EAAE,CAAC;~~IAiB5B~~,6CAA6C;IACtC,iBAAiB,CACtB,KAAK,EAAE,KAAK,CAAC,kBAAkB,CAAC,~~EAChC~~,gBAAgB,CAAC,EAAE,MAAM,GACxB,KAAK,CAAC,UAAU,CAAC;IAkBP,WAAW,CACtB,OAAO,EAAE,aAAa,~~EACtB~~,OAAO,CAAC,EAAE,aAAa,EACvB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,~~GACnC~~,OAAO,CAAC,OAAO,CAAC;IASN,YAAY,CACvB,OAAO,EAAE,aAAa,~~EACtB~~,OAAO,CAAC,EAAE,aAAa,EACvB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,~~GACnC~~,OAAO,CAAC,OAAO,CAAC;IASN,WAAW,CACtB,OAAO,EAAE,aAAa,~~EACtB~~,OAAO,CAAC,EAAE,aAAa,EACvB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,~~GACnC~~,OAAO,CAAC,OAAO,CAAC;IASN,YAAY,CACvB,OAAO,EAAE,aAAa,~~EACtB~~,OAAO,CAAC,EAAE,aAAa,EACvB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,~~GACnC~~,OAAO,CAAC,OAAO,CAAC;IAMN,aAAa,CACxB,OAAO,EAAE,aAAa,~~EACtB~~,OAAO,CAAC,EAAE,aAAa,EACvB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,~~GACnC~~,OAAO,CAAC,UAAU,CAAC;CAavB"}
1	+ {"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/services/role.ts"],"names":[],"mappings":"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"}

package/src/services/role.js CHANGED Viewed

@@ -7,6 +7,7 @@ const suite_core_lib_1 = require("@digitaldefiance/suite-core-lib");
 const mongoose_1 = require("mongoose");
 const base_model_name_1 = require("../enumerations/base-model-name");
 const model_registry_1 = require("../model-registry");
+const id_converters_1 = require("../types/id-converters");
 const utils_1 = require("../utils");
 const base_1 = require("./base");
 /**
@@ -65,21 +66,22 @@ class RoleService extends base_1.BaseService {
      * @param role The Role DTO
      * @returns An IRoleBackendObject
      */
-    static hydrateRoleDTOToBackend(role) {
+    static hydrateRoleDTOToBackend(role, idConverter) {
+        const convert = idConverter ?? ((id) => (0, id_converters_1.convertStringToGenericId)(id));
         return {
             ...(0, utils_1.omit)(role, [
                 'translatedName',
             ]),
-            _id: new mongoose_1.Types.ObjectId(role._id),
+            _id: convert(role._id),
             name: role.name,
             createdAt: new Date(role.createdAt),
-            createdBy: new mongoose_1.Types.ObjectId(role.createdBy),
+            createdBy: convert(role.createdBy),
             updatedAt: new Date(role.updatedAt),
-            updatedBy: new mongoose_1.Types.ObjectId(role.updatedBy),
+            updatedBy: convert(role.updatedBy),
             ...(role.deletedAt ? { deletedAt: new Date(role.deletedAt) } : {}),
             ...(role.deletedBy
                 ? {
-                    deletedBy: new mongoose_1.Types.ObjectId(role.deletedBy),
+                    deletedBy: convert(role.deletedBy),
                 }
                 : {}),
         };
@@ -201,10 +203,10 @@ class RoleService extends base_1.BaseService {
             .select('roleId')
             .session(session ?? null);
         const roleIds = userRoles.map((ur) => ur.roleId);
-        return await RoleModel.find({
+        return (await RoleModel.find({
             _id: { $in: roleIds },
             deletedAt: { $exists: false },
-        }).session(session ?? null);
+        }).session(session ?? null));
     }
     /**
      * Gets all users for a role