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

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

@@ -1,55 +1,66 @@
 import { Router, type Request, type Response } from "express";
 import { db, subscriptionsTable, usersTable } from "@workspace/db";
 import { eq } from "drizzle-orm";
-import { createClient } from "@supabase/supabase-js";
+import { requireAuth, type AuthedRequest } from "../../lib/auth";
 
 const router = Router();
 
-const supabase = createClient(
-  process.env.SUPABASE_URL || "",
-  process.env.SUPABASE_SERVICE_ROLE_KEY || ""
-);
-
 function buildTrialEnd(): Date {
   return new Date(Date.now() + 30 * 24 * 60 * 60 * 1000);
 }
 
-router.get("/", async (req: Request, res: Response) => {
-  const now = new Date();
-  const authHeader = req.headers.authorization;
-  
-  let userId: string | null = null;
-  let userEmail: string | null = null;
-
-  if (authHeader?.startsWith("Bearer ")) {
-    const token = authHeader.split(" ")[1];
-    try {
-      const { data: { user }, error } = await supabase.auth.getUser(token);
-      if (!error && user) {
-        userId = user.id;
-        userEmail = user.email ?? null;
-      }
-    } catch {}
+function getClientIp(req: Request): string | null {
+  const forwarded = req.headers["x-forwarded-for"];
+  if (forwarded) {
+    const ip = Array.isArray(forwarded) ? forwarded[0] : forwarded.split(",")[0];
+    return ip?.trim() ?? null;
   }
+  return req.socket?.remoteAddress ?? null;
+}
 
-  if (!userId) {
-    userId = (req.query.userId as string) || null;
-    userEmail = (req.query.userEmail as string) || null;
-  }
+router.get("/", requireAuth, async (req: Request, res: Response) => {
+  const { userId, userEmail } = req as AuthedRequest;
+  const clientIp = getClientIp(req);
+  const now = new Date();
 
-  if (!userId) {
-    return res.status(401).json({ error: "Unauthorized" });
-  }
+  // 👑 استثناء حساب المالك الماستر
+  if (userEmail && userEmail.toLowerCase() === "saresare2555@hotmail.com") {
+    const [ownerSub] = await db
+      .select()
+      .from(subscriptionsTable)
+      .where(eq(subscriptionsTable.userId, userId));
+
+    if (ownerSub && ownerSub.status === "trial_expired") {
+      res.set("Cache-Control", "private, max-age=60");
+      return res.json({
+        userId,
+        email: userEmail,
+        subscription: {
+          status: "trial_expired",
+          trialEnd: ownerSub.trialEnd?.toISOString() ?? null,
+          currentPeriodEnd: null,
+          paypalSubscriptionId: null,
+          hasAccess: false,
+        },
+      });
+    }
 
-  if (userEmail?.toLowerCase() === "saresare2555@hotmail.com") {
+    res.set("Cache-Control", "private, max-age=60");
     return res.json({
-      userId, email: userEmail,
-      subscription: { status: "active", trialEnd: null, currentPeriodEnd: null, paypalSubscriptionId: null, hasAccess: true },
+      userId,
+      email: userEmail,
+      subscription: {
+        status: "active",
+        trialEnd: null,
+        currentPeriodEnd: null,
+        paypalSubscriptionId: null,
+        hasAccess: true,
+      },
     });
   }
 
   try {
-    // ========== 🆕 البحث عن مستخدم قديم بنفس البريد ==========
+    // ========== البحث عن مستخدم قديم بنفس البريد ==========
     if (userEmail) {
       const [legacyUser] = await db
         .select({
@@ -63,40 +74,37 @@ router.get("/", async (req: Request, res: Response) => {
       if (legacyUser) {
         console.log(`🔗 ربط: ${userEmail} | القديم=${legacyUser.id} | الجديد=${userId}`);
 
-        // جلب اشتراك المستخدم القديم
         const [existingSub] = await db
           .select()
           .from(subscriptionsTable)
           .where(eq(subscriptionsTable.userId, legacyUser.id));
 
         if (existingSub) {
-          // إذا كان userId مختلف، نحذف الاشتراك الجديد أولاً ثم ننقل القديم
           if (legacyUser.id !== userId) {
-            // حذف الاشتراك الجديد (التجريبي الذي أنشئ عند أول دخول)
             await db
               .delete(subscriptionsTable)
               .where(eq(subscriptionsTable.userId, userId));
 
-            // نقل الاشتراك القديم للمستخدم الجديد
             await db
               .update(subscriptionsTable)
               .set({ userId })
               .where(eq(subscriptionsTable.userId, legacyUser.id));
           }
 
-          // تحديث بيانات المستخدم
           await db
             .insert(usersTable)
             .values({
               id: userId,
               email: userEmail.toLowerCase(),
-              isBanned: false,
-              lastSeenAt: now
+              ipAddress: clientIp,
+              lastSeenAt: now,
+              isBanned: false
             })
             .onConflictDoUpdate({
               target: usersTable.id,
               set: {
                 email: userEmail.toLowerCase(),
+                ipAddress: clientIp,
                 lastSeenAt: now,
               },
             });
@@ -104,23 +112,27 @@ router.get("/", async (req: Request, res: Response) => {
           let status: string = existingSub?.status ?? "none";
           let hasAccess = false;
 
-          if (status === "trialing") {
-            hasAccess = existingSub.trialEnd ? existingSub.trialEnd > now : false;
-            if (!hasAccess) status = "trial_expired";
-          } else if (status === "trial_expired" || status === "expired") {
-            hasAccess = false;
-          } else if (status === "active") {
-            hasAccess = !existingSub.currentPeriodEnd || existingSub.currentPeriodEnd > now;
+          if (existingSub) {
+            if (status === "trialing") {
+              hasAccess = existingSub.trialEnd ? existingSub.trialEnd > now : false;
+              if (!hasAccess) status = "trial_expired";
+            } else if (status === "trial_expired" || status === "expired") {
+              hasAccess = false;
+            } else if (status === "active") {
+              hasAccess = !existingSub.currentPeriodEnd || existingSub.currentPeriodEnd > now;
+            }
           }
 
+          res.set("Cache-Control", "private, max-age=60");
           return res.json({
-            userId, email: userEmail,
+            userId,
+            email: userEmail,
             subscription: {
               status,
               trialEnd: existingSub?.trialEnd?.toISOString() ?? null,
               currentPeriodEnd: existingSub?.currentPeriodEnd?.toISOString() ?? null,
-              paypalSubscriptionId: null,
-              hasAccess
+              paypalSubscriptionId: existingSub?.paypalSubscriptionId ?? null,
+              hasAccess,
             },
             isReturningUser: true,
           });
@@ -128,53 +140,102 @@ router.get("/", async (req: Request, res: Response) => {
       }
     }
 
-    // ========== مستخدم جديد (لا يوجد له حساب قديم) ==========
-    await db.insert(usersTable).values({
-      id: userId,
-      email: userEmail?.toLowerCase() ?? null,
-      isBanned: false,
-      lastSeenAt: now
-    }).onConflictDoUpdate({
-      target: usersTable.id,
-      set: { email: userEmail?.toLowerCase() ?? null, lastSeenAt: now }
-    });
-
-    let [sub] = await db.select().from(subscriptionsTable).where(eq(subscriptionsTable.userId, userId));
+    // ========== مستخدم جديد ==========
+    await db
+      .insert(usersTable)
+      .values({
+        id: userId,
+        email: userEmail ? userEmail.toLowerCase() : null,
+        ipAddress: clientIp,
+        lastSeenAt: now,
+        isBanned: false
+      })
+      .onConflictDoUpdate({
+        target: usersTable.id,
+        set: {
+          email: userEmail ? userEmail.toLowerCase() : null,
+          ipAddress: clientIp,
+          lastSeenAt: now,
+        },
+      });
+
+    let [sub] = await db
+      .select()
+      .from(subscriptionsTable)
+      .where(eq(subscriptionsTable.userId, userId));
 
     if (!sub) {
+      console.log(`[me] إنشاء اشتراك تجريبي جديد لـ userId=${userId}`);
       const trialEnd = buildTrialEnd();
-      const [created] = await db.insert(subscriptionsTable)
+      const [created] = await db
+        .insert(subscriptionsTable)
         .values({ userId, status: "trialing", trialEnd, updatedAt: now })
         .returning();
       sub = created;
     }
 
+    [sub] = await db
+      .select()
+      .from(subscriptionsTable)
+      .where(eq(subscriptionsTable.userId, userId));
+
+    const [userCheck] = await db
+      .select({ isBanned: usersTable.isBanned })
+      .from(usersTable)
+      .where(eq(usersTable.id, userId));
+
+    if (userCheck?.isBanned) {
+      return res.status(403).json({ error: "banned", message: "تم إيقاف هذا الحساب." });
+    }
+
     let status: string = sub?.status ?? "none";
     let hasAccess = false;
 
-    if (status === "trialing") {
-      hasAccess = sub?.trialEnd ? new Date(sub.trialEnd) > now : false;
-      if (!hasAccess) status = "trial_expired";
-    } else if (status === "active") {
-      hasAccess = !sub?.currentPeriodEnd || new Date(sub.currentPeriodEnd) > now;
+    if (sub) {
+      if (status === "trialing") {
+        if (sub.trialEnd && sub.trialEnd > now) {
+          hasAccess = true;
+        } else if (sub.trialEnd && sub.trialEnd <= now) {
+          status = "trial_expired";
+        }
+      }
+      else if (status === "trial_expired" || status === "expired") {
+        hasAccess = false;
+      }
+      else if (status === "active") {
+        if (!sub.currentPeriodEnd || sub.currentPeriodEnd > now) {
+          hasAccess = true;
+        }
+      }
     }
 
+    res.set("Cache-Control", "private, max-age=60");
     return res.json({
-      userId, email: userEmail,
+      userId,
+      email: userEmail,
       subscription: {
         status,
         trialEnd: sub?.trialEnd?.toISOString() ?? null,
         currentPeriodEnd: sub?.currentPeriodEnd?.toISOString() ?? null,
-        paypalSubscriptionId: null,
-        hasAccess
+        paypalSubscriptionId: sub?.paypalSubscriptionId ?? null,
+        hasAccess,
       },
       isReturningUser: false,
     });
+
   } catch (error) {
-    console.error("[me] خطأ:", error);
+    console.error("[me] خطأ في جلب/إنشاء المستخدم:", error);
+    res.set("Cache-Control", "private, max-age=60");
     return res.json({
-      userId, email: userEmail,
-      subscription: { status: "trialing", trialEnd: buildTrialEnd().toISOString(), currentPeriodEnd: null, paypalSubscriptionId: null, hasAccess: true }
+      userId,
+      email: userEmail,
+      subscription: {
+        status: "trialing",
+        trialEnd: buildTrialEnd().toISOString(),
+        currentPeriodEnd: null,
+        paypalSubscriptionId: null,
+        hasAccess: true,
+      },
     });
   }
 });