@auth/drizzle-adapter 0.9.0 → 1.0.1

package/src/lib/pg.ts

@@ -1,217 +1,418 @@
-import { and, eq } from "drizzle-orm"
+import { and, eq, getTableColumns } from "drizzle-orm"
 import {
-  timestamp,
-  pgTable as defaultPgTableFn,
-  text,
-  primaryKey,
-  integer,
-  PgTableFn,
+  PgColumn,
   PgDatabase,
+  PgTableWithColumns,
+  QueryResultHKT,
+  integer,
+  pgTable,
+  primaryKey,
+  text,
+  timestamp,
 } from "drizzle-orm/pg-core"
 
-import type { Adapter, AdapterAccount } from "@auth/core/adapters"
-import { stripUndefined } from "./utils.js"
-
-export function createTables(pgTable: PgTableFn) {
-  const users = pgTable("user", {
-    id: text("id").notNull().primaryKey(),
-    name: text("name"),
-    email: text("email").notNull(),
-    emailVerified: timestamp("emailVerified", { mode: "date" }),
-    image: text("image"),
-  })
-
-  const accounts = pgTable(
-    "account",
-    {
-      userId: text("userId")
-        .notNull()
-        .references(() => users.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"),
-    },
-    (account) => ({
-      compoundKey: primaryKey(account.provider, account.providerAccountId),
-    })
-  )
+import type {
+  Adapter,
+  AdapterAccount,
+  AdapterSession,
+  AdapterUser,
+  VerificationToken,
+} from "@auth/core/adapters"
 
-  const sessions = pgTable("session", {
-    sessionToken: text("sessionToken").notNull().primaryKey(),
+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 const postgresAccountsTable = pgTable(
+  "account",
+  {
     userId: text("userId")
       .notNull()
-      .references(() => users.id, { onDelete: "cascade" }),
-    expires: timestamp("expires", { mode: "date" }).notNull(),
-  })
-
-  const verificationTokens = pgTable(
-    "verificationToken",
-    {
-      identifier: text("identifier").notNull(),
-      token: text("token").notNull(),
-      expires: timestamp("expires", { mode: "date" }).notNull(),
-    },
-    (vt) => ({
-      compoundKey: primaryKey(vt.identifier, vt.token),
-    })
-  )
+      .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
 
-  return { users, accounts, sessions, verificationTokens }
-}
+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
 
-export type DefaultSchema = ReturnType<typeof createTables>
+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] }),
+    }
+  }
+) satisfies DefaultPostgresVerificationTokenTable
 
