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

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

@@ -1,7 +1,7 @@
 import { Router, type Request, type Response } from "express";
 import { db, subscriptionsTable, usersTable } from "@workspace/db";
 import { eq } from "drizzle-orm";
-import { requireAuth, type AuthedRequest } from "../../lib/auth";
+import { stackServerApp } from "@stackframe/stack";
 
 const router = Router();
 
@@ -18,20 +18,47 @@ function getClientIp(req: Request): string | null {
   return req.socket?.remoteAddress ?? null;
 }
 
-router.get("/", requireAuth, async (req: Request, res: Response) => {
-  const { userId, userEmail } = req as AuthedRequest;
+// ✅ بديل 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();
 
   // 👑 استثناء حساب المالك الماستر
   if (userEmail && userEmail.toLowerCase() === "saresare2555@hotmail.com") {
-    // جلب اشتراك المالك من قاعدة البيانات (إن وُجد)
     const [ownerSub] = await db
       .select()
       .from(subscriptionsTable)
       .where(eq(subscriptionsTable.userId, userId));
 
-    // إذا كان المالك قد أنهى تجربته يدوياً (trial_expired)، احترم ذلك
     if (ownerSub && ownerSub.status === "trial_expired") {
       res.set("Cache-Control", "private, max-age=60");
       return res.json({
@@ -42,12 +69,11 @@ router.get("/", requireAuth, async (req: Request, res: Response) => {
           trialEnd: ownerSub.trialEnd?.toISOString() ?? null,
           currentPeriodEnd: null,
           paypalSubscriptionId: null,
-          hasAccess: false, // 🔥 المالك يرى واجهة منتهية التجربة للاختبار
+          hasAccess: false,
         },
       });
     }
 
-    // الوضع الطبيعي: المالك لديه صلاحية كاملة
     res.set("Cache-Control", "private, max-age=60");
     return res.json({
       userId,
@@ -114,11 +140,9 @@ router.get("/", requireAuth, async (req: Request, res: Response) => {
         } else if (sub.trialEnd && sub.trialEnd <= now) {
           status = "trial_expired";
         }
-      }
-      else if (status === "trial_expired" || status === "expired") {
+      } else if (status === "trial_expired" || status === "expired") {
         hasAccess = false;
-      }
-      else if (status === "active") {
+      } else if (status === "active") {
         if (!sub.currentPeriodEnd || sub.currentPeriodEnd > now) {
           hasAccess = true;
         }