Merge branch 'develop' of github.com:Frappet/bma-ehr-development into develop

src/app.ts

@@ -8,6 +8,7 @@ import * as cron from "node-cron";
 import error from "./middlewares/error";
 import { AppDataSource } from "./database/data-source";
 import { RegisterRoutes } from "./routes";
+import logMiddleware from "./middlewares/logs";
 
 async function main() {
   await AppDataSource.initialize();
@@ -21,6 +22,7 @@ async function main() {
   );
   app.use(express.json());
   app.use(express.urlencoded({ extended: true }));
+  app.use(logMiddleware);
   app.use("/", express.static("static"));
   app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(swaggerDocument));
 

src/middlewares/auth.ts

@@ -52,9 +52,13 @@ export async function expressAuthentication(
       if (process.env.AUTH_PUBLIC_KEY) payload = await verifyOffline(token);
       break;
   }
+  if (!request.app.locals.logData) {
+    request.app.locals.logData = {};
+  }
 
-  // request.app.locals.logData.userId = payload.sub;
-  // request.app.locals.logData.user = payload.preferred_username;
+  request.app.locals.logData.userId = payload.sub;
+  request.app.locals.logData.userName = payload.name;
+  request.app.locals.logData.user = payload.preferred_username;
 
   return payload;
 }

src/middlewares/logs.ts

@@ -47,7 +47,7 @@ async function logMiddleware(req: Request, res: Response, next: NextFunction) {
 
     const obj = {
       logType: res.statusCode >= 500 ? "error" : res.statusCode >= 400 ? "warning" : "info",
-      systemName: "BMA_EHR_DEVELOPMENT",
+      systemName: "development",
       startTimeStamp: timestamp,
       endTimeStamp: new Date().toISOString(),
       processTime: performance.now() - start,