-export function pgDrizzleAdapter(
-  client: InstanceType<typeof PgDatabase>,
-  tableFn = defaultPgTableFn
+export function PostgresDrizzleAdapter(
+  client: PgDatabase<QueryResultHKT, any>,
+  schema: DefaultPostgresSchema = {
+    usersTable: postgresUsersTable,
+    accountsTable: postgresAccountsTable,
+    sessionsTable: postgresSessionsTable,
+    verificationTokensTable: postgresVerificationTokensTable,
+  }
 ): Adapter {
-  const { users, accounts, sessions, verificationTokens } =
-    createTables(tableFn)
+  const { usersTable, accountsTable, sessionsTable, verificationTokensTable } =
+    schema
 
   return {
-    async createUser(data) {
-      return await client
-        .insert(users)
-        .values({ ...data, id: crypto.randomUUID() })
+    async createUser(data: AdapterUser) {
+      const hasDefaultId = getTableColumns(usersTable)["id"]["hasDefault"]
+
+      return client
+        .insert(usersTable)
+        .values(hasDefaultId ? data : { ...data, id: crypto.randomUUID() })
         .returning()
-        .then((res) => res[0] ?? null)
+        .then((res) => res[0])
     },
-    async getUser(data) {
-      return await client
+    async getUser(userId: string) {
+      return client
         .select()
-        .from(users)
-        .where(eq(users.id, data))
-        .then((res) => res[0] ?? null)
+        .from(usersTable)
+        .where(eq(usersTable.id, userId))
+        .then((res) => (res.length > 0 ? res[0] : null))
     },
-    async getUserByEmail(data) {
-      return await client
+    async getUserByEmail(email: string) {
+      return client
         .select()
-        .from(users)
-        .where(eq(users.email, data))
-        .then((res) => res[0] ?? null)
+        .from(usersTable)
+        .where(eq(usersTable.email, email))
+        .then((res) => (res.length > 0 ? res[0] : null))
     },
-    async createSession(data) {
-      return await client
-        .insert(sessions)
+    async createSession(data: {
+      sessionToken: string
+      userId: string
+      expires: Date
+    }) {
+      return client
+        .insert(sessionsTable)
         .values(data)
         .returning()
         .then((res) => res[0])
     },
-    async getSessionAndUser(data) {
-      return await client
+    async getSessionAndUser(sessionToken: string) {
+      return client
         .select({
-          session: sessions,
-          user: users,
+          session: sessionsTable,
+          user: usersTable,
         })
-        .from(sessions)
-        .where(eq(sessions.sessionToken, data))
-        .innerJoin(users, eq(users.id, sessions.userId))
-        .then((res) => res[0] ?? null)
+        .from(sessionsTable)
+        .where(eq(sessionsTable.sessionToken, sessionToken))
+        .innerJoin(usersTable, eq(usersTable.id, sessionsTable.userId))
+        .then((res) => (res.length > 0 ? res[0] : null))
     },
-    async updateUser(data) {
+    async updateUser(data: Partial<AdapterUser> & Pick<AdapterUser, "id">) {
       if (!data.id) {
         throw new Error("No user id.")
       }
 
-      return await client
-        .update(users)
+      const [result] = await client
+        .update(usersTable)
         .set(data)
-        .where(eq(users.id, data.id))
+        .where(eq(usersTable.id, data.id))
         .returning()
-        .then((res) => res[0])
+
+      if (!result) {
+        throw new Error("No user found.")
+      }
+
+      return result
     },
-    async updateSession(data) {
-      return await client
-        .update(sessions)
+    async updateSession(
+      data: Partial<AdapterSession> & Pick<AdapterSession, "sessionToken">
+    ) {
+      return client
+        .update(sessionsTable)
         .set(data)
-        .where(eq(sessions.sessionToken, data.sessionToken))
+        .where(eq(sessionsTable.sessionToken, data.sessionToken))
         .returning()
         .then((res) => res[0])
     },
-    async linkAccount(rawAccount) {
-      return stripUndefined(
-        await client
-          .insert(accounts)
-          .values(rawAccount)
-          .returning()
-          .then((res) => res[0])
-      )
+    async linkAccount(data: AdapterAccount) {
+      await client.insert(accountsTable).values(data)
     },
-    async getUserByAccount(account) {
-      const dbAccount =
-        (await client
-          .select()
-          .from(accounts)
-          .where(
-            and(
-              eq(accounts.providerAccountId, account.providerAccountId),
-              eq(accounts.provider, account.provider)
-            )
+    async getUserByAccount(
+      account: Pick<AdapterAccount, "provider" | "providerAccountId">
+    ) {
+      const result = await client
+        .select({
+          account: accountsTable,
+          user: usersTable,
+        })
+        .from(accountsTable)
+        .innerJoin(usersTable, eq(accountsTable.userId, usersTable.id))
+        .where(
+          and(
+            eq(accountsTable.provider, account.provider),
+            eq(accountsTable.providerAccountId, account.providerAccountId)
           )
-          .leftJoin(users, eq(accounts.userId, users.id))
-          .then((res) => res[0])) ?? null
+        )
+        .then((res) => res[0])
 
-      return dbAccount?.user ?? null
+      return result?.user ?? null
     },
-    async deleteSession(sessionToken) {
-      const session = await client
-        .delete(sessions)
-        .where(eq(sessions.sessionToken, sessionToken))
-        .returning()
-        .then((res) => res[0] ?? null)
-
-      return session
+    async deleteSession(sessionToken: string) {
+      await client
+        .delete(sessionsTable)
+        .where(eq(sessionsTable.sessionToken, sessionToken))
     },
-    async createVerificationToken(token) {
-      return await client
-        .insert(verificationTokens)
-        .values(token)
+    async createVerificationToken(data: VerificationToken) {
+      return client
+        .insert(verificationTokensTable)
+        .values(data)
         .returning()
         .then((res) => res[0])
     },
-    async useVerificationToken(token) {
-      try {
-        return await client
-          .delete(verificationTokens)
-          .where(
-            and(
-              eq(verificationTokens.identifier, token.identifier),
-              eq(verificationTokens.token, token.token)
-            )
+    async useVerificationToken(params: { identifier: string; token: string }) {
+      return client
+        .delete(verificationTokensTable)
+        .where(
+          and(
+            eq(verificationTokensTable.identifier, params.identifier),
+            eq(verificationTokensTable.token, params.token)
           )
-          .returning()
-          .then((res) => res[0] ?? null)
-      } catch (err) {
-        throw new Error("No verification token found.")
-      }
-    },
-    async deleteUser(id) {
-      await client
-        .delete(users)
-        .where(eq(users.id, id))
+        )
         .returning()
-        .then((res) => res[0] ?? null)
+        .then((res) => (res.length > 0 ? res[0] : null))
+    },
+    async deleteUser(id: string) {
+      await client.delete(usersTable).where(eq(usersTable.id, id))
     },
-    async unlinkAccount(account) {
-      const { type, provider, providerAccountId, userId } = await client
-        .delete(accounts)
+    async unlinkAccount(
+      params: Pick<AdapterAccount, "provider" | "providerAccountId">
+    ) {
+      await client
+        .delete(accountsTable)
         .where(
           and(
-            eq(accounts.providerAccountId, account.providerAccountId),
-            eq(accounts.provider, account.provider)
+            eq(accountsTable.provider, params.provider),
+            eq(accountsTable.providerAccountId, params.providerAccountId)
           )
         )
-        .returning()
-        .then((res) => res[0] ?? null)
-
-      return { provider, type, providerAccountId, userId }
     },
   }
 }
+
+type DefaultPostgresColumn<
+  T extends {
+    data: string | number | Date
+    dataType: "string" | "number" | "date"
+    notNull: boolean
+    columnType: "PgVarchar" | "PgText" | "PgTimestamp" | "PgInteger" | "PgUUID"
+  },
+> = PgColumn<{
+  name: string
+  columnType: T["columnType"]
+  data: T["data"]
+  driverParam: string | number
+  notNull: T["notNull"]
+  hasDefault: boolean
+  enumValues: any
+  dataType: T["dataType"]
+  tableName: string
+}>
+
+export type DefaultPostgresUsersTable = PgTableWithColumns<{
+  name: string
+  columns: {
+    id: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText" | "PgUUID"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    name: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: boolean
+      dataType: "string"
+    }>
+    email: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    emailVerified: DefaultPostgresColumn<{
+      dataType: "date"
+      columnType: "PgTimestamp"
+      data: Date
+      notNull: boolean
+    }>
+    image: DefaultPostgresColumn<{
+      dataType: "string"
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: boolean
+    }>
+  }
+  dialect: "pg"
+  schema: string | undefined
+}>
+
+export type DefaultPostgresAccountsTable = PgTableWithColumns<{
+  name: string
+  columns: {
+    userId: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText" | "PgUUID"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    type: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    provider: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    providerAccountId: DefaultPostgresColumn<{
+      dataType: "string"
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: true
+    }>
+    refresh_token: DefaultPostgresColumn<{
+      dataType: "string"
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: boolean
+    }>
+    access_token: DefaultPostgresColumn<{
+      dataType: "string"
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: boolean
+    }>
+    expires_at: DefaultPostgresColumn<{
+      dataType: "number"
+      columnType: "PgInteger"
+      data: number
+      notNull: boolean
+    }>
+    token_type: DefaultPostgresColumn<{
+      dataType: "string"
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: boolean
+    }>
+    scope: DefaultPostgresColumn<{
+      dataType: "string"
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: boolean
+    }>
+    id_token: DefaultPostgresColumn<{
+      dataType: "string"
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: boolean
+    }>
+    session_state: DefaultPostgresColumn<{
+      dataType: "string"
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: boolean
+    }>
+  }
+  dialect: "pg"
+  schema: string | undefined
+}>
+
+export type DefaultPostgresSessionsTable = PgTableWithColumns<{
+  name: string
+  columns: {
+    sessionToken: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    userId: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText" | "PgUUID"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    expires: DefaultPostgresColumn<{
+      dataType: "date"
+      columnType: "PgTimestamp"
+      data: Date
+      notNull: true
+    }>
+  }
+  dialect: "pg"
+  schema: string | undefined
+}>
+
+export type DefaultPostgresVerificationTokenTable = PgTableWithColumns<{
+  name: string
+  columns: {
+    identifier: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    token: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    expires: DefaultPostgresColumn<{
+      dataType: "date"
+      columnType: "PgTimestamp"
+      data: Date
+      notNull: true
+    }>
+  }
+  dialect: "pg"
+  schema: string | undefined
+}>
+
+export type DefaultPostgresSchema = {
+  usersTable: DefaultPostgresUsersTable
+  accountsTable: DefaultPostgresAccountsTable
+  sessionsTable: DefaultPostgresSessionsTable
+  verificationTokensTable: DefaultPostgresVerificationTokenTable
+}