@auth/drizzle-adapter 1.0.1 → 1.1.0

package/src/index.ts

@@ -1,6 +1,6 @@
 /**
  * <div style={{display: "flex", justifyContent: "space-between", alignItems: "center", padding: 16}}>
- *  <p style={{fontWeight: "normal"}}>Official <a href="https://orm.drizzle.team">Drizzle ORM</a> adapter for Auth.js / NextAuth.js.</p>
+ *  <p>Official <a href="https://orm.drizzle.team">Drizzle ORM</a> adapter for Auth.js / NextAuth.js.</p>
  *  <a href="https://orm.drizzle.team">
  *   <img style={{display: "block"}} src="/img/adapters/drizzle.svg" width="38" />
  *  </a>
@@ -26,251 +26,7 @@ import { DefaultSQLiteSchema, SQLiteDrizzleAdapter } from "./lib/sqlite.js"
 import { DefaultSchema, SqlFlavorOptions } from "./lib/utils.js"
 
 import type { Adapter } from "@auth/core/adapters"
-/**
- * Create db instance and pass it to adapter. Add this adapter to your `auth.ts` Auth.js configuration object:
- *
- * ```ts title="auth.ts"
- * import NextAuth from "next-auth"
- * import Google from "next-auth/providers/google"
- * import { DrizzleAdapter } from "@auth/drizzle-adapter"
- * import { db } from "./db.ts"
- *
- * export const { handlers, auth } = NextAuth({
- *   adapter: DrizzleAdapter(db),
- *   providers: [
- *     Google,
- *   ],
- * })
- * ```
- * 
- * Follow the Drizzle documentation for [PostgreSQL setup](https://orm.drizzle.team/docs/get-started-postgresql), [MySQL setup](https://orm.drizzle.team/docs/get-started-mysql) and [SQLite setup](https://orm.drizzle.team/docs/get-started-sqlite).
- * 
- * :::info
- * If you want to use your own tables, you can pass them as a second argument. If you add non-nullable columns, make sure to provide a default value or rewrite functions to handle the missing values.
- * :::
- * 
- * ```ts title="auth.ts"
- * import NextAuth from "next-auth"
- * import Google from "next-auth/providers/google"
- * import { DrizzleAdapter } from "@auth/drizzle-adapter"
- * import { accounts, sessions, users, verificationTokens } from "./schema"
- * import { db } from "./db.ts"
- *
- * export const { handlers, auth } = NextAuth({
- *   adapter: DrizzleAdapter(db, { usersTable: users, accountsTable: accounts, sessionsTable: sessions, verificationTokensTable: verificationTokens }),
- *   providers: [
- *     Google,
- *   ],
- * })
- * ```
- *
- * ## Setup
- *
- * First, create a schema that includes [the minimum requirements for a `next-auth` adapter](/reference/core/adapters#models). You can select your favorite SQL flavor below and copy it.
- * Additionally, you may extend the schema from the minimum requirements to suit your needs.
- *
- * - [Postgres](#postgres)
- * - [MySQL](#mysql)
- * - [SQLite](#sqlite)
- *
- * ### Postgres
 
- * ```ts title="schema.ts"
- * import {
- *   timestamp,
- *   pgTable,
- *   text,
- *   primaryKey,
- *  integer
- * } from "drizzle-orm/pg-core"
- * import type { AdapterAccount } from '@auth/core/adapters'
- * import { randomUUID } from "crypto"
- *
- * export const users = pgTable("user", {
- *  id: text("id").primaryKey().$defaultFn(() => randomUUID()),
- *  name: text("name"),
- *  email: text("email").notNull(),
- *  emailVerified: timestamp("emailVerified", { mode: "date" }),
- *  image: text("image"),
- * })
- *
- * export const accounts = pgTable(
- * "account",
- * {
- *   userId: text("userId")
- *     .notNull()
- *     .references(() => users.id, { onDelete: "cascade" }),
- *   type: text("type").notNull(),
- *   provider: text("provider").notNull(),
- *   providerAccountId: text("providerAccountId").notNull(),
- *   refresh_token: text("refresh_token"),
- *   access_token: text("access_token"),
- *   expires_at: integer("expires_at"),
- *   token_type: text("token_type"),
- *   scope: text("scope"),
- *    id_token: text("id_token"),
- *   session_state: text("session_state"),
- * },
- * (account) => ({
- *   compoundKey: primaryKey({ columns: [account.provider, account.providerAccountId] }),
- * })
- * )
- *
- * export const sessions = pgTable("session", {
- *  sessionToken: text("sessionToken").primaryKey(),
- *  userId: text("userId")
- *    .notNull()
- *    .references(() => users.id, { onDelete: "cascade" }),
- *  expires: timestamp("expires", { mode: "date" }).notNull(),
- * })
- *
- * export const verificationTokens = pgTable(
- *  "verificationToken",
- *  {
- *    identifier: text("identifier").notNull(),
- *    token: text("token").notNull(),
- *    expires: timestamp("expires", { mode: "date" }).notNull(),
- *  },
- *  (vt) => ({
- *    compoundKey: primaryKey({ columns: [vt.identifier, vt.token] }),
- *  })
- * )
- * ```
- *
- * ### MySQL
- *
- *  In MySQL, there's no `returning` clause, so in the `createUser` function, we first insert a new user and then search by `email` to get the user's data. To make the search faster, we suggest adding an index to the `email` column.
- * 
- * ```ts title="schema.ts"
- * import {
- *  int,
- *  timestamp,
- *  mysqlTable,
- *  primaryKey,
- *  varchar,
- * } from "drizzle-orm/mysql-core"
- * import type { AdapterAccount } from "@auth/core/adapters"
- *
- * export const users = mysqlTable("user", {
- *  id: varchar("id", { length: 255 }).primaryKey().$defaultFn(() => randomUUID()),
- *  name: varchar("name", { length: 255 }),
- *  email: varchar("email", { length: 255 }).notNull(),
- *  emailVerified: timestamp("emailVerified", { mode: "date", fsp: 3 }),
- *  image: varchar("image", { length: 255 }),
- * })
- *
- * export const accounts = mysqlTable(
- *  "account",
- *   {
- *     userId: varchar("userId", { length: 255 })
- *        .notNull()
- *        .references(() => users.id, { onDelete: "cascade" }),
- *     type: varchar("type", { length: 255 }).notNull(),
- *     provider: varchar("provider", { length: 255 }).notNull(),
- *     providerAccountId: varchar("providerAccountId", { length: 255 }).notNull(),
- *     refresh_token: varchar("refresh_token", { length: 255 }),
- *     access_token: varchar("access_token", { length: 255 }),
- *     expires_at: int("expires_at"),
- *     token_type: varchar("token_type", { length: 255 }),
- *     scope: varchar("scope", { length: 255 }),
- *     id_token: varchar("id_token", { length: 2048 }),
- *     session_state: varchar("session_state", { length: 255 }),
- *   },
- *   (account) => ({
- *     compoundKey: primaryKey({
-         columns: [account.provider, account.providerAccountId],
-       })
- *   })
- * )
- *
- * export const sessions = mysqlTable("session", {
- *  sessionToken: varchar("sessionToken", { length: 255 }).primaryKey(),
- *  userId: varchar("userId", { length: 255 })
- *    .notNull()
- *    .references(() => users.id, { onDelete: "cascade" }),
- *  expires: timestamp("expires", { mode: "date" }).notNull(),
- * })
- *
- * export const verificationTokens = mysqlTable(
- *  "verificationToken",
- *  {
- *    identifier: varchar("identifier", { length: 255 }).notNull(),
- *    token: varchar("token", { length: 255 }).notNull(),
- *    expires: timestamp("expires", { mode: "date" }).notNull(),
- *  },
- *  (vt) => ({
- *    compoundKey: primaryKey({ columns: [vt.identifier, vt.token] }),
- *  })
- * )
- * ```
- *
- * ### SQLite
- *
- * ```ts title="schema.ts"
- * import { integer, sqliteTable, text, primaryKey } from "drizzle-orm/sqlite-core"
- * import type { AdapterAccount } from "@auth/core/adapters"
- *
- * export const users = sqliteTable("user", {
- *  id: text("id").primaryKey().$defaultFn(() => randomUUID()),
- *  name: text("name"),
- *  email: text("email").notNull(),
- *  emailVerified: integer("emailVerified", { mode: "timestamp_ms" }),
- *  image: text("image"),
- * })
- *
- * export const accounts = sqliteTable(
- *  "account",
- *  {
- *    userId: text("userId")
- *      .notNull()
- *      .references(() => users.id, { onDelete: "cascade" }),
- *    type: text("type").notNull(),
- *    provider: text("provider").notNull(),
- *    providerAccountId: text("providerAccountId").notNull(),
- *    refresh_token: text("refresh_token"),
- *    access_token: text("access_token"),
- *    expires_at: integer("expires_at"),
- *    token_type: text("token_type"),
- *    scope: text("scope"),
- *    id_token: text("id_token"),
- *    session_state: text("session_state"),
- *  },
- *  (account) => ({
- *    compoundKey: primaryKey({
-        columns: [account.provider, account.providerAccountId],
-      })
- *  })
- * )
- *
- * export const sessions = sqliteTable("session", {
- *  sessionToken: text("sessionToken").primaryKey(),
- *  userId: text("userId")
- *    .notNull()
- *    .references(() => users.id, { onDelete: "cascade" }),
- *  expires: integer("expires", { mode: "timestamp_ms" }).notNull(),
- * })
- *
- * export const verificationTokens = sqliteTable(
- *  "verificationToken",
- *  {
- *    identifier: text("identifier").notNull(),
- *    token: text("token").notNull(),
- *    expires: integer("expires", { mode: "timestamp_ms" }).notNull(),
- *  },
- *  (vt) => ({
- *    compoundKey: primaryKey({ columns: [vt.identifier, vt.token] }),
- *  })
- * )
- * ```
- *
- * ## Migrating your database
- * With your schema now described in your code, you'll need to migrate your database to your schema.
- *
- * For full documentation on how to run migrations with Drizzle, [visit the Drizzle documentation](https://orm.drizzle.team/kit-docs/overview#running-migrations) or check how to apply changes directly to the database with [push command](https://orm.drizzle.team/kit-docs/overview#prototyping-with-db-push).
- *
- * ---
- *
- **/
 export function DrizzleAdapter<SqlFlavor extends SqlFlavorOptions>(
   db: SqlFlavor,
   schema?: DefaultSchema<SqlFlavor>

package/src/lib/mysql.ts

@@ -15,86 +15,104 @@ import {
 import type {
   Adapter,
   AdapterAccount,
+  AdapterAccountType,
   AdapterSession,
   AdapterUser,
   VerificationToken,
 } from "@auth/core/adapters"
 
-export const mysqlUsersTable = mysqlTable("user", {
-  id: varchar("id", { length: 255 })
-    .primaryKey()
-    .$defaultFn(() => crypto.randomUUID()),
-  name: varchar("name", { length: 255 }),
-  email: varchar("email", { length: 255 }).notNull(),
-  emailVerified: timestamp("emailVerified", { mode: "date", fsp: 3 }),
-  image: varchar("image", { length: 255 }),
-}) satisfies DefaultMySqlUsersTable
+export function defineTables(
+  schema: Partial<DefaultMySqlSchema> = {}
+): Required<DefaultMySqlSchema> {
+  const usersTable =
+    schema.usersTable ??
+    (mysqlTable("user", {
+      id: varchar("id", { length: 255 })
+        .primaryKey()
+        .$defaultFn(() => crypto.randomUUID()),
+      name: varchar("name", { length: 255 }),
+      email: varchar("email", { length: 255 }).notNull(),
+      emailVerified: timestamp("emailVerified", { mode: "date", fsp: 3 }),
+      image: varchar("image", { length: 255 }),
+    }) satisfies DefaultMySqlUsersTable)
 
-export const mysqlAccountsTable = mysqlTable(
-  "account",
-  {
-    userId: varchar("userId", { length: 255 })
-      .notNull()
-      .references(() => mysqlUsersTable.id, { onDelete: "cascade" }),
-    type: varchar("type", { length: 255 })
-      .$type<AdapterAccount["type"]>()
-      .notNull(),
-    provider: varchar("provider", { length: 255 }).notNull(),
-    providerAccountId: varchar("providerAccountId", { length: 255 }).notNull(),
-    refresh_token: varchar("refresh_token", { length: 255 }),
-    access_token: varchar("access_token", { length: 255 }),
-    expires_at: int("expires_at"),
-    token_type: varchar("token_type", { length: 255 }),
-    scope: varchar("scope", { length: 255 }),
-    id_token: varchar("id_token", { length: 2048 }),
-    session_state: varchar("session_state", { length: 255 }),
-  },
-  (account) => ({
-    compositePk: primaryKey({
-      columns: [account.provider, account.providerAccountId],
-    }),
-  })
-) satisfies DefaultMySqlAccountsTable
+  const accountsTable =
+    schema.accountsTable ??
+    (mysqlTable(
+      "account",
+      {
+        userId: varchar("userId", { length: 255 })
+          .notNull()
+          .references(() => usersTable.id, { onDelete: "cascade" }),
+        type: varchar("type", { length: 255 })
+          .$type<AdapterAccountType>()
+          .notNull(),
+        provider: varchar("provider", { length: 255 }).notNull(),
+        providerAccountId: varchar("providerAccountId", {
+          length: 255,
+        }).notNull(),
+        refresh_token: varchar("refresh_token", { length: 255 }),
+        access_token: varchar("access_token", { length: 255 }),
+        expires_at: int("expires_at"),
+        token_type: varchar("token_type", { length: 255 }),
+        scope: varchar("scope", { length: 255 }),
+        id_token: varchar("id_token", { length: 2048 }),
+        session_state: varchar("session_state", { length: 255 }),
+      },
+      (account) => ({
+        compositePk: primaryKey({
+          columns: [account.provider, account.providerAccountId],
+        }),
+      })
+    ) satisfies DefaultMySqlAccountsTable)
 
-export const mysqlSessionsTable = mysqlTable("session", {
-  sessionToken: varchar("sessionToken", { length: 255 }).primaryKey(),
-  userId: varchar("userId", { length: 255 })
-    .notNull()
-    .references(() => mysqlUsersTable.id, { onDelete: "cascade" }),
-  expires: timestamp("expires", { mode: "date" }).notNull(),
-}) satisfies DefaultMySqlSessionsTable
+  const sessionsTable =
+    schema.sessionsTable ??
+    (mysqlTable("session", {
+      sessionToken: varchar("sessionToken", { length: 255 }).primaryKey(),
+      userId: varchar("userId", { length: 255 })
+        .notNull()
+        .references(() => usersTable.id, { onDelete: "cascade" }),
+      expires: timestamp("expires", { mode: "date" }).notNull(),
+    }) satisfies DefaultMySqlSessionsTable)
 
-export const mysqlVerificationTokensTable = mysqlTable(
-  "verificationToken",
-  {
-    identifier: varchar("identifier", { length: 255 }).notNull(),
-    token: varchar("token", { length: 255 }).notNull(),
-    expires: timestamp("expires", { mode: "date" }).notNull(),
-  },
-  (vt) => ({
-    compositePk: primaryKey({ columns: [vt.identifier, vt.token] }),
-  })
-) satisfies DefaultMySqlVerificationTokenTable
+  const verificationTokensTable =
+    schema.verificationTokensTable ??
+    (mysqlTable(
+      "verificationToken",
+      {
+        identifier: varchar("identifier", { length: 255 }).notNull(),
+        token: varchar("token", { length: 255 }).notNull(),
+        expires: timestamp("expires", { mode: "date" }).notNull(),
+      },
+      (vt) => ({
+        compositePk: primaryKey({ columns: [vt.identifier, vt.token] }),
+      })
+    ) satisfies DefaultMySqlVerificationTokenTable)
+
+  return {
+    usersTable,
+    accountsTable,
+    sessionsTable,
+    verificationTokensTable,
+  }
+}
 
 export function MySqlDrizzleAdapter(
   client: MySqlDatabase<QueryResultHKT, PreparedQueryHKTBase, any>,
-  schema: DefaultMySqlSchema = {
-    usersTable: mysqlUsersTable,
-    accountsTable: mysqlAccountsTable,
-    sessionsTable: mysqlSessionsTable,
-    verificationTokensTable: mysqlVerificationTokensTable,
-  }
+  schema?: DefaultMySqlSchema
 ): Adapter {
   const { usersTable, accountsTable, sessionsTable, verificationTokensTable } =
-    schema
+    defineTables(schema)
 
   return {
     async createUser(data: AdapterUser) {
+      const { id, ...insertData } = data
       const hasDefaultId = getTableColumns(usersTable)["id"]["hasDefault"]
 
       await client
         .insert(usersTable)
-        .values(hasDefaultId ? data : { ...data, id: crypto.randomUUID() })
+        .values(hasDefaultId ? insertData : { ...insertData, id })
 
       return client
         .select()
@@ -442,6 +460,6 @@ export type DefaultMySqlVerificationTokenTable = MySqlTableWithColumns<{
 export type DefaultMySqlSchema = {
   usersTable: DefaultMySqlUsersTable
   accountsTable: DefaultMySqlAccountsTable
-  sessionsTable: DefaultMySqlSessionsTable
-  verificationTokensTable: DefaultMySqlVerificationTokenTable
+  sessionsTable?: DefaultMySqlSessionsTable
+  verificationTokensTable?: DefaultMySqlVerificationTokenTable
 }

package/src/lib/pg.ts

@@ -14,88 +14,104 @@ import {
 import type {
   Adapter,
   AdapterAccount,
+  AdapterAccountType,
   AdapterSession,
   AdapterUser,
   VerificationToken,
 } from "@auth/core/adapters"
 
-export const postgresUsersTable = pgTable("user", {
-  id: text("id")
-    .primaryKey()
-    .$defaultFn(() => crypto.randomUUID()),
-  name: text("name"),
-  email: text("email").notNull(),
-  emailVerified: timestamp("emailVerified", { mode: "date" }),
-  image: text("image"),
-}) satisfies DefaultPostgresUsersTable
+export function defineTables(
+  schema: Partial<DefaultPostgresSchema> = {}
+): Required<DefaultPostgresSchema> {
+  const usersTable =
+    schema.usersTable ??
+    (pgTable("user", {
+      id: text("id")
+        .primaryKey()
+        .$defaultFn(() => crypto.randomUUID()),
+      name: text("name"),
+      email: text("email").notNull(),
+      emailVerified: timestamp("emailVerified", { mode: "date" }),
+      image: text("image"),
+    }) satisfies DefaultPostgresUsersTable)
 
-export const postgresAccountsTable = pgTable(
-  "account",
-  {
-    userId: text("userId")
-      .notNull()
-      .references(() => postgresUsersTable.id, { onDelete: "cascade" }),
-    type: text("type").$type<AdapterAccount["type"]>().notNull(),
-    provider: text("provider").notNull(),
-    providerAccountId: text("providerAccountId").notNull(),
-    refresh_token: text("refresh_token"),
-    access_token: text("access_token"),
-    expires_at: integer("expires_at"),
-    token_type: text("token_type"),
-    scope: text("scope"),
-    id_token: text("id_token"),
-    session_state: text("session_state"),
-  },
-  (table) => {
-    return {
-      compositePk: primaryKey({
-        columns: [table.provider, table.providerAccountId],
-      }),
-    }
-  }
-) satisfies DefaultPostgresAccountsTable
+  const accountsTable =
+    schema.accountsTable ??
+    (pgTable(
+      "account",
+      {
+        userId: text("userId")
+          .notNull()
+          .references(() => usersTable.id, { onDelete: "cascade" }),
+        type: text("type").$type<AdapterAccountType>().notNull(),
+        provider: text("provider").notNull(),
+        providerAccountId: text("providerAccountId").notNull(),
+        refresh_token: text("refresh_token"),
+        access_token: text("access_token"),
+        expires_at: integer("expires_at"),
+        token_type: text("token_type"),
+        scope: text("scope"),
+        id_token: text("id_token"),
+        session_state: text("session_state"),
+      },
+      (table) => {
+        return {
+          compositePk: primaryKey({
+            columns: [table.provider, table.providerAccountId],
+          }),
+        }
+      }
+    ) satisfies DefaultPostgresAccountsTable)
 
-export const postgresSessionsTable = pgTable("session", {
-  sessionToken: text("sessionToken").primaryKey(),
-  userId: text("userId")
-    .notNull()
-    .references(() => postgresUsersTable.id, { onDelete: "cascade" }),
-  expires: timestamp("expires", { mode: "date" }).notNull(),
-}) satisfies DefaultPostgresSessionsTable
+  const sessionsTable =
+    schema.sessionsTable ??
+    (pgTable("session", {
+      sessionToken: text("sessionToken").primaryKey(),
+      userId: text("userId")
+        .notNull()
+        .references(() => usersTable.id, { onDelete: "cascade" }),
+      expires: timestamp("expires", { mode: "date" }).notNull(),
+    }) satisfies DefaultPostgresSessionsTable)
 
-export const postgresVerificationTokensTable = pgTable(
-  "verificationToken",
-  {
-    identifier: text("identifier").notNull(),
-    token: text("token").notNull(),
-    expires: timestamp("expires", { mode: "date" }).notNull(),
-  },
-  (table) => {
-    return {
-      compositePk: primaryKey({ columns: [table.identifier, table.token] }),
-    }
+  const verificationTokensTable =
+    schema.verificationTokensTable ??
+    (pgTable(
+      "verificationToken",
+      {
+        identifier: text("identifier").notNull(),
+        token: text("token").notNull(),
+        expires: timestamp("expires", { mode: "date" }).notNull(),
+      },
+      (table) => {
+        return {
+          compositePk: primaryKey({ columns: [table.identifier, table.token] }),
+        }
+      }
+    ) satisfies DefaultPostgresVerificationTokenTable)
+
+  return {
+    usersTable,
+    accountsTable,
+    sessionsTable,
+    verificationTokensTable,
   }
-) satisfies DefaultPostgresVerificationTokenTable
+}
 
 export function PostgresDrizzleAdapter(
   client: PgDatabase<QueryResultHKT, any>,
-  schema: DefaultPostgresSchema = {
-    usersTable: postgresUsersTable,
-    accountsTable: postgresAccountsTable,
-    sessionsTable: postgresSessionsTable,
-    verificationTokensTable: postgresVerificationTokensTable,
-  }
+  schema?: DefaultPostgresSchema
 ): Adapter {
   const { usersTable, accountsTable, sessionsTable, verificationTokensTable } =
-    schema
+    defineTables(schema)
 
   return {
     async createUser(data: AdapterUser) {
+      const { id, ...insertData } = data
       const hasDefaultId = getTableColumns(usersTable)["id"]["hasDefault"]
 
       return client
         .insert(usersTable)
-        .values(hasDefaultId ? data : { ...data, id: crypto.randomUUID() })
+        .values(hasDefaultId ? insertData : { ...insertData, id })
         .returning()
         .then((res) => res[0])
     },
@@ -413,6 +429,6 @@ export type DefaultPostgresVerificationTokenTable = PgTableWithColumns<{
 export type DefaultPostgresSchema = {
   usersTable: DefaultPostgresUsersTable
   accountsTable: DefaultPostgresAccountsTable
-  sessionsTable: DefaultPostgresSessionsTable
-  verificationTokensTable: DefaultPostgresVerificationTokenTable
+  sessionsTable?: DefaultPostgresSessionsTable
+  verificationTokensTable?: DefaultPostgresVerificationTokenTable
 }