@auth/drizzle-adapter 1.0.1 → 1.2.0

package/src/lib/pg.ts

@@ -1,9 +1,10 @@
-import { and, eq, getTableColumns } from "drizzle-orm"
+import { InferInsertModel, and, eq, getTableColumns } from "drizzle-orm"
 import {
   PgColumn,
   PgDatabase,
   PgTableWithColumns,
   QueryResultHKT,
+  boolean,
   integer,
   pgTable,
   primaryKey,
@@ -14,88 +15,132 @@ import {
 import type {
   Adapter,
   AdapterAccount,
+  AdapterAccountType,
+  AdapterAuthenticator,
   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"),
+      },
+      (account) => ({
+        compositePk: primaryKey({
+          columns: [account.provider, account.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(),
+      },
+      (verficationToken) => ({
+        compositePk: primaryKey({
+          columns: [verficationToken.identifier, verficationToken.token],
+        }),
+      })
+    ) satisfies DefaultPostgresVerificationTokenTable)
+
+  const authenticatorsTable =
+    schema.authenticatorsTable ??
+    (pgTable(
+      "authenticator",
+      {
+        credentialID: text("credentialID").notNull().unique(),
+        userId: text("userId")
+          .notNull()
+          .references(() => usersTable.id, { onDelete: "cascade" }),
+        providerAccountId: text("providerAccountId").notNull(),
+        credentialPublicKey: text("credentialPublicKey").notNull(),
+        counter: integer("counter").notNull(),
+        credentialDeviceType: text("credentialDeviceType").notNull(),
+        credentialBackedUp: boolean("credentialBackedUp").notNull(),
+        transports: text("transports"),
+      },
+      (authenticator) => ({
+        compositePK: primaryKey({
+          columns: [authenticator.userId, authenticator.credentialID],
+        }),
+      })
+    ) satisfies DefaultPostgresAuthenticatorTable)
+
+  return {
+    usersTable,
+    accountsTable,
+    sessionsTable,
+    verificationTokensTable,
+    authenticatorsTable,
   }
-) 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
+  const {
+    usersTable,
+    accountsTable,
+    sessionsTable,
+    verificationTokensTable,
+    authenticatorsTable,
+  } = 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])
     },
@@ -224,21 +269,72 @@ export function PostgresDrizzleAdapter(
           )
         )
     },
+    async getAccount(providerAccountId: string, provider: string) {
+      return client
+        .select()
+        .from(accountsTable)
+        .where(
+          and(
+            eq(accountsTable.provider, provider),
+            eq(accountsTable.providerAccountId, providerAccountId)
+          )
+        )
+        .then((res) => res[0] ?? null) as Promise<AdapterAccount | null>
+    },
+    async createAuthenticator(data: AdapterAuthenticator) {
+      return client
+        .insert(authenticatorsTable)
+        .values(data)
+        .returning()
+        .then((res) => res[0] ?? null)
+    },
+    async getAuthenticator(credentialID: string) {
+      return client
+        .select()
+        .from(authenticatorsTable)
+        .where(eq(authenticatorsTable.credentialID, credentialID))
+        .then((res) => res[0] ?? null)
+    },
+    async listAuthenticatorsByUserId(userId: string) {
+      return client
+        .select()
+        .from(authenticatorsTable)
+        .where(eq(authenticatorsTable.userId, userId))
+        .then((res) => res)
+    },
+    async updateAuthenticatorCounter(credentialID: string, newCounter: number) {
+      const authenticator = await client
+        .update(authenticatorsTable)
+        .set({ counter: newCounter })
+        .where(eq(authenticatorsTable.credentialID, credentialID))
+        .returning()
+        .then((res) => res[0])
+
+      if (!authenticator) throw new Error("Authenticator not found.")
+
+      return authenticator
+    },
   }
 }
 
 type DefaultPostgresColumn<
   T extends {
-    data: string | number | Date
-    dataType: "string" | "number" | "date"
+    data: string | number | boolean | Date
+    dataType: "string" | "number" | "boolean" | "date"
     notNull: boolean
-    columnType: "PgVarchar" | "PgText" | "PgTimestamp" | "PgInteger" | "PgUUID"
+    columnType:
+      | "PgVarchar"
+      | "PgText"
+      | "PgBoolean"
+      | "PgTimestamp"
+      | "PgInteger"
+      | "PgUUID"
   },
 > = PgColumn<{
   name: string
   columnType: T["columnType"]
   data: T["data"]
-  driverParam: string | number
+  driverParam: string | number | boolean
   notNull: T["notNull"]
   hasDefault: boolean
   enumValues: any
@@ -410,9 +506,66 @@ export type DefaultPostgresVerificationTokenTable = PgTableWithColumns<{
   schema: string | undefined
 }>
 
+export type DefaultPostgresAuthenticatorTable = PgTableWithColumns<{
+  name: string
+  columns: {
+    credentialID: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    userId: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    providerAccountId: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    credentialPublicKey: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    counter: DefaultPostgresColumn<{
+      columnType: "PgInteger"
+      data: number
+      notNull: true
+      dataType: "number"
+    }>
+    credentialDeviceType: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    credentialBackedUp: DefaultPostgresColumn<{
+      columnType: "PgBoolean"
+      data: boolean
+      notNull: true
+      dataType: "boolean"
+    }>
+    transports: DefaultPostgresColumn<{
+      columnType: "PgVarchar" | "PgText"
+      data: string
+      notNull: false
+      dataType: "string"
+    }>
+  }
+  dialect: "pg"
+  schema: string | undefined
+}>
+
 export type DefaultPostgresSchema = {
   usersTable: DefaultPostgresUsersTable
   accountsTable: DefaultPostgresAccountsTable
-  sessionsTable: DefaultPostgresSessionsTable
-  verificationTokensTable: DefaultPostgresVerificationTokenTable
+  sessionsTable?: DefaultPostgresSessionsTable
+  verificationTokensTable?: DefaultPostgresVerificationTokenTable
+  authenticatorsTable?: DefaultPostgresAuthenticatorTable
 }