fixing

Author: opbot-xd

src/backend/db.ts

@@ -1,120 +1,90 @@
+import { MongoClient } from "./dependencies.ts";
 import getProviderUser from "./utils/get-user.ts";
 import DfContentMap from "./types/maps_interface.ts";
 
-const DATA_API_KEY = Deno.env.get("MONGO_API_KEY")!;
-const APP_ID = Deno.env.get("MONGO_APP_ID");
-
-const BASE_URI =
-  `https://ap-south-1.aws.data.mongodb-api.com/app/${APP_ID}/endpoint/data/v1`;
-const DATA_SOURCE = "domain-forge-demo-db";
-const DATABASE = "df_test";
-const options = {
-  method: "POST",
-  headers: {
-    "Accept": "*/*",
-    "Content-Type": "application/json",
-    "Access-Control-Request-Headers": "*",
-    "api-key": DATA_API_KEY,
-  },
-  body: "",
-};
-
-const MONGO_URLs = {
-  update: new URL(`${BASE_URI}/action/updateOne`),
-  find: new URL(`${BASE_URI}/action/find`),
-  insert: new URL(`${BASE_URI}/action/insertOne`),
-  delete: new URL(`${BASE_URI}/action/deleteOne`),
-};
+// Initialize MongoClient
+const client = new MongoClient();
+const MONGO_URI = Deno.env.get("MONGO_URI");
+if (!MONGO_URI) console.error("MONGO_URI is not set in environment variables (This will crash if DB is accessed)");
+
+let db: any;
+let userAuthCollection: any;
+let contentMapsCollection: any;
+
+try {
+  if (MONGO_URI) {
+    await client.connect(MONGO_URI);
+    db = client.database("df_test");
+    userAuthCollection = db.collection("user_auth");
+    contentMapsCollection = db.collection("content_maps");
+    console.log("Connected to MongoDB successfully");
+  }
+} catch (error) {
+  console.error("Failed to connect to MongoDB", error);
+}
 
 // Function to update access token on db if user exists
 async function checkUser(accessToken: string, provider: string) {
   const userId = await getProviderUser(accessToken, provider);
 
-  const query = {
-    collection: "user_auth",
-    database: DATABASE,
-    dataSource: DATA_SOURCE,
-    filter: { [`${provider}Id`]: userId },
-    update: {
-      $set: {
-        [`${provider}Id`]: userId,
-        "authToken": accessToken,
-      },
+  // Use ADMIN_LIST to check if user is allowed
+  const ADMIN_LIST = Deno.env.get("ADMIN_LIST")?.split("|") || [];
+  if (!ADMIN_LIST.includes(userId)) {
+    console.log(`User ${userId} is not in the allowed list.`);
+    return { status: { matchedCount: 0, upsertedId: undefined }, userId };
+  }
+
+  const query = { [`${provider}Id`]: userId };
+  const update = {
+    $set: {
+      [`${provider}Id`]: userId,
+      "authToken": accessToken,
     },
-    "upsert": true,
   };
 
-  options.body = JSON.stringify(query);
-
-  const status_resp = await fetch(MONGO_URLs.update.toString(), options);
-  const status = await status_resp.json();
+  const status = await userAuthCollection.updateOne(query, update, { upsert: true });
   return { status, userId };
 }
 
 // Get all content maps corresponding to user
 async function getMaps(author: string, ADMIN_LIST: string[]) {
   const filter = ADMIN_LIST?.includes(author) ? {} : { "author": author };
-  const query = {
-    collection: "content_maps",
-    database: DATABASE,
-    dataSource: DATA_SOURCE,
-    filter: filter,
-  };
-  options.body = JSON.stringify(query);
-  const resp = await fetch(MONGO_URLs.find.toString(), options);
-  const data = await resp.json();
-  return data;
+
+  // Convert deprecated simple filter to standard mongo filter if needed
+  // But here we use native driver which expects filter object directly.
+  const data = await contentMapsCollection.find(filter).toArray();
+  return { documents: data };
 }
 
 // Add content maps
 async function addMaps(document: DfContentMap) {
-  const query = {
-    collection: "content_maps",
-    database: DATABASE,
-    dataSource: DATA_SOURCE,
-    filter: { "subdomain": document.subdomain },
-  };
-  options.body = JSON.stringify(query);
-
-  let resp = await fetch(MONGO_URLs.find.toString(), options);
-  let data = await resp.json();
+  // Check existence
+  const existing = await contentMapsCollection.findOne({ "subdomain": document.subdomain });
 
-  if (data.documents.length == 0) {
-    const query = {
-      collection: "content_maps",
-      database: DATABASE,
-      dataSource: DATA_SOURCE,
-      document: document,
-    };
-
-    options.body = JSON.stringify(query);
-    resp = await fetch(MONGO_URLs.insert.toString(), options);
-    data = await resp.json();
-
-    return (data.insertedId !== undefined);
+  if (!existing) {
+    const insertId = await contentMapsCollection.insertOne(document);
+    return (insertId !== undefined);
   } else {
     return false;
   }
 }
 
 // Delete content maps
 async function deleteMaps(document: DfContentMap, ADMIN_LIST: string[]) {
-  const filter = JSON.parse(JSON.stringify(document));
+  const filter: any = { ...document };
+  // Native driver deleteOne expects a filter object
   if (ADMIN_LIST.includes(document.author)) {
     delete filter.author;
   }
-  const query = {
-    collection: "content_maps",
-    database: DATABASE,
-    dataSource: DATA_SOURCE,
-    filter: filter,
-  };
-  options.body = JSON.stringify(query);
 
-  const resp = await fetch(MONGO_URLs.delete.toString(), options);
-  const data = await resp.json();
+  // We need to be careful with filter. Since we are passing 'document' which contains many fields
+  // Using all of them as a filter might fail if any differ slightly.
+  // Ideally, deleting by _id or subdomain is safest.
+  // Let's rely on subdomain as the unique key generally.
 
-  return data;
+  // However, preserving original logic logic:
+  const deleteResult = await contentMapsCollection.deleteOne(filter);
+  return deleteResult;
 }
 
 export { addMaps, checkUser, deleteMaps, getMaps };

src/backend/dependencies.ts

@@ -10,6 +10,7 @@ import { create, verify } from "https://deno.land/x/djwt@v2.9.1/mod.ts";
 import { exec } from "https://deno.land/x/exec@0.0.5/mod.ts";
 import * as Sentry from 'https://deno.land/x/sentry/index.mjs';
 import { oakCors } from "https://deno.land/x/cors@v1.2.2/mod.ts";
+import { MongoClient, ObjectId } from "https://deno.land/x/mongo@v0.32.0/mod.ts";
 
 export {
   Application,
@@ -23,4 +24,6 @@ export {
   Session,
   Status,
   verify,
+  MongoClient,
+  ObjectId,
 };