refactor: organize imports and improve template utility modules

packages/server/auth-schema.ts

@@ -1,3 +1,11 @@
+// import {
+// 	pgTable,
+// 	text,
+// 	integer,
+// 	timestamp,
+// 	boolean,
+// } from "drizzle-orm/pg-core";
+
 // export const users_temp = pgTable("users_temp", {
 // 	id: text("id").primaryKey(),
 // 	name: text("name").notNull(),
@@ -52,6 +60,32 @@
 // 	updatedAt: timestamp("updated_at"),
 // });
 
+// export const apikey = pgTable("apikey", {
+// 	id: text("id").primaryKey(),
+// 	name: text("name"),
+// 	start: text("start"),
+// 	prefix: text("prefix"),
+// 	key: text("key").notNull(),
+// 	userId: text("user_id")
+// 		.notNull()
+// 		.references(() => user.id, { onDelete: "cascade" }),
+// 	refillInterval: integer("refill_interval"),
+// 	refillAmount: integer("refill_amount"),
+// 	lastRefillAt: timestamp("last_refill_at"),
+// 	enabled: boolean("enabled"),
+// 	rateLimitEnabled: boolean("rate_limit_enabled"),
+// 	rateLimitTimeWindow: integer("rate_limit_time_window"),
+// 	rateLimitMax: integer("rate_limit_max"),
+// 	requestCount: integer("request_count"),
+// 	remaining: integer("remaining"),
+// 	lastRequest: timestamp("last_request"),
+// 	expiresAt: timestamp("expires_at"),
+// 	createdAt: timestamp("created_at").notNull(),
+// 	updatedAt: timestamp("updated_at").notNull(),
+// 	permissions: text("permissions"),
+// 	metadata: text("metadata"),
+// });
+
 // export const twoFactor = pgTable("two_factor", {
 // 	id: text("id").primaryKey(),
 // 	secret: text("secret").notNull(),
@@ -79,6 +113,7 @@
 // 		.notNull()
 // 		.references(() => user.id, { onDelete: "cascade" }),
 // 	role: text("role").notNull(),
+// 	teamId: text("team_id"),
 // 	createdAt: timestamp("created_at").notNull(),
 // });
 
@@ -89,6 +124,7 @@
 // 		.references(() => organization.id, { onDelete: "cascade" }),
 // 	email: text("email").notNull(),
 // 	role: text("role"),
+// 	teamId: text("team_id"),
 // 	status: text("status").notNull(),
 // 	expiresAt: timestamp("expires_at").notNull(),
 // 	inviterId: text("inviter_id")

packages/server/package.json

@@ -32,7 +32,7 @@
     "@oslojs/encoding":"1.1.0",
     "@oslojs/crypto":"1.0.1",
     "drizzle-dbml-generator":"0.10.0",
-    "better-auth":"1.1.16",
+    "better-auth":"beta",
     "rotating-file-stream": "3.2.3",
     "@faker-js/faker": "^8.4.1",
     "@lucia-auth/adapter-drizzle": "1.0.7",

packages/server/src/db/schema/account.ts

@@ -1,5 +1,11 @@
 import { relations, sql } from "drizzle-orm";
-import { boolean, pgTable, text, timestamp } from "drizzle-orm/pg-core";
+import {
+	boolean,
+	integer,
+	pgTable,
+	text,
+	timestamp,
+} from "drizzle-orm/pg-core";
 import { nanoid } from "nanoid";
 import { projects } from "./project";
 import { server } from "./server";
@@ -87,7 +93,7 @@ export const member = pgTable("member", {
 		.references(() => users_temp.id, { onDelete: "cascade" }),
 	role: text("role").notNull().$type<"owner" | "member" | "admin">(),
 	createdAt: timestamp("created_at").notNull(),
-
+	teamId: text("team_id"),
 	// Permissions
 	canCreateProjects: boolean("canCreateProjects").notNull().default(false),
 	canAccessToSSHKeys: boolean("canAccessToSSHKeys").notNull().default(false),
@@ -135,6 +141,7 @@ export const invitation = pgTable("invitation", {
 	inviterId: text("inviter_id")
 		.notNull()
 		.references(() => users_temp.id, { onDelete: "cascade" }),
+	teamId: text("team_id"),
 });
 
 export const invitationRelations = relations(invitation, ({ one }) => ({
@@ -152,3 +159,29 @@ export const twoFactor = pgTable("two_factor", {
 		.notNull()
 		.references(() => users_temp.id, { onDelete: "cascade" }),
 });
+
+export const apikey = pgTable("apikey", {
+	id: text("id").primaryKey(),
+	name: text("name"),
+	start: text("start"),
+	prefix: text("prefix"),
+	key: text("key").notNull(),
+	userId: text("user_id")
+		.notNull()
+		.references(() => users_temp.id, { onDelete: "cascade" }),
+	refillInterval: integer("refill_interval"),
+	refillAmount: integer("refill_amount"),
+	lastRefillAt: timestamp("last_refill_at"),
+	enabled: boolean("enabled"),
+	rateLimitEnabled: boolean("rate_limit_enabled"),
+	rateLimitTimeWindow: integer("rate_limit_time_window"),
+	rateLimitMax: integer("rate_limit_max"),
+	requestCount: integer("request_count"),
+	remaining: integer("remaining"),
+	lastRequest: timestamp("last_request"),
+	expiresAt: timestamp("expires_at"),
+	createdAt: timestamp("created_at").notNull(),
+	updatedAt: timestamp("updated_at").notNull(),
+	permissions: text("permissions"),
+	metadata: text("metadata"),
+});

packages/server/src/lib/auth.ts

@@ -2,14 +2,14 @@ import type { IncomingMessage } from "node:http";
 import * as bcrypt from "bcrypt";
 import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
-import { organization, twoFactor } from "better-auth/plugins";
+import { organization, twoFactor, apiKey } from "better-auth/plugins";
 import { and, desc, eq } from "drizzle-orm";
 import { db } from "../db";
 import * as schema from "../db/schema";
 import { sendEmail } from "../verification/send-verification-email";
 import { IS_CLOUD } from "../constants";
 
-const { handler, api } = betterAuth({
+export const auth = betterAuth({
 	database: drizzleAdapter(db, {
 		provider: "pg",
 		schema: schema,
@@ -126,6 +126,7 @@ const { handler, api } = betterAuth({
 	},
 
 	plugins: [
+		apiKey(),
 		twoFactor(),
 		organization({
 			async sendInvitationEmail(data, _request) {
@@ -144,9 +145,9 @@ const { handler, api } = betterAuth({
 	],
 });
 
-export const auth = {
-	handler,
-};
+// export const auth = {
+// 	handler,
+// };
 
 export const validateRequest = async (request: IncomingMessage) => {
 	const session = await api.getSession({