npmrun 2 weeks ago
parent
commit
e9c59948c2
  1. 7
      packages/drizzle-pkg/lib/schema/auth.ts
  2. 4
      server/service/auth/index.ts

7
packages/drizzle-pkg/lib/schema/auth.ts

@ -1,6 +1,9 @@
import { index, integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
import { sql } from "drizzle-orm";
export const UserRoles = ["admin", "user"] as const;
export type UserRole = (typeof UserRoles)[number];
export const users = sqliteTable("users", {
id: integer().primaryKey(),
username: text().notNull().unique(),
@ -8,7 +11,9 @@ export const users = sqliteTable("users", {
nickname: text(),
password: text().notNull(),
avatar: text(),
role: text().notNull().default("user"),
role: text("role", { enum: UserRoles })
.notNull()
.default("user"),
status: text().notNull().default("active"),
createdAt: integer("created_at", { mode: "timestamp_ms" }).defaultNow().notNull(),
updatedAt: integer("updated_at", { mode: "timestamp_ms" })

4
server/service/auth/index.ts

@ -1,5 +1,5 @@
import { dbGlobal } from "drizzle-pkg/lib/db";
import { sessions, users } from "drizzle-pkg/lib/schema/auth";
import { sessions, UserRole, users } from "drizzle-pkg/lib/schema/auth";
import { and, eq, gt, lte, sql } from "drizzle-orm";
import { isUniqueConflictExceptField, isUniqueConflictOnField } from "#server/utils/db-unique-constraint";
import log4js from "logger";
@ -21,7 +21,7 @@ export type MinimalUser = {
id: number;
username: string;
email: string | null;
role: string;
role: UserRole;
nickname: string | null;
avatar: string | null;
};

Loading…
Cancel
Save