weifuwu 0.22.0 → 0.22.1

package/dist/index.js

@@ -3428,17 +3428,30 @@ function user(options) {
   }
   function middleware() {
     return async (req, ctx, next) => {
-      const header = req.headers.get("Authorization");
-      if (!header?.startsWith("Bearer ")) {
-        return new Response("Unauthorized", { status: 401, headers: { "WWW-Authenticate": "Bearer" } });
+      const sessionUserId = ctx.session?.userId;
+      if (sessionUserId) {
+        const row = await findById(sessionUserId);
+        if (row) {
+          ctx.user = stripPassword(row);
+          return next(req, ctx);
+        }
+        if (typeof ctx.session?.destroy === "function") {
+          ;
+          ctx.session.destroy();
+        } else {
+          delete ctx.session?.userId;
+        }
       }
-      const token = header.slice(7);
-      const userData = await verify(token);
-      if (!userData) {
-        return new Response("Unauthorized", { status: 401, headers: { "WWW-Authenticate": "Bearer" } });
+      const header = req.headers.get("Authorization");
+      const token = header?.startsWith("Bearer ") ? header.slice(7) : null;
+      if (token) {
+        const userData = await verify(token);
+        if (userData) {
+          ctx.user = userData;
+          return next(req, ctx);
+        }
       }
-      ctx.user = userData;
-      return next(req, ctx);
+      return new Response("Unauthorized", { status: 401, headers: { "WWW-Authenticate": "Bearer" } });
     };
   }
   function router() {
@@ -3456,12 +3469,19 @@ function user(options) {
         return Response.json({ error: err.message }, { status });
       }
     });
-    r2.post("/login", async (req) => {
+    r2.post("/login", async (req, ctx) => {
       try {
         const body = await req.json();
         const result = await login(body);
+        if (ctx.session) {
+          ;
+          ctx.session.userId = result.user.id;
+          ctx.session.role = result.user.role;
+        }
         const res = Response.json(result);
-        res.headers.set("Set-Cookie", `session=${result.token}; HttpOnly; SameSite=Lax; Path=/`);
+        if (!ctx.session) {
+          res.headers.set("Set-Cookie", `session=${result.token}; HttpOnly; SameSite=Lax; Path=/`);
+        }
         return res;
       } catch (err) {
         if (err instanceof z2.ZodError) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weifuwu",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "description": "Web-standard HTTP framework for Node.js — (req, ctx) => Response",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",