@alanszp/express 3.0.1 → 4.0.2

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.
@@ -0,0 +1,2 @@
1
+ import { Request } from "express";
2
+ export declare function getIp(req: Request): string | string[] | undefined;
@@ -0,0 +1,9 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getIp = void 0;
4
+ function getIp(req) {
5
+ var _a;
6
+ return req.headers["cf-connecting-ip"] || req.ip || ((_a = req.socket) === null || _a === void 0 ? void 0 : _a.remoteAddress);
7
+ }
8
+ exports.getIp = getIp;
9
+ //# sourceMappingURL=getIp.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getIp.js","sourceRoot":"","sources":["../../src/helpers/getIp.ts"],"names":[],"mappings":";;;AAEA,SAAgB,KAAK,CAAC,GAAY;;IAChC,OAAO,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC,EAAE,KAAI,MAAA,GAAG,CAAC,MAAM,0CAAE,aAAa,CAAA,CAAC;AAChF,CAAC;AAFD,sBAEC"}
@@ -2,10 +2,10 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.accessLogger = void 0;
4
4
  const logger_1 = require("@alanszp/logger");
5
+ const getIp_1 = require("../helpers/getIp");
5
6
  function accessLogger(req, res, next) {
6
7
  const startTime = process.hrtime.bigint();
7
8
  res.on("finish", () => {
8
- var _a;
9
9
  const endTime = process.hrtime.bigint();
10
10
  req.context.log.info("", {
11
11
  log_type: logger_1.LogType.ACCESS,
@@ -13,7 +13,7 @@ function accessLogger(req, res, next) {
13
13
  env: process.env.NODE_ENV,
14
14
  duration: (endTime - startTime).toString(),
15
15
  durationMs: ((endTime - startTime) / BigInt(1000000)).toString(),
16
- remoteAddress: req.headers["cf-connecting-ip"] || req.ip || ((_a = req.socket) === null || _a === void 0 ? void 0 : _a.remoteAddress),
16
+ remoteAddress: (0, getIp_1.getIp)(req),
17
17
  forwardedFor: req.headers["x-forwarded-for"],
18
18
  authentication: req.context.authenticated,
19
19
  statusCode: res.statusCode,
@@ -1 +1 @@
1
- {"version":3,"file":"accessLogger.js","sourceRoot":"","sources":["../../src/middlewares/accessLogger.ts"],"names":[],"mappings":";;;AACA,4CAA0C;AAE1C,SAAgB,YAAY,CAC1B,GAAY,EACZ,GAAa,EACb,IAAkB;IAElB,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAE1C,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;;QACpB,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACxC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE;YACvB,QAAQ,EAAE,gBAAO,CAAC,MAAM;YACxB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YACzB,QAAQ,EAAE,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE;YAC1C,UAAU,EAAE,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC,GAAG,MAAM,CAAC,OAAS,CAAC,CAAC,CAAC,QAAQ,EAAE;YAClE,aAAa,EACX,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC,EAAE,KAAI,MAAA,GAAG,CAAC,MAAM,0CAAE,aAAa,CAAA;YACxE,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC;YAC5C,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa;YACzC,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,GAAG,EAAE,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,GAAG;YAC/B,WAAW,EAAE,GAAG,GAAG,CAAC,gBAAgB,IAAI,GAAG,CAAC,gBAAgB,EAAE;YAC9D,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,GAAG;YAC5D,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;YACpC,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC;SAC/C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,EAAE,CAAC;AAChB,CAAC;AA7BD,oCA6BC"}
1
+ {"version":3,"file":"accessLogger.js","sourceRoot":"","sources":["../../src/middlewares/accessLogger.ts"],"names":[],"mappings":";;;AACA,4CAA0C;AAC1C,4CAAyC;AAEzC,SAAgB,YAAY,CAC1B,GAAY,EACZ,GAAa,EACb,IAAkB;IAElB,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAE1C,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACpB,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACxC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE;YACvB,QAAQ,EAAE,gBAAO,CAAC,MAAM;YACxB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YACzB,QAAQ,EAAE,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE;YAC1C,UAAU,EAAE,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC,GAAG,MAAM,CAAC,OAAS,CAAC,CAAC,CAAC,QAAQ,EAAE;YAClE,aAAa,EAAE,IAAA,aAAK,EAAC,GAAG,CAAC;YACzB,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC;YAC5C,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa;YACzC,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,GAAG,EAAE,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,GAAG;YAC/B,WAAW,EAAE,GAAG,GAAG,CAAC,gBAAgB,IAAI,GAAG,CAAC,gBAAgB,EAAE;YAC9D,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,GAAG;YAC5D,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;YACpC,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC;SAC/C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,EAAE,CAAC;AAChB,CAAC;AA5BD,oCA4BC"}
@@ -0,0 +1,4 @@
1
+ import { NextFunction, Request, Response } from "express";
2
+ import { AuditBody } from "@alanszp/audit";
3
+ export declare type AuditBodyModifier = (req: Request, res: Response) => Promise<Partial<AuditBody>> | Partial<AuditBody>;
4
+ export declare function auditLog(action: string, bodyModifier?: AuditBodyModifier | void): (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -0,0 +1,38 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.auditLog = void 0;
13
+ const getIp_1 = require("../helpers/getIp");
14
+ function auditLog(action, bodyModifier) {
15
+ return function writeAuditLog(req, res, next) {
16
+ return __awaiter(this, void 0, void 0, function* () {
17
+ try {
18
+ const audit = req.context.audit;
19
+ const partialBody = bodyModifier
20
+ ? yield Promise.resolve(bodyModifier(req, res))
21
+ : {};
22
+ if (req.context.jwtUser) {
23
+ partialBody.orgRef = req.context.jwtUser.organizationReference;
24
+ partialBody.actorRef = req.context.jwtUser.id;
25
+ }
26
+ partialBody.ip = (0, getIp_1.getIp)(req) || "no-ip";
27
+ audit.log(Object.assign(Object.assign({ succeed: res.statusCode >= 200 && res.statusCode < 300 }, partialBody), { action }));
28
+ next();
29
+ }
30
+ catch (error) {
31
+ req.context.log.error("auditLog.writeLog.error", { action, error });
32
+ next();
33
+ }
34
+ });
35
+ };
36
+ }
37
+ exports.auditLog = auditLog;
38
+ //# sourceMappingURL=auditLog.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"auditLog.js","sourceRoot":"","sources":["../../src/middlewares/auditLog.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,4CAAyC;AAOzC,SAAgB,QAAQ,CACtB,MAAc,EACd,YAAuC;IAEvC,OAAO,SAAe,aAAa,CACjC,GAAY,EACZ,GAAa,EACb,IAAkB;;YAElB,IAAI;gBACF,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;gBAEhC,MAAM,WAAW,GAAG,YAAY;oBAC9B,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;oBAC/C,CAAC,CAAE,EAAyB,CAAC;gBAE/B,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE;oBACvB,WAAW,CAAC,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC;oBAC/D,WAAW,CAAC,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;iBAC/C;gBAED,WAAW,CAAC,EAAE,GAAG,IAAA,aAAK,EAAC,GAAG,CAAC,IAAI,OAAO,CAAC;gBAEvC,KAAK,CAAC,GAAG,+BACP,OAAO,EAAE,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,IACnD,WAAW,KACd,MAAM,IACN,CAAC;gBACH,IAAI,EAAE,CAAC;aACR;YAAC,OAAO,KAAc,EAAE;gBACvB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;gBACpE,IAAI,EAAE,CAAC;aACR;QACH,CAAC;KAAA,CAAC;AACJ,CAAC;AAlCD,4BAkCC"}
@@ -1,13 +1,14 @@
1
1
  /// <reference types="node" />
2
2
  import { NextFunction, Request, Response } from "express";
3
3
  import { ILogger } from "@alanszp/logger";
4
+ import { Audit } from "@alanszp/audit";
4
5
  import { AsyncLocalStorage } from "async_hooks";
5
6
  export interface RequestSharedContext {
6
7
  logger: ILogger;
7
8
  lifecycleId: string;
8
9
  lifecycleChain: string;
9
10
  }
10
- export declare function createExtraContext(baseLogger: ILogger): {
11
+ export declare function createExtraContext(baseLogger: ILogger, audit: Audit): {
11
12
  requestSharedContext: AsyncLocalStorage<RequestSharedContext>;
12
13
  extraContext: (req: Request, _res: Response, next: NextFunction) => void;
13
14
  };
@@ -7,16 +7,16 @@ exports.createExtraContext = void 0;
7
7
  const cuid_1 = __importDefault(require("cuid"));
8
8
  const async_hooks_1 = require("async_hooks");
9
9
  const appIdentifier_1 = require("../helpers/appIdentifier");
10
- function createExtraContext(baseLogger) {
10
+ function createExtraContext(baseLogger, audit) {
11
11
  const requestSharedContext = new async_hooks_1.AsyncLocalStorage();
12
12
  return {
13
13
  requestSharedContext,
14
14
  extraContext: function extraContext(req, _res, next) {
15
15
  var _a;
16
16
  req.context = req.context || {};
17
- const recivedChain = req.header("x-lifecycle-chain");
18
- const separator = recivedChain ? "," : "";
19
- const lifecycleChain = `${recivedChain || ""}${separator}${(0, appIdentifier_1.appIdentifier)()}`;
17
+ const receivedChain = req.header("x-lifecycle-chain");
18
+ const separator = receivedChain ? "," : "";
19
+ const lifecycleChain = `${receivedChain || ""}${separator}${(0, appIdentifier_1.appIdentifier)()}`;
20
20
  const lifecycleId = ((_a = req.headers["x-lifecycle-id"]) === null || _a === void 0 ? void 0 : _a.toString()) || (0, cuid_1.default)();
21
21
  const logger = baseLogger.child({
22
22
  lid: lifecycleId,
@@ -26,6 +26,7 @@ function createExtraContext(baseLogger) {
26
26
  req.context.lifecycleId = lifecycleId;
27
27
  req.context.lifecycleChain = lifecycleChain;
28
28
  req.context.log = logger;
29
+ req.context.audit = audit;
29
30
  requestSharedContext.run({
30
31
  logger,
31
32
  lifecycleId,
@@ -1 +1 @@
1
- {"version":3,"file":"extraContext.js","sourceRoot":"","sources":["../../src/middlewares/extraContext.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAGxB,6CAAgD;AAChD,4DAAyD;AAQzD,SAAgB,kBAAkB,CAAC,UAAmB;IACpD,MAAM,oBAAoB,GAAG,IAAI,+BAAiB,EAAwB,CAAC;IAC3E,OAAO;QACL,oBAAoB;QACpB,YAAY,EAAE,SAAS,YAAY,CACjC,GAAY,EACZ,IAAc,EACd,IAAkB;;YAElB,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;YAEhC,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YACrD,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1C,MAAM,cAAc,GAAG,GACrB,YAAY,IAAI,EAClB,GAAG,SAAS,GAAG,IAAA,6BAAa,GAAE,EAAE,CAAC;YACjC,MAAM,WAAW,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,0CAAE,QAAQ,EAAE,KAAI,IAAA,cAAI,GAAE,CAAC;YAExE,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC;gBAC9B,GAAG,EAAE,WAAW;gBAChB,GAAG,EAAE,cAAc;aACpB,CAAC,CAAC;YAEH,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,EAAE,CAAC;YAC/B,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;YACtC,GAAG,CAAC,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;YAC5C,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC;YAEzB,oBAAoB,CAAC,GAAG,CACtB;gBACE,MAAM;gBACN,WAAW;gBACX,cAAc;aACf,EACD,GAAG,EAAE,CAAC,IAAI,EAAE,CACb,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAtCD,gDAsCC"}
1
+ {"version":3,"file":"extraContext.js","sourceRoot":"","sources":["../../src/middlewares/extraContext.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAIxB,6CAAgD;AAChD,4DAAyD;AAQzD,SAAgB,kBAAkB,CAAC,UAAmB,EAAE,KAAY;IAClE,MAAM,oBAAoB,GAAG,IAAI,+BAAiB,EAAwB,CAAC;IAC3E,OAAO;QACL,oBAAoB;QACpB,YAAY,EAAE,SAAS,YAAY,CACjC,GAAY,EACZ,IAAc,EACd,IAAkB;;YAElB,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;YAEhC,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YACtD,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3C,MAAM,cAAc,GAAG,GACrB,aAAa,IAAI,EACnB,GAAG,SAAS,GAAG,IAAA,6BAAa,GAAE,EAAE,CAAC;YACjC,MAAM,WAAW,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,0CAAE,QAAQ,EAAE,KAAI,IAAA,cAAI,GAAE,CAAC;YAExE,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC;gBAC9B,GAAG,EAAE,WAAW;gBAChB,GAAG,EAAE,cAAc;aACpB,CAAC,CAAC;YAEH,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,EAAE,CAAC;YAC/B,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;YACtC,GAAG,CAAC,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;YAC5C,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC;YACzB,GAAG,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;YAE1B,oBAAoB,CAAC,GAAG,CACtB;gBACE,MAAM;gBACN,WAAW;gBACX,cAAc;aACf,EACD,GAAG,EAAE,CAAC,IAAI,EAAE,CACb,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAvCD,gDAuCC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alanszp/express",
3
- "version": "3.0.1",
3
+ "version": "4.0.2",
4
4
  "description": "Alan's express utils and middlewares.",
5
5
  "main": "dist/index.js",
6
6
  "typings": "dist/index.d.ts",
@@ -30,12 +30,13 @@
30
30
  "typescript": "^4.3.4"
31
31
  },
32
32
  "dependencies": {
33
- "@alanszp/errors": "^3.0.0",
34
- "@alanszp/jwt": "^3.0.1",
35
- "@alanszp/logger": "^3.0.0",
33
+ "@alanszp/audit": "^4.0.2",
34
+ "@alanszp/errors": "^4.0.0",
35
+ "@alanszp/jwt": "^4.0.0",
36
+ "@alanszp/logger": "^4.0.2",
36
37
  "body-parser": "^1.19.0",
37
38
  "cuid": "^2.1.8",
38
39
  "lodash": "^4.17.21"
39
40
  },
40
- "gitHead": "ab0cd2ac404901d732278843e406a2c90061c0f5"
41
+ "gitHead": "c983be912daf7999c18052e7bcef490f3df9f863"
41
42
  }
@@ -0,0 +1,5 @@
1
+ import { Request } from "express";
2
+
3
+ export function getIp(req: Request) {
4
+ return req.headers["cf-connecting-ip"] || req.ip || req.socket?.remoteAddress;
5
+ }
@@ -1,5 +1,6 @@
1
1
  import { NextFunction, Request, Response } from "express";
2
2
  import { LogType } from "@alanszp/logger";
3
+ import { getIp } from "../helpers/getIp";
3
4
 
4
5
  export function accessLogger(
5
6
  req: Request,
@@ -16,8 +17,7 @@ export function accessLogger(
16
17
  env: process.env.NODE_ENV,
17
18
  duration: (endTime - startTime).toString(),
18
19
  durationMs: ((endTime - startTime) / BigInt(1_000_000)).toString(),
19
- remoteAddress:
20
- req.headers["cf-connecting-ip"] || req.ip || req.socket?.remoteAddress,
20
+ remoteAddress: getIp(req),
21
21
  forwardedFor: req.headers["x-forwarded-for"],
22
22
  authentication: req.context.authenticated,
23
23
  statusCode: res.statusCode,
@@ -0,0 +1,47 @@
1
+ import { UnauthorizedError } from "@alanszp/errors";
2
+ import { errorView } from "../views/errorView";
3
+ import { NextFunction, Request, Response } from "express";
4
+ import { getRequestLogger } from "../helpers/getRequestLogger";
5
+ import { AuditBody } from "@alanszp/audit";
6
+ import { getIp } from "../helpers/getIp";
7
+
8
+ export type AuditBodyModifier = (
9
+ req: Request,
10
+ res: Response
11
+ ) => Promise<Partial<AuditBody>> | Partial<AuditBody>;
12
+
13
+ export function auditLog(
14
+ action: string,
15
+ bodyModifier?: AuditBodyModifier | void
16
+ ) {
17
+ return async function writeAuditLog(
18
+ req: Request,
19
+ res: Response,
20
+ next: NextFunction
21
+ ): Promise<void> {
22
+ try {
23
+ const audit = req.context.audit;
24
+
25
+ const partialBody = bodyModifier
26
+ ? await Promise.resolve(bodyModifier(req, res))
27
+ : ({} as Partial<AuditBody>);
28
+
29
+ if (req.context.jwtUser) {
30
+ partialBody.orgRef = req.context.jwtUser.organizationReference;
31
+ partialBody.actorRef = req.context.jwtUser.id;
32
+ }
33
+
34
+ partialBody.ip = getIp(req) || "no-ip";
35
+
36
+ audit.log({
37
+ succeed: res.statusCode >= 200 && res.statusCode < 300,
38
+ ...partialBody,
39
+ action,
40
+ });
41
+ next();
42
+ } catch (error: unknown) {
43
+ req.context.log.error("auditLog.writeLog.error", { action, error });
44
+ next();
45
+ }
46
+ };
47
+ }
@@ -1,6 +1,7 @@
1
1
  import cuid from "cuid";
2
2
  import { NextFunction, Request, Response } from "express";
3
3
  import { ILogger } from "@alanszp/logger";
4
+ import { Audit } from "@alanszp/audit";
4
5
  import { AsyncLocalStorage } from "async_hooks";
5
6
  import { appIdentifier } from "../helpers/appIdentifier";
6
7
 
@@ -10,7 +11,7 @@ export interface RequestSharedContext {
10
11
  lifecycleChain: string;
11
12
  }
12
13
 
13
- export function createExtraContext(baseLogger: ILogger) {
14
+ export function createExtraContext(baseLogger: ILogger, audit: Audit) {
14
15
  const requestSharedContext = new AsyncLocalStorage<RequestSharedContext>();
15
16
  return {
16
17
  requestSharedContext,
@@ -21,10 +22,10 @@ export function createExtraContext(baseLogger: ILogger) {
21
22
  ): void {
22
23
  req.context = req.context || {};
23
24
 
24
- const recivedChain = req.header("x-lifecycle-chain");
25
- const separator = recivedChain ? "," : "";
25
+ const receivedChain = req.header("x-lifecycle-chain");
26
+ const separator = receivedChain ? "," : "";
26
27
  const lifecycleChain = `${
27
- recivedChain || ""
28
+ receivedChain || ""
28
29
  }${separator}${appIdentifier()}`;
29
30
  const lifecycleId = req.headers["x-lifecycle-id"]?.toString() || cuid();
30
31
 
@@ -37,6 +38,7 @@ export function createExtraContext(baseLogger: ILogger) {
37
38
  req.context.lifecycleId = lifecycleId;
38
39
  req.context.lifecycleChain = lifecycleChain;
39
40
  req.context.log = logger;
41
+ req.context.audit = audit;
40
42
 
41
43
  requestSharedContext.run(
42
44
  {
@@ -1,4 +1,5 @@
1
1
  import { ILogger } from "@alanszp/logger";
2
+ import { Audit } from "@alanszp/audit";
2
3
  import { JWTUser } from "@alanszp/jwt";
3
4
  import { AuthMethod } from "./AuthMethod";
4
5
 
@@ -10,6 +11,7 @@ declare global {
10
11
  lifecycleChain: string;
11
12
  authenticated: AuthMethod[];
12
13
  log: ILogger;
14
+ audit: Audit;
13
15
  jwtUser?: JWTUser;
14
16
  };
15
17
  }