Update artifacts/api-server/src/routes/admin/index.ts

artifacts/api-server/src/routes/admin/index.ts

@@ -1,34 +1,40 @@
 import { Router, type Request, type Response } from "express";
-import { getAuth, clerkClient } from "@clerk/express";
+import { createClient } from "@supabase/supabase-js";
 import { db, usersTable, subscriptionsTable, appConfigTable, blockedEmailsTable } from "@workspace/db";
-import type { InferSelectModel } from "drizzle-orm";
 import { eq } from "drizzle-orm";
 import { broadcastToUsers } from "../../lib/sseManager";
 
 const router = Router();
 
+const supabase = createClient(
+  process.env.SUPABASE_URL || "",
+  process.env.SUPABASE_SERVICE_ROLE_KEY || ""
+);
+
 const OWNER_EMAIL = "saresare2555@hotmail.com";
 
 async function requireOwner(req: Request, res: Response): Promise<string | null> {
-  const auth = getAuth(req);
-  const userId: string | null = auth?.userId ?? null;
-  if (!userId) {
+  const authHeader = req.headers.authorization;
+  if (!authHeader?.startsWith("Bearer ")) {
     res.status(401).json({ error: "غير مصرح" });
     return null;
   }
-  let email: string | null = null;
-  try {
-    const user = await clerkClient.users.getUser(userId);
-    email = user.primaryEmailAddress?.emailAddress ?? null;
-  } catch {
+
+  const token = authHeader.split(" ")[1];
+  const { data: { user }, error } = await supabase.auth.getUser(token);
+
+  if (error || !user) {
     res.status(401).json({ error: "فشل التحقق من الهوية" });
     return null;
   }
-  if (email?.toLowerCase() !== OWNER_EMAIL.toLowerCase()) {
+
+  const email = user.email?.toLowerCase();
+  if (email !== OWNER_EMAIL.toLowerCase()) {
     res.status(403).json({ error: "ممنوع — للمالك فقط" });
     return null;
   }
-  return userId;
+
+  return user.id;
 }
 
 router.get("/users", async (req: Request, res: Response) => {
@@ -36,26 +42,40 @@ router.get("/users", async (req: Request, res: Response) => {
   if (!owner) return;
 
   try {
-    const clerkUsers = await clerkClient.users.getUserList({ limit: 200 });
-    const dbUsers = await db.select({ id: usersTable.id, email: usersTable.email, ipAddress: usersTable.ipAddress, lastSeenAt: usersTable.lastSeenAt, isBanned: usersTable.isBanned, bannedAt: usersTable.bannedAt }).from(usersTable);
+    // جلب كل مستخدمي Supabase Auth
+    const { data: { users: authUsers }, error } = await supabase.auth.admin.listUsers();
+    if (error) throw error;
+
+    const dbUsers = await db
+      .select({
+        id: usersTable.id,
+        email: usersTable.email,
+        ipAddress: usersTable.ipAddress,
+        lastSeenAt: usersTable.lastSeenAt,
+        isBanned: usersTable.isBanned,
+        bannedAt: usersTable.bannedAt
+      })
+      .from(usersTable);
+
     const dbSubs = await db.select().from(subscriptionsTable);
 
     const dbMap = new Map(dbUsers.map((u) => [u.id, u]));
     const subMap = new Map(dbSubs.map((s) => [s.userId, s]));
 
-    const users = clerkUsers.data.map((cu) => {
-      const email = cu.primaryEmailAddress?.emailAddress ?? null;
-      const sub = subMap.get(cu.id);
-      const dbUser = dbMap.get(cu.id);
+    const users = authUsers.map((au) => {
+      const email = au.email ?? null;
+      const sub = subMap.get(au.id);
+      const dbUser = dbMap.get(au.id);
+
       return {
-        id: cu.id,
+        id: au.id,
         email,
         ipAddress: dbUser?.ipAddress ?? null,
         lastSeenAt: dbUser?.lastSeenAt ? dbUser.lastSeenAt.toISOString() : null,
         isBanned: dbUser?.isBanned ?? false,
         bannedAt: dbUser?.bannedAt ? dbUser.bannedAt.toISOString() : null,
-        createdAt: new Date(cu.createdAt).toISOString(),
-        lastSignIn: cu.lastSignInAt ? new Date(cu.lastSignInAt).toISOString() : null,
+        createdAt: new Date(au.created_at).toISOString(),
+        lastSignIn: au.last_sign_in_at ? new Date(au.last_sign_in_at).toISOString() : null,
         subscription: sub
           ? {
               status: sub.status,
@@ -63,7 +83,7 @@ router.get("/users", async (req: Request, res: Response) => {
               currentPeriodEnd: sub.currentPeriodEnd?.toISOString() ?? null,
             }
           : null,
-        inDb: dbMap.has(cu.id),
+        inDb: dbMap.has(au.id),
       };
     });
 
@@ -85,28 +105,21 @@ router.patch("/subscription/:userId", async (req: Request, res: Response) => {
   };
 
   try {
-    // 1) تأكد من وجود المستخدم في جدول users (ينشئه إذا لم يكن موجوداً)
     await db
       .insert(usersTable)
       .values({ id: userId, isBanned: false })
-      .onConflictDoUpdate({
-        target: usersTable.id,
-        set: { id: userId },
-      });
+      .onConflictDoUpdate({ target: usersTable.id, set: { id: userId } });
 
-    // 2) تحضير قيم التحديث
     const updates: Record<string, unknown> = { updatedAt: new Date() };
     if (status !== undefined) updates.status = status;
     if (trialEnd !== undefined) updates.trialEnd = trialEnd ? new Date(trialEnd) : null;
     if (currentPeriodEnd !== undefined) updates.currentPeriodEnd = currentPeriodEnd ? new Date(currentPeriodEnd) : null;
 
-    // 3) جرب التحديث أولاً
     const result = await db
       .update(subscriptionsTable)
       .set(updates)
       .where(eq(subscriptionsTable.userId, userId));
 
-    // 4) إذا لم يوجد سجل اشتراك، أنشئ واحداً جديداً
     if (result.rowCount === 0) {
       await db.insert(subscriptionsTable).values({
         userId,
@@ -127,11 +140,10 @@ router.delete("/paypal-config", async (req: Request, res: Response) => {
   const owner = await requireOwner(req, res);
   if (!owner) return;
   try {
-    const { appConfigTable: cfg } = await import("@workspace/db");
-    await db.delete(cfg).where(eq(cfg.key, "paypal_product_id"));
-    await db.delete(cfg).where(eq(cfg.key, "paypal_plan_id_v2"));
-    await db.delete(cfg).where(eq(cfg.key, "paypal_plan_id"));
-    res.json({ success: true, message: "تم مسح إعدادات PayPal — ستُعاد إنشاؤها عند أول اشتراك" });
+    await db.delete(appConfigTable).where(eq(appConfigTable.key, "paypal_product_id"));
+    await db.delete(appConfigTable).where(eq(appConfigTable.key, "paypal_plan_id_v2"));
+    await db.delete(appConfigTable).where(eq(appConfigTable.key, "paypal_plan_id"));
+    res.json({ success: true, message: "تم مسح إعدادات PayPal" });
   } catch (err: any) {
     res.status(500).json({ error: err.message });
   }
@@ -167,23 +179,18 @@ router.patch("/extension-update", async (req: Request, res: Response) => {
   }
 });
 
-// ✅ حذف مستخدم: ban بدل delete - يمكن فك الحظر لاحقاً
 router.delete("/users/:id", async (req: Request, res: Response) => {
   const owner = await requireOwner(req, res);
   if (!owner) return;
-
   const targetId = req.params.id;
   if (!targetId) {
     res.status(400).json({ error: "معرف المستخدم مطلوب" });
     return;
   }
-
   try {
     await db.delete(subscriptionsTable).where(eq(subscriptionsTable.userId, targetId));
     await db.delete(usersTable).where(eq(usersTable.id, targetId));
-    // ✅ ban بدل delete - يمكن فك الحظر لاحقاً
-    try { await clerkClient.users.banUser(targetId); } catch { /* ignore */ }
-    res.json({ success: true, message: "تم حظر المستخدم - يمكن فك الحظر لاحقاً" });
+    res.json({ success: true, message: "تم حذف المستخدم" });
   } catch (err: any) {
     res.status(500).json({ error: err.message });
   }
@@ -200,7 +207,6 @@ router.get("/blocked-emails", async (req: Request, res: Response) => {
   }
 });
 
-// ✅ حظر بريد: ban بدل delete - مع حذف الاشتراك فقط
 router.post("/blocked-emails", async (req: Request, res: Response) => {
   const owner = await requireOwner(req, res);
   if (!owner) return;
@@ -211,64 +217,27 @@ router.post("/blocked-emails", async (req: Request, res: Response) => {
   }
   try {
     const normalized = email.toLowerCase().trim();
-    const isEmail = normalized.includes("@");
-
     await db.insert(blockedEmailsTable)
       .values({ email: normalized, reason: reason ?? null })
-      .onConflictDoUpdate({
-        target: blockedEmailsTable.email,
-        set: { reason: reason ?? null },
-      });
-
-    if (isEmail) {
-      const clerkUsers = await clerkClient.users.getUserList({ emailAddress: [normalized], limit: 5 });
-      for (const u of clerkUsers.data) {
-        try {
-          // ✅ ban بدل delete - يمكن فك الحظر لاحقاً
-          await clerkClient.users.banUser(u.id);
-          // حذف الاشتراك فقط
-          await db.delete(subscriptionsTable).where(eq(subscriptionsTable.userId, u.id));
-        } catch { /* ignore */ }
-      }
-    } else {
-      const dbUsers = await db.select({ id: usersTable.id }).from(usersTable)
-        .where(eq(usersTable.ipAddress, normalized));
-      for (const u of dbUsers) {
-        try { await clerkClient.users.banUser(u.id); } catch { /* ignore */ }
-      }
-    }
-
+      .onConflictDoUpdate({ target: blockedEmailsTable.email, set: { reason: reason ?? null } });
     res.json({ success: true });
   } catch (err: any) {
     res.status(500).json({ error: err.message });
   }
 });
 
-// ✅ فك حظر بريد: إعادة تفعيل المستخدمين المحظورين
 router.delete("/blocked-emails/:email", async (req: Request, res: Response) => {
   const owner = await requireOwner(req, res);
   if (!owner) return;
   try {
     const email = decodeURIComponent(req.params.email).toLowerCase();
-    
-    // حذف من جدول الحظر
     await db.delete(blockedEmailsTable).where(eq(blockedEmailsTable.email, email));
-    
-    // ✅ إعادة تفعيل المستخدمين المحظورين بنفس البريد
-    try {
-      const bannedUsers = await clerkClient.users.getUserList({ emailAddress: [email], limit: 5 });
-      for (const u of bannedUsers.data) {
-        try { await clerkClient.users.unbanUser(u.id); } catch { /* ignore */ }
-      }
-    } catch { /* ignore */ }
-    
-    res.json({ success: true, message: "تم فك الحظر - يمكن للمستخدم التسجيل من جديد" });
+    res.json({ success: true });
   } catch (err: any) {
     res.status(500).json({ error: err.message });
   }
 });
 
-// ✅ حظر مؤقت: banUser (صحيح)
 router.post("/ban/:userId", async (req: Request, res: Response) => {
   const owner = await requireOwner(req, res);
   if (!owner) return;
@@ -277,28 +246,19 @@ router.post("/ban/:userId", async (req: Request, res: Response) => {
     await db
       .insert(usersTable)
       .values({ id: userId, isBanned: true, bannedAt: new Date() })
-      .onConflictDoUpdate({
-        target: usersTable.id,
-        set: { isBanned: true, bannedAt: new Date() },
-      });
-    try { await clerkClient.users.banUser(userId); } catch { /* ignore */ }
+      .onConflictDoUpdate({ target: usersTable.id, set: { isBanned: true, bannedAt: new Date() } });
     res.json({ success: true });
   } catch (err: any) {
     res.status(500).json({ error: err.message });
   }
 });
 
-// ✅ فك حظر مؤقت: unbanUser (صحيح)
 router.post("/unban/:userId", async (req: Request, res: Response) => {
   const owner = await requireOwner(req, res);
   if (!owner) return;
   const { userId } = req.params;
   try {
-    await db
-      .update(usersTable)
-      .set({ isBanned: false, bannedAt: null })
-      .where(eq(usersTable.id, userId));
-    try { await clerkClient.users.unbanUser(userId); } catch { /* ignore */ }
+    await db.update(usersTable).set({ isBanned: false, bannedAt: null }).where(eq(usersTable.id, userId));
     res.json({ success: true });
   } catch (err: any) {
     res.status(500).json({ error: err.message });
@@ -309,10 +269,7 @@ router.post("/force-signout-banned", async (req: Request, res: Response) => {
   const owner = await requireOwner(req, res);
   if (!owner) return;
   try {
-    const banned = await db
-      .select({ id: usersTable.id })
-      .from(usersTable)
-      .where(eq(usersTable.isBanned, true));
+    const banned = await db.select({ id: usersTable.id }).from(usersTable).where(eq(usersTable.isBanned, true));
     const ids = banned.map((u) => u.id);
     const sent = broadcastToUsers(ids, "forceSignOut", { reason: "banned" });
     res.json({ success: true, usersNotified: ids.length, connectionsSent: sent });
@@ -326,19 +283,11 @@ router.post("/cleanup-orphans", async (req: Request, res: Response) => {
   if (!owner) return;
   try {
     const dbUsers = await db.select({ id: usersTable.id, email: usersTable.email }).from(usersTable);
-
     const removed: string[] = [];
 
     for (const u of dbUsers) {
-      let existsInClerk = false;
-      try {
-        const cu = await clerkClient.users.getUser(u.id);
-        if (cu?.id) existsInClerk = true;
-      } catch {
-        existsInClerk = false;
-      }
-
-      if (!existsInClerk) {
+      const { data, error } = await supabase.auth.admin.getUserById(u.id);
+      if (error || !data?.user) {
         await db.delete(usersTable).where(eq(usersTable.id, u.id));
         removed.push(u.email ?? u.id);
       }