PotLock
diff --git a/‎apps/api/package.json‎
Lines changed: 3 additions & 2 deletions b/‎apps/api/package.json‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎apps/api/src/middlewares/auth.middleware.ts‎
Lines changed: 20 additions & 43 deletions b/‎apps/api/src/middlewares/auth.middleware.ts‎
Lines changed: 20 additions & 43 deletions
diff --git a/‎apps/api/src/routes/api/auth.ts‎
Lines changed: 67 additions & 0 deletions b/‎apps/api/src/routes/api/auth.ts‎
Lines changed: 67 additions & 0 deletions
@@ -35,12 +35,13 @@
     "zod": "^3.25.62"
   },
   "dependencies": {
+    "@crosspost/scheduler-sdk": "^0.1.1",
     "@crosspost/sdk": "^0.3.0",
     "@crosspost/types": "^0.3.0",
-    "@crosspost/scheduler-sdk": "^0.1.1",
     "@curatedotfun/shared-db": "workspace:*",
     "@curatedotfun/types": "workspace:*",
     "@curatedotfun/utils": "workspace:*",
+    "@fastnear/utils": "^0.9.7",
     "@hono/node-server": "^1.8.2",
     "@hono/zod-openapi": "^0.9.5",
     "@hono/zod-validator": "^0.5.0",
@@ -60,7 +61,7 @@
     "lodash": "^4.17.21",
     "mustache": "^4.2.0",
     "near-api-js": "^5.1.1",
-    "near-sign-verify": "^0.3.6",
+    "near-sign-verify": "^0.4.1",
     "ora": "^8.1.1",
     "pg": "^8.15.6",
     "pinata-web3": "^0.5.4",
 
@@ -1,54 +1,31 @@
 import { Context, MiddlewareHandler, Next } from "hono";
-import { verify } from "near-sign-verify";
+import { verify } from "hono/jwt";
+import { getCookie } from "hono/cookie";
 
 export function createAuthMiddleware(): MiddlewareHandler {
   return async (c: Context, next: Next) => {
-    const method = c.req.method;
+    const token = getCookie(c, "token");
     let accountId: string | null = null;
 
-    if (method === "GET") {
-      const nearAccountHeader = c.req.header("X-Near-Account");
-      if (
-        nearAccountHeader &&
-        nearAccountHeader.toLowerCase() !== "anonymous"
-      ) {
-        accountId = nearAccountHeader;
+    if (token) {
+      const secret = process.env.JWT_SECRET;
+      if (!secret) {
+        console.error("JWT_SECRET is not set.");
+        c.status(500);
+        return c.json({ error: "Internal Server Error" });
+      }
+      try {
+        const decodedPayload = await verify(token, secret);
+        if (decodedPayload && typeof decodedPayload.sub === "string") {
+          accountId = decodedPayload.sub;
+        }
+      } catch (error) {
+        // Invalid token, proceed as anonymous
+        console.warn("JWT verification failed:", error);
       }
-      // If header is missing or "anonymous", accountId remains null
-      c.set("accountId", accountId);
-      await next();
-      return;
-    }
-
-    // For non-GET requests (POST, PUT, DELETE, PATCH, etc.)
-    const authHeader = c.req.header("Authorization");
-    if (!authHeader || !authHeader.startsWith("Bearer ")) {
-      c.status(401);
-      return c.json({
-        error: "Unauthorized",
-        details: "Missing or malformed Authorization header.",
-      });
     }
 
-    const token = authHeader.substring(7); // Remove "Bearer "
-
-    try {
-      const verificationResult = await verify(token, {
-        expectedRecipient: "curatefun.near",
-        requireFullAccessKey: false,
-        nonceMaxAge: 300000, // 5 mins
-      });
-
-      accountId = verificationResult.accountId;
-      c.set("accountId", accountId);
-      await next();
-    } catch (error) {
-      console.error("Token verification error:", error);
-      c.status(401);
-      return c.json({
-        error: "Unauthorized",
-        details: "Invalid token signature or recipient.",
-      });
-    }
+    c.set("accountId", accountId);
+    await next();
   };
 }
@@ -0,0 +1,67 @@
+import { Hono } from "hono";
+import { zValidator } from "@hono/zod-validator";
+import { z } from "zod";
+import { AuthService } from "../../services/auth.service";
+import { Env } from "../../types/app";
+import { setCookie } from "hono/cookie";
+
+export const authRoutes = new Hono<Env>();
+
+const CreateAuthRequestSchema = z.object({
+  accountId: z.string(),
+});
+
+const VerifyAuthRequestSchema = z.object({
+  token: z.string(),
+  accountId: z.string(),
+});
+
+authRoutes.post(
+  "/initiate-login",
+  zValidator("json", CreateAuthRequestSchema),
+  async (c) => {
+    const payload = c.req.valid("json");
+    const sp = c.var.sp;
+    const authService = sp.getService<AuthService>("authService");
+    const result = await authService.createAuthRequest(payload);
+    return c.json(result);
+  },
+);
+
+authRoutes.post(
+  "/verify-login",
+  zValidator("json", VerifyAuthRequestSchema),
+  async (c) => {
+    const payload = c.req.valid("json");
+    const sp = c.var.sp;
+    const authService = sp.getService<AuthService>("authService");
+    try {
+      const { jwt } = await authService.verifyAuthRequest(payload);
+      setCookie(c, "token", jwt, {
+        httpOnly: true,
+        secure: process.env.NODE_ENV === "production",
+        sameSite: "Strict",
+        path: "/",
+        maxAge: 60 * 60 * 24 * 7, // 7 days
+      });
+      return c.json({ success: true });
+    } catch (error: unknown) {
+      c.status(401);
+      return c.json({
+        success: false,
+        error: error instanceof Error ? error.message : "Authentication failed",
+      });
+    }
+  },
+);
+
+authRoutes.post("/logout", async (c) => {
+  setCookie(c, "token", "", {
+    httpOnly: true,
+    secure: process.env.NODE_ENV === "production",
+    sameSite: "Strict",
+    path: "/",
+    maxAge: 0,
+  });
+  return c.json({ success: true });
+});