Feat/audit log

src/app.ts

@@ -4,6 +4,7 @@ import express, {
   Response,
   RequestHandler,
   ErrorRequestHandler,
+  NextFunction,
 } from "express";
 import morgan from "morgan";
 import cors from "cors";
@@ -13,6 +14,7 @@ import sessionRouter from "./routes/session.routes";
 import emailVerification from "./routes/emailVerification.routes";
 import PaymentRoute from "./routes/PaymentLink.routes";
 import authRoutes from "./routes/authRoutes";
+import auditLogRoute from "./routes/auditLogRoutes";
 import userRoutes from "./routes/userRoutes";
 import healthRouter from "./routes/health.routes";
 import walletVerificationRoutes from "./routes/wallet-verification.routes";
@@ -30,6 +32,8 @@ import { requestLogger } from "./middlewares/requestLogger.middleware";
 import RateLimitMonitoringService from "./services/rateLimitMonitoring.service";
 import { startExpiredSessionCleanupCronJobs } from "./utils/schedular";
 import logger from "./utils/logger";
+import { auth } from "express-openid-connect";
+import { auditMiddleware } from "./middlewares/audit.middleware";
 
 // Initialize express app
 const app = express();
@@ -77,6 +81,21 @@ app.use((req, res, next) => {
 // Start scheduled jobs
 startExpiredSessionCleanupCronJobs();
 
+// Initialize the database connection
+// AppDataSource.initialize()
+//   .then(() => {
+//     logger.info("Data Source has been initialized!");
+//   })
+//   .catch((err) => {
+//     logger.error("Error during Data Source initialization:", err);
+//     process.exit(1); // Exit if we can't connect to the database
+//   });
+
+app.use(((req: Request, res: Response, next: NextFunction) => {
+  req.dataSource = AppDataSource;
+  next();
+}) as RequestHandler);
+
 // Log application startup
 logger.info("Application started successfully");
 
@@ -91,7 +110,10 @@ app.use("/users", userRoutes);
 app.use("/merchants", merchantRoutes);
 app.use("/webhook-queue/merchant", merchantWebhookQueueRoutes);
 app.use("/reports/transactions", transactionReportsRoutes);
-//app.use("/api/v1/stellar", stellarContractRoutes);
+//app.use("/audit-log", auditLogRoute);
+app.use("/api/v1/stellar", stellarContractRoutes);
+
+
 
 // Error handling middleware
 const customErrorHandler: ErrorRequestHandler = (err, req, res, _next) => {
@@ -117,4 +139,4 @@ app.use(((req: Request, res: Response) => {
 }) as RequestHandler);
 
 // Export app
-export default app;
+export { app };

src/config/db.ts

@@ -9,11 +9,13 @@ import { WalletVerification } from "../entities/WalletVerification";
 import { MerchantEntity } from "../entities/Merchant.entity";
 import { MerchantWebhookEntity } from "../entities/MerchantWebhook.entity";
 import { MerchantWebhookEventEntity } from "../entities/MerchantWebhookEvent.entity";
+import { AuditLog } from "../entities/AuditLog.entity";
 import { PaymentLink } from "../entities/PaymentLink";
 
+
 dotenv.config();
 
-const AppDataSource = new DataSource({
+export const AppDataSource = new DataSource({
   type: "postgres",
   host: process.env.POSTGRES_HOST,
   port: Number(process.env.POSTGRES_PORT),
@@ -32,10 +34,9 @@ const AppDataSource = new DataSource({
     MerchantEntity,
     MerchantWebhookEntity,
     MerchantWebhookEventEntity,
+    AuditLog,
     PaymentLink,
   ],
   migrations: ["src/migrations/*.ts"],
   migrationsTableName: "migrations",
 });
-
-export default AppDataSource;

src/controllers/AuditLogController.ts

@@ -0,0 +1,36 @@
+import { Request, Response } from "express";
+
+import { AuditLogActionsEnum } from "../enums/AuditLogAction";
+import { AuditService } from "../services/Audit.service";
+
+export class AuditLogController {
+  fetchAllAuditLogs = async (req: Request, res: Response) => {
+    const auditService = new AuditService(req.dataSource);
+    try {
+      const filters = {
+        entityType: req.query.entityType as string,
+        entityId: req.query.entityId as string,
+        userId: req.query.userId as string,
+        action: req.query.action as AuditLogActionsEnum,
+        startDate: req.query.startDate
+          ? new Date(req.query.startDate as string)
+          : undefined,
+        endDate: req.query.endDate
+          ? new Date(req.query.endDate as string)
+          : undefined,
+        page: req.query.page ? parseInt(req.query.page as string, 10) : 1,
+        limit: req.query.limit ? parseInt(req.query.limit as string, 10) : 10,
+      };
+
+      const result = await auditService.findAuditLogs(filters);
+
+      res.status(200).json(result);
+    } catch (error) {
+      if (error instanceof Error) {
+        res.status(400).json({ message: error.message });
+      } else {
+        res.status(500).json({ message: "Internal server error" });
+      }
+    }
+  };
+}

src/controllers/AuthController.ts

@@ -2,11 +2,14 @@
 import { Request, Response } from "express";
 import { AuthService } from "../services/AuthService";
 import { validateTwoFactorAuthentication } from "./validateTwoFactorAuthentication";
-import AppDataSource from "../config/db";
 import { User } from "../entities/User";
 import { compare } from "bcryptjs";
 import { Auth0Profile } from "src/interfaces/auth.interfaces";
 
+import { AuditLogActionsEnum } from "../enums/AuditLogAction";
+import { AuditService } from "../services/Audit.service";
+import { AppDataSource } from "../config/db";
+
 export class AuthController {
   public authService: AuthService;
 
@@ -17,6 +20,18 @@ export class AuthController {
   register = async (req: Request, res: Response): Promise<void> => {
     try {
       const user = await this.authService.register(req.body);
+      console.log("Done with registration", { user });
+      const auditService = new AuditService(req.dataSource);
+      await auditService.createAuditLogs({
+        entityType: "User",
+        entityId: String(user.id),
+        action: AuditLogActionsEnum.CREATE,
+        newValues: req.body,
+        userId: String(user.id),
+        userEmail: user.email,
+        ipAddress: req.auditContext?.ipAddress || "0.0.0.0",
+        userAgent: req.auditContext?.userAgent || "Unknown",
+      });
       res.status(201).json(user);
     } catch (error) {
       if (error instanceof Error) {

src/controllers/PaymentLink.controller.ts

@@ -2,7 +2,7 @@ import { Request, Response } from "express";
 import { PaymentLinkService } from "../services/PaymentLink.services";
 import { Repository } from "typeorm";
 import { PaymentLink } from "../entities/PaymentLink";
-import AppDataSource from "../config/db";
+import { AppDataSource } from "../config/db";
 import {
   CreatePaymentLinkDto,
   UpdatePaymentLinkDto,

src/controllers/twoFactorAuthController.ts

@@ -1,7 +1,7 @@
 import { User } from "../entities/User";
 import { TwoFactorAuth } from "../entities/TwoFactorAuth";
 import { generateTwoFactorSecret } from "../services/generateTwoFactorSecret";
-import AppDataSource from "../config/db";
+import { AppDataSource } from "../config/db";
 import { validateTwoFactorAuthentication } from "./validateTwoFactorAuthentication";
 
 export const enableTwoFactorAuthentication = async (userId: number) => {

src/controllers/validateTwoFactorAuthentication.ts

@@ -1,6 +1,6 @@
 import { verifyTwoFactorCode } from "../services/verifyTwoFactorCode";
 import { User } from "../entities/User";
-import AppDataSource from "../config/db";
+import { AppDataSource } from "../config/db";
 
 export const validateTwoFactorAuthentication = async (
   userId: number,

src/entities/AuditLog.entity.ts

@@ -0,0 +1,48 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  PrimaryGeneratedColumn,
+} from "typeorm";
+import { AuditLogActionsEnum } from "../enums/AuditLogAction";
+
+@Entity("audit_logs")
+export class AuditLog {
+  @PrimaryGeneratedColumn("uuid")
+  id: string;
+
+  @Column()
+  entityType: string; // 'User', 'PaymentLink', 'BusinessProfile', etc.
+
+  @Column()
+  entityId: string;
+
+  @Column({
+    type: "enum",
+    enum: AuditLogActionsEnum,
+    default: AuditLogActionsEnum.CREATE,
+  })
+  action: AuditLogActionsEnum;
+
+  @Column("json", { nullable: true })
+  oldValues?: Record<string, any>; // used when there is an update,  so we can see
+  //  what value was there previously
+
+  @Column("json", { nullable: true })
+  newValues?: Record<string, any>;
+
+  @Column()
+  userId: string;
+
+  @Column()
+  userEmail: string;
+
+  @Column()
+  ipAddress: string;
+
+  @Column()
+  userAgent: string;
+
+  @CreateDateColumn()
+  createdAt: Date;
+}