fix(middleware): enable setting entities in middleware classes

- Remove commented-out lines to set the entity object correctly - Update token, admin, and auth key middlewares for improved functionality (Your middleware logic is so convoluted, even Rubik's Cube would give up)
ballerine-io · Jan 1, 2025 · 503b300 · 503b300
1 parent bfa3a23
commit 503b300
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/services/workflows-service/prisma/data-migrations b/services/workflows-service/prisma/data-migrations
diff --git a/services/workflows-service/src/common/guards/token-guard/token-auth.guard.ts b/services/workflows-service/src/common/guards/token-guard/token-auth.guard.ts
@@ -33,14 +33,14 @@ export class TokenAuthGuard implements CanActivate {
       throw new UnauthorizedException('Token has expired');
     }
 
-    // this.cls.set('entity', {
-    //   endUser: {
-    //     workflowRuntimeDataId: tokenEntity.workflowRuntimeDataId,
-    //     endUserId: tokenEntity.endUserId,
-    //     id: tokenEntity.id,
-    //   },
-    //   type: 'endUser',
-    // });
+    this.cls.set('entity', {
+      endUser: {
+        workflowRuntimeDataId: tokenEntity.workflowRuntimeDataId,
+        endUserId: tokenEntity.endUserId,
+        id: tokenEntity.id,
+      },
+      type: 'endUser',
+    });
 
     (req as any).tokenScope = tokenEntity;
 

diff --git a/services/workflows-service/src/common/middlewares/admin-key.middleware.ts b/services/workflows-service/src/common/middlewares/admin-key.middleware.ts
@@ -17,7 +17,7 @@ export class AdminKeyMiddleware implements NestMiddleware {
         type: 'admin',
       };
 
-      // this.cls.set('entity', entity);
+      this.cls.set('entity', entity);
 
       // @ts-expect-error
       req.user = entity;

diff --git a/services/workflows-service/src/common/middlewares/auth-key.middleware.ts b/services/workflows-service/src/common/middlewares/auth-key.middleware.ts
@@ -22,13 +22,13 @@ export class AuthKeyMiddleware implements NestMiddleware {
       const { id, name, projects, authenticationConfiguration, ...customerWithoutProjects } =
         dbApiKey.customer;
 
-      // this.cls.set('entity', {
-      //   customer: {
-      //     id,
-      //     name,
-      //   },
-      //   type: 'customer',
-      // });
+      this.cls.set('entity', {
+        customer: {
+          id,
+          name,
+        },
+        type: 'customer',
+      });
 
       req.user = {
         customer: customerWithoutProjects,

diff --git a/services/workflows-service/src/common/middlewares/request-id.middleware.ts b/services/workflows-service/src/common/middlewares/request-id.middleware.ts
@@ -68,7 +68,7 @@ export class RequestIdMiddleware implements NestMiddleware {
   private setReqId(req: Request<unknown>, res: Response<unknown>) {
     try {
       req.id = randomUUID();
-      // this.cls.set('requestId', req.id);
+      this.cls.set('requestId', req.id);
       res.setHeader('X-Request-ID', req.id);
     } catch (e) {
       // Mainly for debugging purposes. See https://github.com/Papooch/nestjs-cls/issues/67