@alanszp/express 15.0.0 → 15.0.4

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 (10) hide show
  1. package/dist/middlewares/auditLog.js +13 -5
  2. package/dist/middlewares/auditLog.js.map +1 -1
  3. package/dist/middlewares/authenticateUser.js +1 -0
  4. package/dist/middlewares/authenticateUser.js.map +1 -1
  5. package/dist/middlewares/hasPermissions.d.ts +3 -3
  6. package/dist/middlewares/hasPermissions.js +15 -12
  7. package/dist/middlewares/hasPermissions.js.map +1 -1
  8. package/dist/test/mocks/jwtUserMocks.js +2 -0
  9. package/dist/test/mocks/jwtUserMocks.js.map +1 -1
  10. package/package.json +5 -5
package/dist/middlewares/auditLog.js CHANGED
@@ -17,20 +17,28 @@ const getIp_1 = require("../helpers/getIp");
17
17
  function auditLog(action, bodyModifier) {
18
18
  return function writeAuditLogMiddleware(req, res, next) {
19
19
  res.on("finish", function writeAuditLog() {
20
- var _a, _b, _c;
20
+ var _a, _b, _c, _d, _e;
21
21
  return __awaiter(this, void 0, void 0, function* () {
22
22
  try {
23
23
  const audit = req.context.audit;
24
24
  const partialBody = bodyModifier
25
25
  ? yield Promise.resolve(bodyModifier(req, res))
26
26
  : {};
27
- if (req.context.jwtUser) {
28
- partialBody.orgRef = req.context.jwtUser.organizationReference;
29
- partialBody.actorRef = req.context.jwtUser.id;
27
+ const jwtUser = req.context.jwtUser;
28
+ if (jwtUser) {
29
+ partialBody.orgRef =
30
+ (_a = jwtUser.originalOrganizationReference) !== null && _a !== void 0 ? _a : jwtUser.organizationReference;
31
+ partialBody.impersonatedOrgRef = jwtUser.isImpersonating()
32
+ ? jwtUser.organizationReference
33
+ : undefined;
34
+ partialBody.actorRef = (_b = jwtUser.originalId) !== null && _b !== void 0 ? _b : jwtUser.id;
35
+ partialBody.impersonatedActorRef = jwtUser.isImpersonating()
36
+ ? jwtUser.id
37
+ : undefined;
30
38
  }
31
39
  partialBody.ip = (0, getIp_1.getIp)(req) || "no-ip";
32
40
  audit.log(Object.assign(Object.assign({ succeed: res.statusCode === 304 ||
33
- (res.statusCode >= 200 && res.statusCode < 300) }, partialBody), { lid: (_a = req.context.lifecycleId) !== null && _a !== void 0 ? _a : undefined, lch: (_b = req.context.lifecycleChain) !== null && _b !== void 0 ? _b : undefined, cid: (_c = req.context.contextId) !== null && _c !== void 0 ? _c : undefined, action }));
41
+ (res.statusCode >= 200 && res.statusCode < 300) }, partialBody), { lid: (_c = req.context.lifecycleId) !== null && _c !== void 0 ? _c : undefined, lch: (_d = req.context.lifecycleChain) !== null && _d !== void 0 ? _d : undefined, cid: (_e = req.context.contextId) !== null && _e !== void 0 ? _e : undefined, action }));
34
42
  }
35
43
  catch (error) {
36
44
  req.context.log.error("auditLog.writeLog.error", { action, error });
package/dist/middlewares/auditLog.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auditLog.js","sourceRoot":"","sources":["../../src/middlewares/auditLog.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,4CAAyC;AAQzC;;GAEG;AACH,SAAgB,QAAQ,CAAC,MAAc,EAAE,YAAgC;IACvE,OAAO,SAAS,uBAAuB,CACrC,GAAmB,EACnB,GAAa,EACb,IAAkB;QAElB,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAe,aAAa;;;gBAC3C,IAAI;oBACF,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;oBAEhC,MAAM,WAAW,GAAG,YAAY;wBAC9B,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;wBAC/C,CAAC,CAAE,EAAyB,CAAC;oBAE/B,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE;wBACvB,WAAW,CAAC,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC;wBAC/D,WAAW,CAAC,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;qBAC/C;oBAED,WAAW,CAAC,EAAE,GAAG,IAAA,aAAK,EAAC,GAAG,CAAC,IAAI,OAAO,CAAC;oBAEvC,KAAK,CAAC,GAAG,+BACP,OAAO,EACL,GAAG,CAAC,UAAU,KAAK,GAAG;4BACtB,CAAC,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,IAC9C,WAAW,KACd,GAAG,EAAE,MAAA,GAAG,CAAC,OAAO,CAAC,WAAW,mCAAI,SAAS,EACzC,GAAG,EAAE,MAAA,GAAG,CAAC,OAAO,CAAC,cAAc,mCAAI,SAAS,EAC5C,GAAG,EAAE,MAAA,GAAG,CAAC,OAAO,CAAC,SAAS,mCAAI,SAAS,EACvC,MAAM,IACN,CAAC;iBACJ;gBAAC,OAAO,KAAc,EAAE;oBACvB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;iBACrE;;SACF,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AAtCD,4BAsCC"}
1
+ {"version":3,"file":"auditLog.js","sourceRoot":"","sources":["../../src/middlewares/auditLog.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,4CAAyC;AAQzC;;GAEG;AACH,SAAgB,QAAQ,CAAC,MAAc,EAAE,YAAgC;IACvE,OAAO,SAAS,uBAAuB,CACrC,GAAmB,EACnB,GAAa,EACb,IAAkB;QAElB,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAe,aAAa;;;gBAC3C,IAAI;oBACF,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;oBAEhC,MAAM,WAAW,GAAG,YAAY;wBAC9B,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;wBAC/C,CAAC,CAAE,EAAyB,CAAC;oBAE/B,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC;oBACpC,IAAI,OAAO,EAAE;wBACX,WAAW,CAAC,MAAM;4BAChB,MAAA,OAAO,CAAC,6BAA6B,mCACrC,OAAO,CAAC,qBAAqB,CAAC;wBAChC,WAAW,CAAC,kBAAkB,GAAG,OAAO,CAAC,eAAe,EAAE;4BACxD,CAAC,CAAC,OAAO,CAAC,qBAAqB;4BAC/B,CAAC,CAAC,SAAS,CAAC;wBACd,WAAW,CAAC,QAAQ,GAAG,MAAA,OAAO,CAAC,UAAU,mCAAI,OAAO,CAAC,EAAE,CAAC;wBACxD,WAAW,CAAC,oBAAoB,GAAG,OAAO,CAAC,eAAe,EAAE;4BAC1D,CAAC,CAAC,OAAO,CAAC,EAAE;4BACZ,CAAC,CAAC,SAAS,CAAC;qBACf;oBAED,WAAW,CAAC,EAAE,GAAG,IAAA,aAAK,EAAC,GAAG,CAAC,IAAI,OAAO,CAAC;oBAEvC,KAAK,CAAC,GAAG,+BACP,OAAO,EACL,GAAG,CAAC,UAAU,KAAK,GAAG;4BACtB,CAAC,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,IAC9C,WAAW,KACd,GAAG,EAAE,MAAA,GAAG,CAAC,OAAO,CAAC,WAAW,mCAAI,SAAS,EACzC,GAAG,EAAE,MAAA,GAAG,CAAC,OAAO,CAAC,cAAc,mCAAI,SAAS,EAC5C,GAAG,EAAE,MAAA,GAAG,CAAC,OAAO,CAAC,SAAS,mCAAI,SAAS,EACvC,MAAM,IACN,CAAC;iBACJ;gBAAC,OAAO,KAAc,EAAE;oBACvB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;iBACrE;;SACF,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AA/CD,4BA+CC"}
package/dist/middlewares/authenticateUser.js CHANGED
@@ -59,6 +59,7 @@ const middlewareGetterByAuthType = {
59
59
  employeeReference: "0",
60
60
  organizationReference: "lara",
61
61
  roles: [],
62
+ roleReferences: [],
62
63
  segmentReference: null,
63
64
  // This will be changed in the near future to grab all permissions.
64
65
  permissions: "MA==", // 0 in base64
package/dist/middlewares/authenticateUser.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"authenticateUser.js","sourceRoot":"","sources":["../../src/middlewares/authenticateUser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"authenticateUser.js","sourceRoot":"","sources":["../../src/middlewares/authenticateUser.ts"],"names":[],"mappings":"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"}
package/dist/middlewares/hasPermissions.d.ts CHANGED
@@ -5,16 +5,16 @@ import { GenericRequest } from "../types/GenericRequest";
5
5
  * If not, check if the jwtUser has the required roles (to maintain backwards compatibility)
6
6
  * When neither permissions nor roles requirements are met, throw a NoPermissionError
7
7
  */
8
- export declare function hasPermission(permission: string, oldRoleCodes?: string | string[]): (req: GenericRequest, res: Response, next: NextFunction) => Promise<void>;
8
+ export declare function hasPermission(permission: string): (req: GenericRequest, res: Response, next: NextFunction) => Promise<void>;
9
9
  /**
10
10
  * Check if the jwtUser has at least one permission
11
11
  * If not, check if the jwtUser has the required roles (to maintain backwards compatibility)
12
12
  * When neither permissions nor roles requirements are met, throw a NoPermissionError
13
13
  */
14
- export declare function hasSomePermission(permissions: string[], oldRoleCodes?: string | string[]): (req: GenericRequest, res: Response, next: NextFunction) => Promise<void>;
14
+ export declare function hasSomePermission(permissions: string[]): (req: GenericRequest, res: Response, next: NextFunction) => Promise<void>;
15
15
  /**
16
16
  * Check if the jwtUser has all permissions
17
17
  * If not, check if the jwtUser has the required roles (to maintain backwards compatibility)
18
18
  * When neither permissions nor roles requirements are met, throw a NoPermissionError
19
19
  */
20
- export declare function hasEveryPermission(permissions: string[], oldRoleCodes?: string | string[]): (req: GenericRequest, res: Response, next: NextFunction) => Promise<void>;
20
+ export declare function hasEveryPermission(permissions: string[]): (req: GenericRequest, res: Response, next: NextFunction) => Promise<void>;
package/dist/middlewares/hasPermissions.js CHANGED
@@ -20,20 +20,21 @@ function response401(res) {
20
20
  * If not, check if the jwtUser has the required roles (to maintain backwards compatibility)
21
21
  * When neither permissions nor roles requirements are met, throw a NoPermissionError
22
22
  */
23
- function hasPermission(permission, oldRoleCodes) {
23
+ function hasPermission(permission) {
24
24
  return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
25
25
  try {
26
26
  const { jwtUser } = req.context;
27
27
  if (!jwtUser) {
28
28
  return response401(res);
29
29
  }
30
+ // TODO: Remove when we have service accounts, SA will have it's own permissions so this will not be needed.
31
+ if (jwtUser.isServiceAccount()) {
32
+ return (0, hasRoles_1.hasRoles)(["admin"])(req, res, next);
33
+ }
30
34
  yield jwtUser.validatePermission(permission);
31
35
  next();
32
36
  }
33
37
  catch (error) {
34
- if (oldRoleCodes) {
35
- return (0, hasRoles_1.hasRoles)(oldRoleCodes)(req, res, next);
36
- }
37
38
  next(error);
38
39
  }
39
40
  });
@@ -44,20 +45,21 @@ exports.hasPermission = hasPermission;
44
45
  * If not, check if the jwtUser has the required roles (to maintain backwards compatibility)
45
46
  * When neither permissions nor roles requirements are met, throw a NoPermissionError
46
47
  */
47
- function hasSomePermission(permissions, oldRoleCodes) {
48
+ function hasSomePermission(permissions) {
48
49
  return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
49
50
  try {
50
51
  const { jwtUser } = req.context;
51
52
  if (!jwtUser) {
52
53
  return response401(res);
53
54
  }
55
+ // TODO: Remove when we have service accounts, SA will have it's own permissions so this will not be needed.
56
+ if (jwtUser.isServiceAccount()) {
57
+ return (0, hasRoles_1.hasRoles)(["admin"])(req, res, next);
58
+ }
54
59
  yield jwtUser.validateSomePermission(permissions);
55
60
  next();
56
61
  }
57
62
  catch (error) {
58
- if (oldRoleCodes) {
59
- return (0, hasRoles_1.hasRoles)(oldRoleCodes)(req, res, next);
60
- }
61
63
  next(error);
62
64
  }
63
65
  });
@@ -68,20 +70,21 @@ exports.hasSomePermission = hasSomePermission;
68
70
  * If not, check if the jwtUser has the required roles (to maintain backwards compatibility)
69
71
  * When neither permissions nor roles requirements are met, throw a NoPermissionError
70
72
  */
71
- function hasEveryPermission(permissions, oldRoleCodes) {
73
+ function hasEveryPermission(permissions) {
72
74
  return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
73
75
  try {
74
76
  const { jwtUser } = req.context;
75
77
  if (!jwtUser) {
76
78
  return response401(res);
77
79
  }
80
+ // TODO: Remove when we have service accounts, SA will have it's own permissions so this will not be needed.
81
+ if (jwtUser.isServiceAccount()) {
82
+ return (0, hasRoles_1.hasRoles)(["admin"])(req, res, next);
83
+ }
78
84
  yield jwtUser.validateEveryPermission(permissions);
79
85
  next();
80
86
  }
81
87
  catch (error) {
82
- if (oldRoleCodes) {
83
- return (0, hasRoles_1.hasRoles)(oldRoleCodes)(req, res, next);
84
- }
85
88
  next(error);
86
89
  }
87
90
  });
package/dist/middlewares/hasPermissions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"hasPermissions.js","sourceRoot":"","sources":["../../src/middlewares/hasPermissions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,yCAAsC;AACtC,gEAA4E;AAE5E,SAAS,WAAW,CAAC,GAAa;IAChC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,gCAAc,EAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAED;;;;GAIG;AACH,SAAgB,aAAa,CAC3B,UAAkB,EAClB,YAAgC;IAEhC,OAAO,CAAO,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACtE,IAAI;YACF,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YAChC,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;aACzB;YAED,MAAM,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;YAC7C,IAAI,EAAE,CAAC;SACR;QAAC,OAAO,KAAc,EAAE;YACvB,IAAI,YAAY,EAAE;gBAChB,OAAO,IAAA,mBAAQ,EAAC,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aAC/C;YACD,IAAI,CAAC,KAAK,CAAC,CAAC;SACb;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AApBD,sCAoBC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAC/B,WAAqB,EACrB,YAAgC;IAEhC,OAAO,CAAO,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACtE,IAAI;YACF,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YAChC,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;aACzB;YAED,MAAM,OAAO,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;YAClD,IAAI,EAAE,CAAC;SACR;QAAC,OAAO,KAAc,EAAE;YACvB,IAAI,YAAY,EAAE;gBAChB,OAAO,IAAA,mBAAQ,EAAC,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aAC/C;YACD,IAAI,CAAC,KAAK,CAAC,CAAC;SACb;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AApBD,8CAoBC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAChC,WAAqB,EACrB,YAAgC;IAEhC,OAAO,CAAO,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACtE,IAAI;YACF,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YAChC,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;aACzB;YAED,MAAM,OAAO,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;YACnD,IAAI,EAAE,CAAC;SACR;QAAC,OAAO,KAAc,EAAE;YACvB,IAAI,YAAY,EAAE;gBAChB,OAAO,IAAA,mBAAQ,EAAC,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aAC/C;YACD,IAAI,CAAC,KAAK,CAAC,CAAC;SACb;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AApBD,gDAoBC"}
1
+ {"version":3,"file":"hasPermissions.js","sourceRoot":"","sources":["../../src/middlewares/hasPermissions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,yCAAsC;AACtC,gEAA4D;AAE5D,SAAS,WAAW,CAAC,GAAa;IAChC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,gCAAc,EAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAED;;;;GAIG;AACH,SAAgB,aAAa,CAAC,UAAkB;IAC9C,OAAO,CAAO,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACtE,IAAI;YACF,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YAChC,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;aACzB;YAED,4GAA4G;YAC5G,IAAI,OAAO,CAAC,gBAAgB,EAAE,EAAE;gBAC9B,OAAO,IAAA,mBAAQ,EAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aAC5C;YAED,MAAM,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;YAC7C,IAAI,EAAE,CAAC;SACR;QAAC,OAAO,KAAc,EAAE;YACvB,IAAI,CAAC,KAAK,CAAC,CAAC;SACb;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AAnBD,sCAmBC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,WAAqB;IACrD,OAAO,CAAO,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACtE,IAAI;YACF,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YAChC,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;aACzB;YAED,4GAA4G;YAC5G,IAAI,OAAO,CAAC,gBAAgB,EAAE,EAAE;gBAC9B,OAAO,IAAA,mBAAQ,EAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aAC5C;YAED,MAAM,OAAO,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;YAClD,IAAI,EAAE,CAAC;SACR;QAAC,OAAO,KAAc,EAAE;YACvB,IAAI,CAAC,KAAK,CAAC,CAAC;SACb;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AAnBD,8CAmBC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,WAAqB;IACtD,OAAO,CAAO,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACtE,IAAI;YACF,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YAChC,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;aACzB;YAED,4GAA4G;YAC5G,IAAI,OAAO,CAAC,gBAAgB,EAAE,EAAE;gBAC9B,OAAO,IAAA,mBAAQ,EAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aAC5C;YAED,MAAM,OAAO,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;YACnD,IAAI,EAAE,CAAC;SACR;QAAC,OAAO,KAAc,EAAE;YACvB,IAAI,CAAC,KAAK,CAAC,CAAC;SACb;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AAnBD,gDAmBC"}
package/dist/test/mocks/jwtUserMocks.js CHANGED
@@ -7,6 +7,7 @@ exports.userJwtUserMock = new jwt_1.JWTUser({
7
7
  employeeReference: "1",
8
8
  organizationReference: "test",
9
9
  roles: [],
10
+ roleReferences: [],
10
11
  permissions: "MA==",
11
12
  segmentReference: null,
12
13
  });
@@ -15,6 +16,7 @@ exports.laraJwtUserMock = new jwt_1.JWTUser({
15
16
  employeeReference: "0",
16
17
  organizationReference: "lara",
17
18
  roles: [],
19
+ roleReferences: [],
18
20
  permissions: "MA==",
19
21
  segmentReference: null,
20
22
  });
package/dist/test/mocks/jwtUserMocks.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jwtUserMocks.js","sourceRoot":"","sources":["../../../src/test/mocks/jwtUserMocks.ts"],"names":[],"mappings":";;;AAAA,sCAAuC;AAE1B,QAAA,eAAe,GAAY,IAAI,aAAO,CAAC;IAClD,EAAE,EAAE,GAAG;IACP,iBAAiB,EAAE,GAAG;IACtB,qBAAqB,EAAE,MAAM;IAC7B,KAAK,EAAE,EAAE;IACT,WAAW,EAAE,MAAM;IACnB,gBAAgB,EAAE,IAAI;CACvB,CAAC,CAAC;AAEU,QAAA,eAAe,GAAY,IAAI,aAAO,CAAC;IAClD,EAAE,EAAE,GAAG;IACP,iBAAiB,EAAE,GAAG;IACtB,qBAAqB,EAAE,MAAM;IAC7B,KAAK,EAAE,EAAE;IACT,WAAW,EAAE,MAAM;IACnB,gBAAgB,EAAE,IAAI;CACvB,CAAC,CAAC"}
1
+ {"version":3,"file":"jwtUserMocks.js","sourceRoot":"","sources":["../../../src/test/mocks/jwtUserMocks.ts"],"names":[],"mappings":";;;AAAA,sCAAuC;AAE1B,QAAA,eAAe,GAAY,IAAI,aAAO,CAAC;IAClD,EAAE,EAAE,GAAG;IACP,iBAAiB,EAAE,GAAG;IACtB,qBAAqB,EAAE,MAAM;IAC7B,KAAK,EAAE,EAAE;IACT,cAAc,EAAE,EAAE;IAClB,WAAW,EAAE,MAAM;IACnB,gBAAgB,EAAE,IAAI;CACvB,CAAC,CAAC;AAEU,QAAA,eAAe,GAAY,IAAI,aAAO,CAAC;IAClD,EAAE,EAAE,GAAG;IACP,iBAAiB,EAAE,GAAG;IACtB,qBAAqB,EAAE,MAAM;IAC7B,KAAK,EAAE,EAAE;IACT,cAAc,EAAE,EAAE;IAClB,WAAW,EAAE,MAAM;IACnB,gBAAgB,EAAE,IAAI;CACvB,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alanszp/express",
3
- "version": "15.0.0",
3
+ "version": "15.0.4",
4
4
  "description": "Alan's express utils and middlewares.",
5
5
  "main": "dist/index.js",
6
6
  "typings": "dist/index.d.ts",
@@ -38,14 +38,14 @@
38
38
  "typescript": "^4.3.4"
39
39
  },
40
40
  "dependencies": {
41
- "@alanszp/audit": "^15.0.0",
42
- "@alanszp/jwt": "^15.0.0",
41
+ "@alanszp/audit": "^15.0.4",
42
+ "@alanszp/jwt": "^15.0.4",
43
43
  "@alanszp/logger": "^15.0.0",
44
- "@alanszp/shared-context": "^15.0.0",
44
+ "@alanszp/shared-context": "^15.0.4",
45
45
  "@babel/core": "^7.23.9",
46
46
  "@paralleldrive/cuid2": "^2.2.2",
47
47
  "body-parser": "^1.20.2",
48
48
  "lodash": "^4.17.21"
49
49
  },
50
- "gitHead": "d234963ab6a9cf53a1a9602f1a0c8052eb68d2c4"
50
+ "gitHead": "21554c6285f8c1f6d4aea93d4f9253033d7bf385"
51
51
  }