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

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

@@ -1,7 +1,6 @@
 import { Router, type Request, type Response } from "express";
 import { db, subscriptionsTable, usersTable } from "@workspace/db";
 import { eq } from "drizzle-orm";
-import { stackServerApp } from "@stackframe/stack";
 
 const router = Router();
 
@@ -9,173 +8,39 @@ function buildTrialEnd(): Date {
   return new Date(Date.now() + 30 * 24 * 60 * 60 * 1000);
 }
 
-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;
-}
-
-// ✅ بديل requireAuth من Clerk - يستخدم Stack Auth
-async function requireAuth(req: Request, res: Response): Promise<{ userId: string; userEmail: string | null } | null> {
-  const authHeader = req.headers.authorization;
-  if (!authHeader?.startsWith("Bearer ")) {
-    res.status(401).json({ error: "Unauthorized" });
-    return null;
-  }
-
-  const token = authHeader.split(" ")[1];
-  
-  try {
-    const user = await stackServerApp.getUser(token);
-    if (!user) {
-      res.status(401).json({ error: "Invalid token" });
-      return null;
-    }
-    return {
-      userId: user.id,
-      userEmail: user.primaryEmail ?? null,
-    };
-  } catch {
-    res.status(401).json({ error: "Invalid token" });
-    return null;
-  }
-}
-
 router.get("/", async (req: Request, res: Response) => {
-  const auth = await requireAuth(req, res);
-  if (!auth) return;
-
-  const { userId, userEmail } = auth;
-  const clientIp = getClientIp(req);
   const now = new Date();
+  
+  // ✅ استخراج userId من headers (Kinde يمرره)
+  const userId = req.headers["x-user-id"] as string || "demo-user";
+  const userEmail = req.headers["x-user-email"] as string || null;
 
-  // 👑 استثناء حساب المالك الماستر
+  // 👑 استثناء حساب المالك
   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,
-        },
-      });
-    }
-
-    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 {
-    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));
+    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));
     if (!sub) {
       const trialEnd = buildTrialEnd();
-      const [created] = await db
-        .insert(subscriptionsTable)
-        .values({ userId, status: "trialing", trialEnd, updatedAt: now })
-        .returning();
+      const [created] = await db.insert(subscriptionsTable).values({ userId, status: "trialing", trialEnd, updatedAt: now }).returning();
       sub = created;
     }
 
-    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 (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,
-      subscription: {
-        status,
-        trialEnd: sub?.trialEnd?.toISOString() ?? null,
-        currentPeriodEnd: sub?.currentPeriodEnd?.toISOString() ?? null,
-        paypalSubscriptionId: sub?.paypalSubscriptionId ?? null,
-        hasAccess,
-      },
-    });
+    let hasAccess = status === "trialing" && sub?.trialEnd && sub.trialEnd > now ? true
+      : status === "active" ? true : false;
 
+    return res.json({ userId, email: userEmail, subscription: { status, trialEnd: sub?.trialEnd?.toISOString() ?? null, currentPeriodEnd: sub?.currentPeriodEnd?.toISOString() ?? null, paypalSubscriptionId: null, hasAccess } });
   } catch (error) {
-    console.error("[me] Error:", 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,
-      },
-    });
+    return res.json({ userId, email: userEmail, subscription: { status: "trialing", trialEnd: buildTrialEnd().toISOString(), currentPeriodEnd: null, paypalSubscriptionId: null, hasAccess: true } });
   }
 });