fix: byok

Author: devthejo

services/api/src/access-admin-db.ts

@@ -298,13 +298,41 @@ export async function getLlmConfigsCollection(): Promise<Collection<LlmConfigDoc
 }
 
 export async function findLlmConfigForOrg(orgId: any): Promise<LlmConfigDoc | null> {
+  if (orgId == null) {
+    return null;
+  }
+
   const col = await getLlmConfigsCollection();
-  return col.findOne({ org_id: orgId });
+
+  let effectiveId: any = orgId;
+  if (typeof orgId === 'string') {
+    try {
+      effectiveId = new ObjectId(orgId);
+    } catch {
+      return null;
+    }
+  }
+
+  return col.findOne({ org_id: effectiveId });
 }
 
 export async function findLlmConfigForToken(tokenId: any): Promise<LlmConfigDoc | null> {
+  if (tokenId == null) {
+    return null;
+  }
+
   const col = await getLlmConfigsCollection();
-  return col.findOne({ token_id: tokenId });
+
+  let effectiveId: any = tokenId;
+  if (typeof tokenId === 'string') {
+    try {
+      effectiveId = new ObjectId(tokenId);
+    } catch {
+      return null;
+    }
+  }
+
+  return col.findOne({ token_id: effectiveId });
 }
 
 export async function upsertLlmConfigForOrg(
@@ -320,8 +348,17 @@ export async function upsertLlmConfigForOrg(
   const col = await getLlmConfigsCollection();
   const now = new Date();
 
+  let effectiveId: any = orgId;
+  if (typeof orgId === 'string') {
+    try {
+      effectiveId = new ObjectId(orgId);
+    } catch {
+      throw new Error('invalid_org_id');
+    }
+  }
+
   const update: Partial<LlmConfigDoc> = {
-    org_id: orgId,
+    org_id: effectiveId,
     token_id: undefined,
     provider: patch.provider,
     api_base_url: patch.api_base_url,
@@ -332,7 +369,7 @@ export async function upsertLlmConfigForOrg(
   };
 
   await col.updateOne(
-    { org_id: orgId },
+    { org_id: effectiveId },
     {
       $set: update,
       $setOnInsert: {
@@ -342,7 +379,7 @@ export async function upsertLlmConfigForOrg(
     { upsert: true }
   );
 
-  const doc = await col.findOne({ org_id: orgId });
+  const doc = await col.findOne({ org_id: effectiveId });
   if (!doc) {
     throw new Error('failed_to_load_llm_config_org');
   }
@@ -362,9 +399,18 @@ export async function upsertLlmConfigForToken(
   const col = await getLlmConfigsCollection();
   const now = new Date();
 
+  let effectiveId: any = tokenId;
+  if (typeof tokenId === 'string') {
+    try {
+      effectiveId = new ObjectId(tokenId);
+    } catch {
+      throw new Error('invalid_token_id');
+    }
+  }
+
   const update: Partial<LlmConfigDoc> = {
     org_id: undefined,
-    token_id: tokenId,
+    token_id: effectiveId,
     provider: patch.provider,
     api_base_url: patch.api_base_url,
     api_key: patch.api_key,
@@ -374,7 +420,7 @@ export async function upsertLlmConfigForToken(
   };
 
   await col.updateOne(
-    { token_id: tokenId },
+    { token_id: effectiveId },
     {
       $set: update,
       $setOnInsert: {
@@ -384,7 +430,7 @@ export async function upsertLlmConfigForToken(
     { upsert: true }
   );
 
-  const doc = await col.findOne({ token_id: tokenId });
+  const doc = await col.findOne({ token_id: effectiveId });
   if (!doc) {
     throw new Error('failed_to_load_llm_config_token');
   }
@@ -393,12 +439,32 @@ export async function upsertLlmConfigForToken(
 
 export async function deleteLlmConfigForOrg(orgId: any): Promise<void> {
   const col = await getLlmConfigsCollection();
-  await col.deleteOne({ org_id: orgId });
+
+  let effectiveId: any = orgId;
+  if (typeof orgId === 'string') {
+    try {
+      effectiveId = new ObjectId(orgId);
+    } catch {
+      throw new Error('invalid_org_id');
+    }
+  }
+
+  await col.deleteOne({ org_id: effectiveId });
 }
 
 export async function deleteLlmConfigForToken(tokenId: any): Promise<void> {
   const col = await getLlmConfigsCollection();
-  await col.deleteOne({ token_id: tokenId });
+
+  let effectiveId: any = tokenId;
+  if (typeof tokenId === 'string') {
+    try {
+      effectiveId = new ObjectId(tokenId);
+    } catch {
+      throw new Error('invalid_token_id');
+    }
+  }
+
+  await col.deleteOne({ token_id: effectiveId });
 }
 
 // --- Token utilities ---