sa2kit 2.0.4 → 3.1.0

package/dist/calendar/routes/index.d.ts

@@ -1,5 +1,78 @@
 import { NextRequest, NextResponse } from 'next/server';
 
+/** Better Auth 实例（运行时完整 API，类型刻意保持宽松以便跨插件版本） */
+type Sa2kitAuthInstance = {
+    handler: (request: Request) => Promise<Response>;
+    api: {
+        getSession: (ctx: {
+            headers: Headers;
+        }) => Promise<{
+            user: Record<string, unknown>;
+        } | null>;
+        [key: string]: unknown;
+    };
+    [key: string]: unknown;
+};
+
+type CalendarAuthValidator = (request: NextRequest) => Promise<{
+    id: number;
+} | null>;
+/**
+ * 注入 calendar API 路由使用的 session 校验（应用启动时调用一次）
+ */
+declare function configureCalendarApiAuth(validateAuth: CalendarAuthValidator): void;
+/** 重置（测试用） */
+declare function resetCalendarApiAuth(): void;
+/**
+ * 使用 Better Auth session 一键配置 calendar API
+ */
+declare function configureCalendarApiWithBetterAuth(auth: Sa2kitAuthInstance, options?: {
+    db?: unknown;
+}): void;
+
+/**
+ * 创建 calendar 路由所需的 validateAuth（由 Better Auth session 注入）
+ *
+ * @example
+ * ```ts
+ * configureCalendarApiWithBetterAuth(auth, { db });
+ * const routeConfig = createDefaultCalendarRouteConfig();
+ * export const GET = createGetEventsHandler(routeConfig);
+ * ```
+ */
+declare function createCalendarAuthRequirement(validateAuth: CalendarAuthValidator): CalendarAuthValidator;
+declare function createDefaultCalendarRouteConfig(validateAuth?: CalendarAuthValidator): CalendarRouteConfig;
+declare function withCalendarDbGuard<T extends unknown[]>(handler: (...args: T) => Promise<Response>): (...args: T) => Promise<Response>;
+
+declare function createCalendarEventsRouteHandlers(config?: CalendarRouteConfig): {
+    GET: (request: NextRequest) => Promise<Response>;
+    POST: (request: NextRequest) => Promise<Response>;
+};
+declare function createCalendarEventByIdRouteHandlers(config?: CalendarRouteConfig): {
+    GET: (request: NextRequest, routeParams: {
+        params: {
+            id: string;
+        };
+    }) => Promise<Response>;
+    PUT: (request: NextRequest, routeParams: {
+        params: {
+            id: string;
+        };
+    }) => Promise<Response>;
+    DELETE: (request: NextRequest, routeParams: {
+        params: {
+            id: string;
+        };
+    }) => Promise<Response>;
+};
+declare function createCalendarBatchDeleteRouteHandlers(config?: CalendarRouteConfig): {
+    DELETE: (request: NextRequest) => Promise<Response>;
+};
+declare function createCalendarConfigRouteHandlers(config?: CalendarRouteConfig): {
+    GET: (request: NextRequest) => Promise<Response>;
+    PUT: (request: NextRequest) => Promise<Response>;
+};
+
 interface CalendarRouteConfig {
     /**
      * Drizzle 数据库实例
@@ -115,4 +188,4 @@ declare function createConfigHandler(config: CalendarRouteConfig): {
     }>>;
 };
 
-export { type CalendarRouteConfig, createBatchDeleteEventsHandler, createConfigHandler, createCreateEventHandler, createDeleteEventHandler, createGetEventByIdHandler, createGetEventsHandler, createUpdateEventHandler };
+export { type CalendarAuthValidator, type CalendarRouteConfig, configureCalendarApiAuth, configureCalendarApiWithBetterAuth, createBatchDeleteEventsHandler, createCalendarAuthRequirement, createCalendarBatchDeleteRouteHandlers, createCalendarConfigRouteHandlers, createCalendarEventByIdRouteHandlers, createCalendarEventsRouteHandlers, createConfigHandler, createCreateEventHandler, createDefaultCalendarRouteConfig, createDeleteEventHandler, createGetEventByIdHandler, createGetEventsHandler, createUpdateEventHandler, resetCalendarApiAuth, withCalendarDbGuard };

package/dist/calendar/routes/index.js

@@ -6,103 +6,51 @@ var pgCore = require('drizzle-orm/pg-core');
 
 // src/calendar/routes/index.ts
 var userRole = pgCore.pgEnum("UserRole", ["USER", "ADMIN", "SUPER_ADMIN"]);
-var user = pgCore.pgTable(
-  "User",
-  {
-    id: pgCore.text().primaryKey().notNull(),
-    email: pgCore.text().notNull(),
-    emailVerified: pgCore.boolean().default(false).notNull(),
-    username: pgCore.text().notNull(),
-    password: pgCore.text(),
-    name: pgCore.text(),
-    nickname: pgCore.text(),
-    image: pgCore.text(),
-    avatar: pgCore.text(),
-    role: userRole().default("USER").notNull(),
-    preferences: pgCore.jsonb(),
-    createdAt: pgCore.timestamp({ precision: 3, mode: "string" }).default(drizzleOrm.sql`CURRENT_TIMESTAMP`).notNull(),
-    updatedAt: pgCore.timestamp({ precision: 3, mode: "string" }).notNull(),
-    twoFactorEnabled: pgCore.boolean().default(false).notNull()
-  },
-  (table) => [
-    pgCore.uniqueIndex("User_email_key").using("btree", table.email.asc().nullsLast().op("text_ops")),
-    pgCore.uniqueIndex("User_username_key").using(
-      "btree",
-      table.username.asc().nullsLast().op("text_ops")
-    )
-  ]
-);
-var session = pgCore.pgTable(
-  "Session",
-  {
-    id: pgCore.text().primaryKey().notNull(),
-    userId: pgCore.text().notNull(),
-    token: pgCore.text().notNull(),
-    expiresAt: pgCore.timestamp({ precision: 3, mode: "string" }).notNull(),
-    ipAddress: pgCore.text(),
-    userAgent: pgCore.text(),
-    createdAt: pgCore.timestamp({ precision: 3, mode: "string" }).default(drizzleOrm.sql`CURRENT_TIMESTAMP`).notNull(),
-    updatedAt: pgCore.timestamp({ precision: 3, mode: "string" }).default(drizzleOrm.sql`CURRENT_TIMESTAMP`).notNull()
-  },
-  (table) => [
-    pgCore.uniqueIndex("Session_token_key").using("btree", table.token.asc().nullsLast().op("text_ops")),
-    pgCore.foreignKey({
-      columns: [table.userId],
-      foreignColumns: [user.id],
-      name: "Session_userId_fkey"
-    }).onUpdate("cascade").onDelete("cascade")
-  ]
-);
-var account = pgCore.pgTable(
-  "Account",
-  {
-    id: pgCore.text().primaryKey().notNull(),
-    accountId: pgCore.text().notNull(),
-    providerId: pgCore.text().notNull(),
-    // 提供商: github, google, wechat 等
-    userId: pgCore.text().notNull(),
-    accessToken: pgCore.text(),
-    refreshToken: pgCore.text(),
-    idToken: pgCore.text(),
-    accessTokenExpiresAt: pgCore.timestamp({ precision: 3, mode: "string" }),
-    refreshTokenExpiresAt: pgCore.timestamp({ precision: 3, mode: "string" }),
-    scope: pgCore.text(),
-    password: pgCore.text(),
-    createdAt: pgCore.timestamp({ precision: 3, mode: "string" }).default(drizzleOrm.sql`CURRENT_TIMESTAMP`).notNull(),
-    updatedAt: pgCore.timestamp({ precision: 3, mode: "string" }).notNull()
-  },
-  (table) => [
-    pgCore.uniqueIndex("Account_providerId_accountId_key").using(
-      "btree",
-      table.providerId.asc().nullsLast().op("text_ops"),
-      table.accountId.asc().nullsLast().op("text_ops")
-    ),
-    pgCore.foreignKey({
-      columns: [table.userId],
-      foreignColumns: [user.id],
-      name: "Account_userId_fkey"
-    }).onUpdate("cascade").onDelete("cascade")
-  ]
-);
-pgCore.pgTable(
-  "verifications",
-  {
-    id: pgCore.text().primaryKey().notNull(),
-    identifier: pgCore.text().notNull(),
-    // 邮箱或手机号
-    value: pgCore.text().notNull(),
-    // 验证码
-    expiresAt: pgCore.timestamp({ precision: 3, mode: "string" }).notNull(),
-    createdAt: pgCore.timestamp({ precision: 3, mode: "string" }).default(drizzleOrm.sql`CURRENT_TIMESTAMP`).notNull()
-  },
-  (table) => [
-    pgCore.uniqueIndex("verifications_identifier_value_key").using(
-      "btree",
-      table.identifier.asc().nullsLast().op("text_ops"),
-      table.value.asc().nullsLast().op("text_ops")
-    )
-  ]
-);
+var user = pgCore.pgTable("user", {
+  id: pgCore.text("id").primaryKey().notNull(),
+  name: pgCore.text("name").notNull(),
+  email: pgCore.text("email").notNull(),
+  emailVerified: pgCore.boolean("emailVerified").default(false).notNull(),
+  image: pgCore.text("image"),
+  phoneNumber: pgCore.text("phoneNumber"),
+  phoneNumberVerified: pgCore.boolean("phoneNumberVerified").default(false),
+  role: userRole("role").default("USER").notNull(),
+  createdAt: pgCore.timestamp("createdAt", { precision: 3, mode: "date" }).default(drizzleOrm.sql`CURRENT_TIMESTAMP`).notNull(),
+  updatedAt: pgCore.timestamp("updatedAt", { precision: 3, mode: "date" }).default(drizzleOrm.sql`CURRENT_TIMESTAMP`).notNull()
+});
+var session = pgCore.pgTable("session", {
+  id: pgCore.text("id").primaryKey().notNull(),
+  userId: pgCore.text("userId").notNull().references(() => user.id, { onDelete: "cascade" }),
+  token: pgCore.text("token").notNull(),
+  expiresAt: pgCore.timestamp("expiresAt", { precision: 3, mode: "date" }).notNull(),
+  ipAddress: pgCore.text("ipAddress"),
+  userAgent: pgCore.text("userAgent"),
+  createdAt: pgCore.timestamp("createdAt", { precision: 3, mode: "date" }).default(drizzleOrm.sql`CURRENT_TIMESTAMP`).notNull(),
+  updatedAt: pgCore.timestamp("updatedAt", { precision: 3, mode: "date" }).default(drizzleOrm.sql`CURRENT_TIMESTAMP`).notNull()
+});
+var account = pgCore.pgTable("account", {
+  id: pgCore.text("id").primaryKey().notNull(),
+  accountId: pgCore.text("accountId").notNull(),
+  providerId: pgCore.text("providerId").notNull(),
+  userId: pgCore.text("userId").notNull().references(() => user.id, { onDelete: "cascade" }),
+  accessToken: pgCore.text("accessToken"),
+  refreshToken: pgCore.text("refreshToken"),
+  idToken: pgCore.text("idToken"),
+  accessTokenExpiresAt: pgCore.timestamp("accessTokenExpiresAt", { precision: 3, mode: "date" }),
+  refreshTokenExpiresAt: pgCore.timestamp("refreshTokenExpiresAt", { precision: 3, mode: "date" }),
+  scope: pgCore.text("scope"),
+  password: pgCore.text("password"),
+  createdAt: pgCore.timestamp("createdAt", { precision: 3, mode: "date" }).default(drizzleOrm.sql`CURRENT_TIMESTAMP`).notNull(),
+  updatedAt: pgCore.timestamp("updatedAt", { precision: 3, mode: "date" }).default(drizzleOrm.sql`CURRENT_TIMESTAMP`).notNull()
+});
+pgCore.pgTable("verification", {
+  id: pgCore.text("id").primaryKey().notNull(),
+  identifier: pgCore.text("identifier").notNull(),
+  value: pgCore.text("value").notNull(),
+  expiresAt: pgCore.timestamp("expiresAt", { precision: 3, mode: "date" }).notNull(),
+  createdAt: pgCore.timestamp("createdAt", { precision: 3, mode: "date" }).default(drizzleOrm.sql`CURRENT_TIMESTAMP`).notNull(),
+  updatedAt: pgCore.timestamp("updatedAt", { precision: 3, mode: "date" }).default(drizzleOrm.sql`CURRENT_TIMESTAMP`).notNull()
+});
 drizzleOrm.relations(user, ({ many }) => ({
   sessions: many(session),
   accounts: many(account)
@@ -424,6 +372,137 @@ var CalendarDbService = class {
 };
 var calendarDbService = new CalendarDbService();
 
+// src/common/auth/server/session.ts
+async function getSessionUser(auth, request) {
+  const session2 = await auth.api.getSession({ headers: request.headers });
+  if (!session2?.user) return null;
+  const user2 = session2.user;
+  return {
+    id: user2.id,
+    email: user2.email,
+    name: user2.name,
+    role: user2.role,
+    phoneNumber: user2.phoneNumber ?? null
+  };
+}
+async function getSessionUserNumeric(auth, request) {
+  const user2 = await getSessionUser(auth, request);
+  if (!user2) return null;
+  const numericId = Number.parseInt(user2.id, 10);
+  if (Number.isNaN(numericId)) return null;
+  const { id: _id, ...rest } = user2;
+  return { ...rest, id: numericId };
+}
+function createSessionValidator(auth) {
+  return {
+    getSessionUser: (request) => getSessionUser(auth, request),
+    getSessionUserNumeric: (request) => getSessionUserNumeric(auth, request)
+  };
+}
+
+// src/calendar/api/auth-config.ts
+var configuredValidator = null;
+function configureCalendarApiAuth(validateAuth) {
+  configuredValidator = validateAuth;
+}
+function resetCalendarApiAuth() {
+  configuredValidator = null;
+}
+function resolveCalendarAuthValidator(validateAuth) {
+  const validator = validateAuth ?? configuredValidator;
+  if (!validator) {
+    throw new Error(
+      "Calendar API \u672A\u914D\u7F6E auth\uFF1A\u8BF7\u5728\u5E94\u7528\u542F\u52A8\u65F6\u8C03\u7528 configureCalendarApiAuth(validateAuth)\uFF0C\u6216 configureCalendarApiWithBetterAuth(auth)\uFF0C\u6216\u5728 createDefaultCalendarRouteConfig(validateAuth) \u4E2D\u663E\u5F0F\u4F20\u5165\u3002"
+    );
+  }
+  return validator;
+}
+function configureCalendarApiWithBetterAuth(auth, options) {
+  const { getSessionUserNumeric: getSessionUserNumeric2 } = createSessionValidator(auth);
+  configureCalendarApiAuth((request) => getSessionUserNumeric2(request));
+  if (options?.db) {
+    calendarDbService.setDb(options.db);
+  }
+}
+
+// src/calendar/api/_shared.ts
+function createCalendarAuthRequirement(validateAuth) {
+  return validateAuth;
+}
+function ensureCalendarDbReady() {
+  if (calendarDbService.isConfigured()) return null;
+  return Response.json(
+    {
+      success: false,
+      error: "Calendar DB is not initialized. Please call calendarDbService.setDb(db) or use create*Handler from sa2kit/calendar/routes with db injection."
+    },
+    { status: 500 }
+  );
+}
+function createDefaultCalendarRouteConfig(validateAuth) {
+  return {
+    validateAuth: resolveCalendarAuthValidator(validateAuth)
+  };
+}
+function withCalendarDbGuard(handler) {
+  return async (...args) => {
+    const dbError = ensureCalendarDbReady();
+    if (dbError) return dbError;
+    return handler(...args);
+  };
+}
+
+// src/calendar/api/route-handlers.ts
+function resolveConfig(config) {
+  return config ?? createDefaultCalendarRouteConfig();
+}
+function lazyHandler(factory, config) {
+  let handler = null;
+  return (...args) => {
+    if (!handler) {
+      handler = factory(resolveConfig(config));
+    }
+    return handler(...args);
+  };
+}
+function createCalendarEventsRouteHandlers(config) {
+  return {
+    GET: withCalendarDbGuard(lazyHandler(createGetEventsHandler, config)),
+    POST: withCalendarDbGuard(lazyHandler(createCreateEventHandler, config))
+  };
+}
+function createCalendarEventByIdRouteHandlers(config) {
+  return {
+    GET: withCalendarDbGuard(
+      lazyHandler(createGetEventByIdHandler, config)
+    ),
+    PUT: withCalendarDbGuard(
+      lazyHandler(createUpdateEventHandler, config)
+    ),
+    DELETE: withCalendarDbGuard(
+      lazyHandler(createDeleteEventHandler, config)
+    )
+  };
+}
+function createCalendarBatchDeleteRouteHandlers(config) {
+  return {
+    DELETE: withCalendarDbGuard(lazyHandler(createBatchDeleteEventsHandler, config))
+  };
+}
+function createCalendarConfigRouteHandlers(config) {
+  let configHandlers = null;
+  const ensureConfigHandlers = () => {
+    if (!configHandlers) {
+      configHandlers = createConfigHandler(resolveConfig(config));
+    }
+    return configHandlers;
+  };
+  return {
+    GET: withCalendarDbGuard((request) => ensureConfigHandlers().GET(request)),
+    PUT: withCalendarDbGuard((request) => ensureConfigHandlers().PUT(request))
+  };
+}
+
 // src/calendar/routes/index.ts
 function initDbService(db) {
   if (db) {
@@ -744,12 +823,22 @@ function createConfigHandler(config) {
   };
 }
 
+exports.configureCalendarApiAuth = configureCalendarApiAuth;
+exports.configureCalendarApiWithBetterAuth = configureCalendarApiWithBetterAuth;
 exports.createBatchDeleteEventsHandler = createBatchDeleteEventsHandler;
+exports.createCalendarAuthRequirement = createCalendarAuthRequirement;
+exports.createCalendarBatchDeleteRouteHandlers = createCalendarBatchDeleteRouteHandlers;
+exports.createCalendarConfigRouteHandlers = createCalendarConfigRouteHandlers;
+exports.createCalendarEventByIdRouteHandlers = createCalendarEventByIdRouteHandlers;
+exports.createCalendarEventsRouteHandlers = createCalendarEventsRouteHandlers;
 exports.createConfigHandler = createConfigHandler;
 exports.createCreateEventHandler = createCreateEventHandler;
+exports.createDefaultCalendarRouteConfig = createDefaultCalendarRouteConfig;
 exports.createDeleteEventHandler = createDeleteEventHandler;
 exports.createGetEventByIdHandler = createGetEventByIdHandler;
 exports.createGetEventsHandler = createGetEventsHandler;
 exports.createUpdateEventHandler = createUpdateEventHandler;
+exports.resetCalendarApiAuth = resetCalendarApiAuth;
+exports.withCalendarDbGuard = withCalendarDbGuard;
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map