@codefresh-io/service-base 8.0.0 → 8.0.1-alpha.2

package/index.js

@@ -13,6 +13,7 @@ const express = require('express');
 const monitor = require('@codefresh-io/cf-monitor');
 const logging = require('./infra/logging');
 const { openapi } = require('@codefresh-io/cf-openapi');
+const expressInfra = require('./infra/express');
 
 const OPTIONAL_COMPONENTS = {
     mongo: { name: 'mongoClient' },
@@ -26,15 +27,15 @@ const exportedComponents = {
     initService: service.init.bind(service),
     stopService: service.stop.bind(service),
     validation: require('./infra/validation'),
-    makeEndpoint: require('./infra/express').makeEndpoint,
+    makeEndpoint: expressInfra.makeEndpoint.bind(expressInfra),
     getAuthenticatedEntity,
     setAuthenticatedEntity,
     request,
     authEntity,
     Promise,
     express,
-    expressApp: require('./infra/express').expressApp,
-    getLogger: logging.getLogger,
+    expressApp: expressInfra.expressApp,
+    getLogger: logging.getLogger.bind(logging),
     config,
     monitor,
 };

package/infra/express.js

@@ -1,6 +1,6 @@
 // @ts-check
 const { httpLoggerMiddlewareFactory } = require('@codefresh-io/cf-telemetry/logs/express');
-const { Logger } = require('@codefresh-io/cf-telemetry/logs');
+const { Logger, runInContext } = require('@codefresh-io/cf-telemetry/logs');
 const express = require('express');
 const qs = require('qs');
 const compression = require('compression');
@@ -8,8 +8,8 @@ const bodyParser = require('body-parser');
 const methodOverride = require('method-override');
 const cookieParser = require('cookie-parser');
 const monitor = require('@codefresh-io/cf-monitor');
-// @ts-ignore
-const { newDomainMiddleware } = require('@codefresh-io/http-infra');
+// @ts-ignore Incorrectly typed package
+const { newDomainMiddleware, getAuthenticatedEntity } = require('@codefresh-io/http-infra');
 const { openapi } = require('@codefresh-io/cf-openapi');
 const CFError = require('cf-errors');
 const { globalLogger } = require('./global-logger');
@@ -24,6 +24,28 @@ const { globalLogger } = require('./global-logger');
  * @typedef {import('node:http').Server} HttpServer
  */
 
+const authLogger = new Logger('auth');
+/**
+ * @param {Request} _req
+ * @param {Response} _res
+ * @param {NextFunction} next
+ */
+const enrichLogsWithAuthMetadataMiddleware = (_req, _res, next) => {
+    try {
+        const authEntity = getAuthenticatedEntity();
+        const initiator = {
+            type: authEntity?.getType?.() ?? 'anonymous',
+            id: authEntity?.id,
+        };
+        const context = authEntity?.isSystemEntity?.() ? {} : { account_id: authEntity?.getActiveAccountId?.() };
+        // @ts-ignore rest parameters are optional
+        runInContext({ initiator, context }, next);
+    } catch (exception) {
+        authLogger.error('Failed to enrich logs with auth metadata', exception);
+        next();
+    }
+};
+
 class Express {
     #logger = globalLogger.child(this.constructor.name);
 
@@ -102,9 +124,11 @@ class Express {
             }
         });
 
+        this.expressApp.use(enrichLogsWithAuthMetadataMiddleware);
+
         /** @type {ErrorRequestHandler} */
         const errorHandler = (err, _req, res, next) => {
-            this.#logger.error('Request handler error', err);
+            this.#logger.error(err);
 
             if (res.headersSent) {
                 next(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefresh-io/service-base",
-  "version": "8.0.0",
+  "version": "8.0.1-alpha.2",
   "main": "index.js",
   "description": "",
   "bin": {