@allbluecn/web-app 0.22.4 → 0.23.1

package/src/server/serverFns/bug/__tests__/bug-comments.test.ts

@@ -24,6 +24,11 @@ vi.mock("@tanstack/react-start", () => ({
   createServerFn: (config: any) => {
     const api: any = {
       _validator: undefined,
+      _middlewares: [] as any[],
+      middleware(mws: any[]) {
+        this._middlewares.push(...mws);
+        return this;
+      },
       validator(schema: any) {
         this._validator = schema;
         return this;
@@ -34,13 +39,41 @@ vi.mock("@tanstack/react-start", () => ({
           if (this._validator && data !== undefined) {
             data = this._validator.parse ? this._validator.parse(data) : data;
           }
-          return fn({ data });
+          // 迁移后经 .middleware([authContextMiddleware]) 注入 context.user：
+          // mock 依序执行 middleware 的 server 段（复现框架 executeMiddleware 的
+          // context 合并语义），真实鉴权链由被 mock 的 auth-helpers/getRequest 承接
+          let context: any = {};
+          for (const mw of this._middlewares) {
+            const serverFn = mw?.options?.server;
+            if (!serverFn) continue;
+            const result = await serverFn({
+              data,
+              context,
+              method: 'POST',
+              serverFnMeta: {},
+              signal: new AbortController().signal,
+              next: async (inner: any) => ({ context: { ...context, ...(inner?.context ?? {}) } }),
+            });
+            context = result.context;
+          }
+          return fn({ data, context });
         };
         return wrapped;
       },
     };
     return api;
   },
+  // auth-context.ts 依赖 createMiddleware({ type: 'function' }).server(fn)：
+  // mock 产出与真实 middleware 同构的 { options: { server } } 形状，
+  // 供上方 handler 包装器执行 server 段注入 context.user
+  createMiddleware: (opts: any) => {
+    const mw: any = { options: { type: opts?.type } };
+    mw.server = (fn: Function) => {
+      mw.options.server = fn;
+      return mw;
+    };
+    return mw;
+  },
 }));
 
 vi.mock("@tanstack/react-start/server", () => ({

package/src/server/serverFns/bug/__tests__/bug-crud.test.ts

@@ -21,6 +21,11 @@ vi.mock("@tanstack/react-start", () => ({
   createServerFn: (config: any) => {
     const api: any = {
       _validator: undefined,
+      _middlewares: [] as any[],
+      middleware(mws: any[]) {
+        this._middlewares.push(...mws);
+        return this;
+      },
       validator(schema: any) {
         this._validator = schema;
         return this;
@@ -31,13 +36,41 @@ vi.mock("@tanstack/react-start", () => ({
           if (this._validator && data !== undefined) {
             data = this._validator.parse ? this._validator.parse(data) : data;
           }
-          return fn({ data });
+          // 迁移后经 .middleware([authContextMiddleware]) 注入 context.user：
+          // mock 依序执行 middleware 的 server 段（复现框架 executeMiddleware 的
+          // context 合并语义），真实鉴权链由被 mock 的 auth-helpers/getRequest 承接
+          let context: any = {};
+          for (const mw of this._middlewares) {
+            const serverFn = mw?.options?.server;
+            if (!serverFn) continue;
+            const result = await serverFn({
+              data,
+              context,
+              method: 'POST',
+              serverFnMeta: {},
+              signal: new AbortController().signal,
+              next: async (inner: any) => ({ context: { ...context, ...(inner?.context ?? {}) } }),
+            });
+            context = result.context;
+          }
+          return fn({ data, context });
         };
         return wrapped;
       },
     };
     return api;
   },
+  // auth-context.ts 依赖 createMiddleware({ type: 'function' }).server(fn)：
+  // mock 产出与真实 middleware 同构的 { options: { server } } 形状，
+  // 供上方 handler 包装器执行 server 段注入 context.user
+  createMiddleware: (opts: any) => {
+    const mw: any = { options: { type: opts?.type } };
+    mw.server = (fn: Function) => {
+      mw.options.server = fn;
+      return mw;
+    };
+    return mw;
+  },
 }));
 
 vi.mock("@tanstack/react-start/server", () => ({

package/src/server/serverFns/bug/__tests__/bug-fix.test.ts

@@ -27,6 +27,11 @@ vi.mock("@tanstack/react-start", () => ({
   createServerFn: (config: any) => {
     const api: any = {
       _validator: undefined,
+      _middlewares: [] as any[],
+      middleware(mws: any[]) {
+        this._middlewares.push(...mws);
+        return this;
+      },
       validator(schema: any) {
         this._validator = schema;
         return this;
@@ -37,13 +42,41 @@ vi.mock("@tanstack/react-start", () => ({
           if (this._validator && data !== undefined) {
             data = this._validator.parse ? this._validator.parse(data) : data;
           }
-          return fn({ data });
+          // 迁移后经 .middleware([authContextMiddleware]) 注入 context.user：
+          // mock 依序执行 middleware 的 server 段（复现框架 executeMiddleware 的
+          // context 合并语义），真实鉴权链由被 mock 的 auth-helpers/getRequest 承接
+          let context: any = {};
+          for (const mw of this._middlewares) {
+            const serverFn = mw?.options?.server;
+            if (!serverFn) continue;
+            const result = await serverFn({
+              data,
+              context,
+              method: 'POST',
+              serverFnMeta: {},
+              signal: new AbortController().signal,
+              next: async (inner: any) => ({ context: { ...context, ...(inner?.context ?? {}) } }),
+            });
+            context = result.context;
+          }
+          return fn({ data, context });
         };
         return wrapped;
       },
     };
     return api;
   },
+  // auth-context.ts 依赖 createMiddleware({ type: 'function' }).server(fn)：
+  // mock 产出与真实 middleware 同构的 { options: { server } } 形状，
+  // 供上方 handler 包装器执行 server 段注入 context.user
+  createMiddleware: (opts: any) => {
+    const mw: any = { options: { type: opts?.type } };
+    mw.server = (fn: Function) => {
+      mw.options.server = fn;
+      return mw;
+    };
+    return mw;
+  },
 }));
 
 vi.mock("@tanstack/react-start/server", () => ({

package/src/server/serverFns/bug/__tests__/bug-groups.test.ts

@@ -21,6 +21,11 @@ vi.mock("@tanstack/react-start", () => ({
   createServerFn: (config: any) => {
     const api: any = {
       _validator: undefined,
+      _middlewares: [] as any[],
+      middleware(mws: any[]) {
+        this._middlewares.push(...mws);
+        return this;
+      },
       validator(schema: any) {
         this._validator = schema;
         return this;
@@ -31,13 +36,41 @@ vi.mock("@tanstack/react-start", () => ({
           if (this._validator && data !== undefined) {
             data = this._validator.parse ? this._validator.parse(data) : data;
           }
-          return fn({ data });
+          // 迁移后经 .middleware([authContextMiddleware]) 注入 context.user：
+          // mock 依序执行 middleware 的 server 段（复现框架 executeMiddleware 的
+          // context 合并语义），真实鉴权链由被 mock 的 auth-helpers/getRequest 承接
+          let context: any = {};
+          for (const mw of this._middlewares) {
+            const serverFn = mw?.options?.server;
+            if (!serverFn) continue;
+            const result = await serverFn({
+              data,
+              context,
+              method: 'POST',
+              serverFnMeta: {},
+              signal: new AbortController().signal,
+              next: async (inner: any) => ({ context: { ...context, ...(inner?.context ?? {}) } }),
+            });
+            context = result.context;
+          }
+          return fn({ data, context });
         };
         return wrapped;
       },
     };
     return api;
   },
+  // auth-context.ts 依赖 createMiddleware({ type: 'function' }).server(fn)：
+  // mock 产出与真实 middleware 同构的 { options: { server } } 形状，
+  // 供上方 handler 包装器执行 server 段注入 context.user
+  createMiddleware: (opts: any) => {
+    const mw: any = { options: { type: opts?.type } };
+    mw.server = (fn: Function) => {
+      mw.options.server = fn;
+      return mw;
+    };
+    return mw;
+  },
 }));
 
 vi.mock("@tanstack/react-start/server", () => ({

package/src/server/serverFns/bug/__tests__/bug-reactions.test.ts

@@ -26,6 +26,11 @@ vi.mock("@tanstack/react-start", () => ({
   createServerFn: (config: any) => {
     const api: any = {
       _validator: undefined,
+      _middlewares: [] as any[],
+      middleware(mws: any[]) {
+        this._middlewares.push(...mws);
+        return this;
+      },
       validator(schema: any) {
         this._validator = schema;
         return this;
@@ -36,13 +41,41 @@ vi.mock("@tanstack/react-start", () => ({
           if (this._validator && data !== undefined) {
             data = this._validator.parse ? this._validator.parse(data) : data;
           }
-          return fn({ data });
+          // 迁移后经 .middleware([authContextMiddleware]) 注入 context.user：
+          // mock 依序执行 middleware 的 server 段（复现框架 executeMiddleware 的
+          // context 合并语义），真实鉴权链由被 mock 的 auth-helpers/getRequest 承接
+          let context: any = {};
+          for (const mw of this._middlewares) {
+            const serverFn = mw?.options?.server;
+            if (!serverFn) continue;
+            const result = await serverFn({
+              data,
+              context,
+              method: 'POST',
+              serverFnMeta: {},
+              signal: new AbortController().signal,
+              next: async (inner: any) => ({ context: { ...context, ...(inner?.context ?? {}) } }),
+            });
+            context = result.context;
+          }
+          return fn({ data, context });
         };
         return wrapped;
       },
     };
     return api;
   },
+  // auth-context.ts 依赖 createMiddleware({ type: 'function' }).server(fn)：
+  // mock 产出与真实 middleware 同构的 { options: { server } } 形状，
+  // 供上方 handler 包装器执行 server 段注入 context.user
+  createMiddleware: (opts: any) => {
+    const mw: any = { options: { type: opts?.type } };
+    mw.server = (fn: Function) => {
+      mw.options.server = fn;
+      return mw;
+    };
+    return mw;
+  },
 }));
 
 vi.mock("@tanstack/react-start/server", () => ({

package/src/server/serverFns/bug/__tests__/bug-reorder.test.ts

@@ -43,25 +43,59 @@ const M = H.fns;
 const DB = H.db;
 
 vi.mock("@tanstack/react-start", () => {
+  // 每个 serverFn 实例独立持有自己的 capture，避免同模块多实例共用导致 validator 串号
   const createServerFn = () => {
-    const capture: { validator?: unknown; handler?: unknown } = {};
+    const capture: { validator?: unknown; handler?: unknown; middlewares?: unknown[] } = {};
     const api = {
       validator: (v: unknown) => {
         capture.validator = v;
         return api;
       },
+      middleware: (mws: unknown[]) => {
+        capture.middlewares = mws;
+        return api;
+      },
       handler: (h: unknown) => {
         capture.handler = h;
-        return async (args?: { data?: unknown }) => {
+        return async (args: { data: unknown }) => {
           const v = capture.validator as { parse?: (d: unknown) => unknown } | undefined;
-          const data = v && v.parse ? v.parse(args?.data) : args?.data;
-          return (h as (p: { data: unknown }) => Promise<unknown>)({ data });
+          const data = v && v.parse ? v.parse(args.data) : args.data;
+          // 迁移后经 .middleware([authContextMiddleware]) 注入 context.user：
+          // 依序执行 middleware 的 server 段，真实鉴权链由被 mock 的 auth-helpers 承接
+          let context: Record<string, unknown> = {};
+          for (const mw of capture.middlewares ?? []) {
+            const serverFn = (mw as { options?: { server?: unknown } })?.options?.server;
+            if (typeof serverFn !== "function") continue;
+            const result = await (
+              serverFn as (p: unknown) => Promise<{ context?: unknown }>
+            )({
+              data,
+              context,
+              method: "POST",
+              serverFnMeta: {},
+              signal: new AbortController().signal,
+              next: async (inner: { context?: unknown }) => ({
+                context: { ...context, ...(inner?.context ?? {}) },
+              }),
+            });
+            context = (result?.context ?? context) as Record<string, unknown>;
+          }
+          return (h as (p: { data: unknown; context: unknown }) => Promise<unknown>)({ data, context });
         };
       },
     };
     return api;
   };
-  return { createServerFn };
+  // auth-context.ts 依赖 createMiddleware({ type: 'function' }).server(fn)
+  const createMiddleware = (opts?: { type?: string }) => {
+    const mw: { options: { type?: string; server?: unknown }; server?: unknown } = { options: { type: opts?.type } };
+    mw.server = (fn: unknown) => {
+      mw.options.server = fn;
+      return mw;
+    };
+    return mw;
+  };
+  return { createServerFn, createMiddleware };
 });
 
 vi.mock("@tanstack/react-start/server", () => ({ getRequest: () => ({}) }));

package/src/server/serverFns/bug/__tests__/bug-repro.test.ts

@@ -24,6 +24,11 @@ vi.mock("@tanstack/react-start", () => ({
   createServerFn: (config: any) => {
     const api: any = {
       _validator: undefined,
+      _middlewares: [] as any[],
+      middleware(mws: any[]) {
+        this._middlewares.push(...mws);
+        return this;
+      },
       validator(schema: any) {
         this._validator = schema;
         return this;
@@ -34,13 +39,41 @@ vi.mock("@tanstack/react-start", () => ({
           if (this._validator && data !== undefined) {
             data = this._validator.parse ? this._validator.parse(data) : data;
           }
-          return fn({ data });
+          // 迁移后经 .middleware([authContextMiddleware]) 注入 context.user：
+          // mock 依序执行 middleware 的 server 段（复现框架 executeMiddleware 的
+          // context 合并语义），真实鉴权链由被 mock 的 auth-helpers/getRequest 承接
+          let context: any = {};
+          for (const mw of this._middlewares) {
+            const serverFn = mw?.options?.server;
+            if (!serverFn) continue;
+            const result = await serverFn({
+              data,
+              context,
+              method: 'POST',
+              serverFnMeta: {},
+              signal: new AbortController().signal,
+              next: async (inner: any) => ({ context: { ...context, ...(inner?.context ?? {}) } }),
+            });
+            context = result.context;
+          }
+          return fn({ data, context });
         };
         return wrapped;
       },
     };
     return api;
   },
+  // auth-context.ts 依赖 createMiddleware({ type: 'function' }).server(fn)：
+  // mock 产出与真实 middleware 同构的 { options: { server } } 形状，
+  // 供上方 handler 包装器执行 server 段注入 context.user
+  createMiddleware: (opts: any) => {
+    const mw: any = { options: { type: opts?.type } };
+    mw.server = (fn: Function) => {
+      mw.options.server = fn;
+      return mw;
+    };
+    return mw;
+  },
 }));
 
 vi.mock("@tanstack/react-start/server", () => ({

package/src/server/serverFns/bug/__tests__/bug-story.test.ts

@@ -21,6 +21,11 @@ vi.mock("@tanstack/react-start", () => ({
   createServerFn: (config: any) => {
     const api: any = {
       _validator: undefined,
+      _middlewares: [] as any[],
+      middleware(mws: any[]) {
+        this._middlewares.push(...mws);
+        return this;
+      },
       validator(schema: any) {
         this._validator = schema;
         return this;
@@ -31,13 +36,41 @@ vi.mock("@tanstack/react-start", () => ({
           if (this._validator && data !== undefined) {
             data = this._validator.parse ? this._validator.parse(data) : data;
           }
-          return fn({ data });
+          // 迁移后经 .middleware([authContextMiddleware]) 注入 context.user：
+          // mock 依序执行 middleware 的 server 段（复现框架 executeMiddleware 的
+          // context 合并语义），真实鉴权链由被 mock 的 auth-helpers/getRequest 承接
+          let context: any = {};
+          for (const mw of this._middlewares) {
+            const serverFn = mw?.options?.server;
+            if (!serverFn) continue;
+            const result = await serverFn({
+              data,
+              context,
+              method: 'POST',
+              serverFnMeta: {},
+              signal: new AbortController().signal,
+              next: async (inner: any) => ({ context: { ...context, ...(inner?.context ?? {}) } }),
+            });
+            context = result.context;
+          }
+          return fn({ data, context });
         };
         return wrapped;
       },
     };
     return api;
   },
+  // auth-context.ts 依赖 createMiddleware({ type: 'function' }).server(fn)：
+  // mock 产出与真实 middleware 同构的 { options: { server } } 形状，
+  // 供上方 handler 包装器执行 server 段注入 context.user
+  createMiddleware: (opts: any) => {
+    const mw: any = { options: { type: opts?.type } };
+    mw.server = (fn: Function) => {
+      mw.options.server = fn;
+      return mw;
+    };
+    return mw;
+  },
 }));
 
 vi.mock("@tanstack/react-start/server", () => ({

package/src/server/serverFns/bug/__tests__/bug-webhooks.test.ts

@@ -25,6 +25,11 @@ vi.mock("@tanstack/react-start", () => ({
   createServerFn: (config: any) => {
     const api: any = {
       _validator: undefined,
+      _middlewares: [] as any[],
+      middleware(mws: any[]) {
+        this._middlewares.push(...mws);
+        return this;
+      },
       validator(schema: any) {
         this._validator = schema;
         return this;
@@ -35,13 +40,41 @@ vi.mock("@tanstack/react-start", () => ({
           if (this._validator && data !== undefined) {
             data = this._validator.parse ? this._validator.parse(data) : data;
           }
-          return fn({ data });
+          // 迁移后经 .middleware([authContextMiddleware]) 注入 context.user：
+          // mock 依序执行 middleware 的 server 段（复现框架 executeMiddleware 的
+          // context 合并语义），真实鉴权链由被 mock 的 auth-helpers/getRequest 承接
+          let context: any = {};
+          for (const mw of this._middlewares) {
+            const serverFn = mw?.options?.server;
+            if (!serverFn) continue;
+            const result = await serverFn({
+              data,
+              context,
+              method: 'POST',
+              serverFnMeta: {},
+              signal: new AbortController().signal,
+              next: async (inner: any) => ({ context: { ...context, ...(inner?.context ?? {}) } }),
+            });
+            context = result.context;
+          }
+          return fn({ data, context });
         };
         return wrapped;
       },
     };
     return api;
   },
+  // auth-context.ts 依赖 createMiddleware({ type: 'function' }).server(fn)：
+  // mock 产出与真实 middleware 同构的 { options: { server } } 形状，
+  // 供上方 handler 包装器执行 server 段注入 context.user
+  createMiddleware: (opts: any) => {
+    const mw: any = { options: { type: opts?.type } };
+    mw.server = (fn: Function) => {
+      mw.options.server = fn;
+      return mw;
+    };
+    return mw;
+  },
 }));
 
 vi.mock("@tanstack/react-start/server", () => ({

package/src/server/serverFns/bug/bug-access-tokens.ts

@@ -22,9 +22,8 @@
 // bug-permissions.ts，token 生成复用 server/bug-report/tokens.ts）。
 import { getPrisma } from "@allbluecn/database/get-prisma";
 import { createServerFn } from "@tanstack/react-start";
-import { getRequest } from "@tanstack/react-start/server";
 import { z } from "zod";
-import { requireAuth } from "@/server/auth-helpers";
+import { authContextMiddleware } from "@/server/middlewares/auth-context"
 import { generateProjectToken } from "@/server/bug-report/tokens";
 import { assertProjectMembership } from "@/server/bug/bug-permissions";
 
@@ -45,12 +44,11 @@ interface BugTokenListItem {
 }
 
 export const listBugTokensFn = createServerFn({ method: "GET" })
+  .middleware([authContextMiddleware])
   .validator(projectIdSchema)
-  .handler(async ({ data }) => {
+  .handler(async ({ data, context }) => {
     const prisma = await getPrisma();
-    const request = getRequest();
-    const session = await requireAuth(request);
-    const userId = session.user.id;
+    const userId = context.user.id;
     await assertProjectMembership(data.projectId, userId);
 
     const rows = await prisma.projectAccessToken.findMany({
@@ -86,12 +84,11 @@ const createTokenSchema = z.object({
 });
 
 export const createBugTokenFn = createServerFn({ method: "POST" })
+  .middleware([authContextMiddleware])
   .validator(createTokenSchema)
-  .handler(async ({ data }) => {
+  .handler(async ({ data, context }) => {
     const prisma = await getPrisma();
-    const request = getRequest();
-    const session = await requireAuth(request);
-    const userId = session.user.id;
+    const userId = context.user.id;
     await assertProjectMembership(data.projectId, userId);
 
     // 单项目凭证数量上限：防成员无限创建凭证行（表膨胀 + 管理面噪音）
@@ -130,12 +127,11 @@ const revokeTokenSchema = z.object({
 });
 
 export const revokeBugTokenFn = createServerFn({ method: "POST" })
+  .middleware([authContextMiddleware])
   .validator(revokeTokenSchema)
-  .handler(async ({ data }) => {
+  .handler(async ({ data, context }) => {
     const prisma = await getPrisma();
-    const request = getRequest();
-    const session = await requireAuth(request);
-    const userId = session.user.id;
+    const userId = context.user.id;
     await assertProjectMembership(data.projectId, userId);
 
     const revokedAt = new Date();
@@ -168,12 +164,11 @@ const DEFAULT_BUG_PROJECT_SETTINGS = {
 } as const;
 
 export const getBugProjectSettingsFn = createServerFn({ method: "GET" })
+  .middleware([authContextMiddleware])
   .validator(projectIdSchema)
-  .handler(async ({ data }) => {
+  .handler(async ({ data, context }) => {
     const prisma = await getPrisma();
-    const request = getRequest();
-    const session = await requireAuth(request);
-    const userId = session.user.id;
+    const userId = context.user.id;
     await assertProjectMembership(data.projectId, userId);
 
     const row = await prisma.bugProjectSettings.findUnique({
@@ -200,12 +195,11 @@ const updateSettingsSchema = z.object({
 });
 
 export const updateBugProjectSettingsFn = createServerFn({ method: "POST" })
+  .middleware([authContextMiddleware])
   .validator(updateSettingsSchema)
-  .handler(async ({ data }) => {
+  .handler(async ({ data, context }) => {
     const prisma = await getPrisma();
-    const request = getRequest();
-    const session = await requireAuth(request);
-    const userId = session.user.id;
+    const userId = context.user.id;
     await assertProjectMembership(data.projectId, userId);
 
     // update 只写提供的字段（不重置其余）；create 合并默认值（未提供字段回默认）

package/src/server/serverFns/bug/bug-activities.ts

@@ -17,9 +17,8 @@
 
 import { getPrisma } from "@allbluecn/database/get-prisma";
 import { createServerFn } from "@tanstack/react-start";
-import { getRequest } from "@tanstack/react-start/server";
 import { z } from "zod";
-import { requireAuth } from "@/server/auth-helpers";
+import { authContextMiddleware } from "@/server/middlewares/auth-context"
 import type { AvatarConfig } from "@allbluecn/kernel";
 import { BUG_USER_BRIEF_SELECT } from "@/shared/bug/types";
 import type { BugActivityItem } from "@/shared/bug/types";
@@ -64,12 +63,11 @@ function parseActivityCursor(cursor: string): { createdAt: Date; id?: string } {
 }
 
 export const listBugActivitiesFn = createServerFn({ method: "GET" })
+  .middleware([authContextMiddleware])
   .validator(listActivitiesSchema)
-  .handler(async ({ data }) => {
+  .handler(async ({ data, context }) => {
     const prisma = await getPrisma();
-    const request = getRequest();
-    const session = await requireAuth(request);
-    const userId = session.user.id;
+    const userId = context.user.id;
 
     await assertBugProjectMember(data.bugId, userId);