From b21295f268befd0680ae34a7bcd6eabde70188c1 Mon Sep 17 00:00:00 2001
From: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Date: Thu, 3 Jul 2025 15:09:55 +0300
Subject: [PATCH] chore: add user org id to user context apiv2 axiom (#22236)

---
 apps/api/v2/src/lib/extract-user-context.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/api/v2/src/lib/extract-user-context.ts b/apps/api/v2/src/lib/extract-user-context.ts
index f7bc74181b..843ceaa00b 100644
--- a/apps/api/v2/src/lib/extract-user-context.ts
+++ b/apps/api/v2/src/lib/extract-user-context.ts
@@ -9,6 +9,7 @@ export interface UserContext {
   userEmail?: string;
   organizationId?: string;
   teamId?: string;
+  userOrgId?: string;
 }
 
 export function extractUserContext(request: Request): UserContext {
@@ -18,6 +19,9 @@ export function extractUserContext(request: Request): UserContext {
   if (user) {
     context.userId = String(user.id);
     context.userEmail = user.email;
+    if (user.profiles?.[0]?.organizationId) {
+      context.userOrgId = String(user.profiles?.[0].organizationId);
+    }
   }
 
   const organizationId = (request as any).organizationId as number | undefined;