@auth/drizzle-adapter 0.9.0 → 1.0.1

package/src/lib/mysql.ts

@@ -1,264 +1,447 @@
-import { and, eq } from "drizzle-orm"
+import { and, eq, getTableColumns } from "drizzle-orm"
 import {
+  MySqlColumn,
+  MySqlDatabase,
+  MySqlTableWithColumns,
+  PreparedQueryHKTBase,
+  QueryResultHKT,
   int,
-  timestamp,
-  mysqlTable as defaultMySqlTableFn,
+  mysqlTable,
   primaryKey,
+  timestamp,
   varchar,
-  MySqlTableFn,
-  MySqlDatabase,
 } from "drizzle-orm/mysql-core"
 
-import type { Adapter, AdapterAccount } from "@auth/core/adapters"
+import type {
+  Adapter,
+  AdapterAccount,
+  AdapterSession,
+  AdapterUser,
+  VerificationToken,
+} from "@auth/core/adapters"
 
-export function createTables(mySqlTable: MySqlTableFn) {
-  const users = mySqlTable("user", {
-    id: varchar("id", { length: 255 }).notNull().primaryKey(),
-    name: varchar("name", { length: 255 }),
-    email: varchar("email", { length: 255 }).notNull(),
-    emailVerified: timestamp("emailVerified", {
-      mode: "date",
-      fsp: 3,
-    }).defaultNow(),
-    image: varchar("image", { length: 255 }),
-  })
-
-  const accounts = mySqlTable(
-    "account",
-    {
-      userId: varchar("userId", { length: 255 })
-        .notNull()
-        .references(() => users.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: 255 }),
-      session_state: varchar("session_state", { length: 255 }),
-    },
-    (account) => ({
-      compoundKey: primaryKey(account.provider, account.providerAccountId),
-    })
-  )
+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
 
-  const sessions = mySqlTable("session", {
-    sessionToken: varchar("sessionToken", { length: 255 })
-      .notNull()
-      .primaryKey(),
+export const mysqlAccountsTable = mysqlTable(
+  "account",
+  {
     userId: varchar("userId", { length: 255 })
       .notNull()
-      .references(() => users.id, { onDelete: "cascade" }),
-    expires: timestamp("expires", { mode: "date" }).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 verificationTokens = mySqlTable(
-    "verificationToken",
-    {
-      identifier: varchar("identifier", { length: 255 }).notNull(),
-      token: varchar("token", { length: 255 }).notNull(),
-      expires: timestamp("expires", { mode: "date" }).notNull(),
-    },
-    (vt) => ({
-      compoundKey: primaryKey(vt.identifier, vt.token),
-    })
-  )
-
-  return { users, accounts, sessions, verificationTokens }
-}
+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
 
-export type DefaultSchema = ReturnType<typeof createTables>
+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
 
-export function mySqlDrizzleAdapter(
-  client: InstanceType<typeof MySqlDatabase>,
-  tableFn = defaultMySqlTableFn
+export function MySqlDrizzleAdapter(
+  client: MySqlDatabase<QueryResultHKT, PreparedQueryHKTBase, any>,
+  schema: DefaultMySqlSchema = {
+    usersTable: mysqlUsersTable,
+    accountsTable: mysqlAccountsTable,
+    sessionsTable: mysqlSessionsTable,
+    verificationTokensTable: mysqlVerificationTokensTable,
+  }
 ): Adapter {
-  const { users, accounts, sessions, verificationTokens } =
-    createTables(tableFn)
+  const { usersTable, accountsTable, sessionsTable, verificationTokensTable } =
+    schema
 
   return {
-    async createUser(data) {
-      const id = crypto.randomUUID()
+    async createUser(data: AdapterUser) {
+      const hasDefaultId = getTableColumns(usersTable)["id"]["hasDefault"]
 
-      await client.insert(users).values({ ...data, id })
+      await client
+        .insert(usersTable)
+        .values(hasDefaultId ? data : { ...data, id: crypto.randomUUID() })
 
-      return await client
+      return client
         .select()
-        .from(users)
-        .where(eq(users.id, id))
+        .from(usersTable)
+        .where(eq(usersTable.email, data.email))
         .then((res) => res[0])
     },
-    async getUser(data) {
-      const thing =
-        (await client
-          .select()
-          .from(users)
-          .where(eq(users.id, data))
-          .then((res) => res[0])) ?? null
-
-      return thing
+    async getUser(userId: string) {
+      return client
+        .select()
+        .from(usersTable)
+        .where(eq(usersTable.id, userId))
+        .then((res) => (res.length > 0 ? res[0] : null))
     },
-    async getUserByEmail(data) {
-      const user =
-        (await client
-          .select()
-          .from(users)
-          .where(eq(users.email, data))
-          .then((res) => res[0])) ?? null
-
-      return user
+    async getUserByEmail(email: string) {
+      return client
+        .select()
+        .from(usersTable)
+        .where(eq(usersTable.email, email))
+        .then((res) => (res.length > 0 ? res[0] : null))
     },
-    async createSession(data) {
-      await client.insert(sessions).values(data)
+    async createSession(data: {
+      sessionToken: string
+      userId: string
+      expires: Date
+    }) {
+      await client.insert(sessionsTable).values(data)
 
-      return await client
+      return client
         .select()
-        .from(sessions)
-        .where(eq(sessions.sessionToken, data.sessionToken))
+        .from(sessionsTable)
+        .where(eq(sessionsTable.sessionToken, data.sessionToken))
         .then((res) => res[0])
     },
-    async getSessionAndUser(data) {
-      const sessionAndUser =
-        (await client
-          .select({
-            session: sessions,
-            user: users,
-          })
-          .from(sessions)
-          .where(eq(sessions.sessionToken, data))
-          .innerJoin(users, eq(users.id, sessions.userId))
-          .then((res) => res[0])) ?? null
-
-      return sessionAndUser
+    async getSessionAndUser(sessionToken: string) {
+      return client
+        .select({
+          session: sessionsTable,
+          user: usersTable,
+        })
+        .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.")
       }
 
-      await client.update(users).set(data).where(eq(users.id, data.id))
+      await client
+        .update(usersTable)
+        .set(data)
+        .where(eq(usersTable.id, data.id))
 
-      return await client
+      const [result] = await client
         .select()
-        .from(users)
-        .where(eq(users.id, data.id))
-        .then((res) => res[0])
+        .from(usersTable)
+        .where(eq(usersTable.id, data.id))
+
+      if (!result) {
+        throw new Error("No user found.")
+      }
+
+      return result
     },
-    async updateSession(data) {
+    async updateSession(
+      data: Partial<AdapterSession> & Pick<AdapterSession, "sessionToken">
+    ) {
       await client
-        .update(sessions)
+        .update(sessionsTable)
         .set(data)
-        .where(eq(sessions.sessionToken, data.sessionToken))
+        .where(eq(sessionsTable.sessionToken, data.sessionToken))
 
-      return await client
+      return client
         .select()
-        .from(sessions)
-        .where(eq(sessions.sessionToken, data.sessionToken))
+        .from(sessionsTable)
+        .where(eq(sessionsTable.sessionToken, data.sessionToken))
         .then((res) => res[0])
     },
-    async linkAccount(rawAccount) {
-      await client.insert(accounts).values(rawAccount)
+    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
-
-      if (!dbAccount) {
-        return null
-      }
+        )
+        .then((res) => res[0])
 
-      return dbAccount.user
+      return result?.user ?? null
     },
-    async deleteSession(sessionToken) {
-      const session =
-        (await client
-          .select()
-          .from(sessions)
-          .where(eq(sessions.sessionToken, sessionToken))
-          .then((res) => res[0])) ?? null
-
+    async deleteSession(sessionToken: string) {
       await client
-        .delete(sessions)
-        .where(eq(sessions.sessionToken, sessionToken))
-
-      return session
+        .delete(sessionsTable)
+        .where(eq(sessionsTable.sessionToken, sessionToken))
     },
-    async createVerificationToken(token) {
-      await client.insert(verificationTokens).values(token)
+    async createVerificationToken(data: VerificationToken) {
+      await client.insert(verificationTokensTable).values(data)
 
-      return await client
+      return client
         .select()
-        .from(verificationTokens)
-        .where(eq(verificationTokens.identifier, token.identifier))
+        .from(verificationTokensTable)
+        .where(eq(verificationTokensTable.identifier, data.identifier))
         .then((res) => res[0])
     },
-    async useVerificationToken(token) {
-      try {
-        const deletedToken =
-          (await client
-            .select()
-            .from(verificationTokens)
-            .where(
-              and(
-                eq(verificationTokens.identifier, token.identifier),
-                eq(verificationTokens.token, token.token)
-              )
-            )
-            .then((res) => res[0])) ?? null
+    async useVerificationToken(params: { identifier: string; token: string }) {
+      const deletedToken = await client
+        .select()
+        .from(verificationTokensTable)
+        .where(
+          and(
+            eq(verificationTokensTable.identifier, params.identifier),
+            eq(verificationTokensTable.token, params.token)
+          )
+        )
+        .then((res) => (res.length > 0 ? res[0] : null))
 
+      if (deletedToken) {
         await client
-          .delete(verificationTokens)
+          .delete(verificationTokensTable)
           .where(
             and(
-              eq(verificationTokens.identifier, token.identifier),
-              eq(verificationTokens.token, token.token)
+              eq(verificationTokensTable.identifier, params.identifier),
+              eq(verificationTokensTable.token, params.token)
             )
           )
-
-        return deletedToken
-      } catch (err) {
-        throw new Error("No verification token found.")
       }
-    },
-    async deleteUser(id) {
-      const user = await client
-        .select()
-        .from(users)
-        .where(eq(users.id, id))
-        .then((res) => res[0] ?? null)
-
-      await client.delete(users).where(eq(users.id, id))
 
-      return user
+      return deletedToken
     },
-    async unlinkAccount(account) {
+    async deleteUser(id: string) {
+      await client.delete(usersTable).where(eq(usersTable.id, id))
+    },
+    async unlinkAccount(
+      params: Pick<AdapterAccount, "provider" | "providerAccountId">
+    ) {
       await client
-        .delete(accounts)
+        .delete(accountsTable)
         .where(
           and(
-            eq(accounts.providerAccountId, account.providerAccountId),
-            eq(accounts.provider, account.provider)
+            eq(accountsTable.provider, params.provider),
+            eq(accountsTable.providerAccountId, params.providerAccountId)
           )
         )
-
-      return undefined
     },
   }
 }
+
+type DefaultMyqlColumn<
+  T extends {
+    data: string | number | Date
+    dataType: "string" | "number" | "date"
+    notNull: boolean
+    columnType: "MySqlVarChar" | "MySqlText" | "MySqlTimestamp" | "MySqlInt"
+  },
+> = MySqlColumn<{
+  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 DefaultMySqlUsersTable = MySqlTableWithColumns<{
+  name: string
+  columns: {
+    id: DefaultMyqlColumn<{
+      data: string
+      dataType: "string"
+      notNull: true
+      columnType: "MySqlVarChar" | "MySqlText"
+    }>
+    name: DefaultMyqlColumn<{
+      data: string
+      dataType: "string"
+      notNull: boolean
+      columnType: "MySqlVarChar" | "MySqlText"
+    }>
+    email: DefaultMyqlColumn<{
+      data: string
+      dataType: "string"
+      notNull: true
+      columnType: "MySqlVarChar" | "MySqlText"
+    }>
+    emailVerified: DefaultMyqlColumn<{
+      data: Date
+      dataType: "date"
+      notNull: boolean
+      columnType: "MySqlTimestamp"
+    }>
+    image: DefaultMyqlColumn<{
+      data: string
+      dataType: "string"
+      notNull: boolean
+      columnType: "MySqlVarChar" | "MySqlText"
+    }>
+  }
+  dialect: "mysql"
+  schema: string | undefined
+}>
+
+export type DefaultMySqlAccountsTable = MySqlTableWithColumns<{
+  name: string
+  columns: {
+    userId: DefaultMyqlColumn<{
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    type: DefaultMyqlColumn<{
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    provider: DefaultMyqlColumn<{
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    providerAccountId: DefaultMyqlColumn<{
+      dataType: "string"
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      notNull: true
+    }>
+    refresh_token: DefaultMyqlColumn<{
+      dataType: "string"
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      notNull: boolean
+    }>
+    access_token: DefaultMyqlColumn<{
+      dataType: "string"
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      driverParam: string | number
+      notNull: boolean
+    }>
+    expires_at: DefaultMyqlColumn<{
+      dataType: "number"
+      columnType: "MySqlInt"
+      data: number
+      notNull: boolean
+    }>
+    token_type: DefaultMyqlColumn<{
+      dataType: "string"
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      notNull: boolean
+    }>
+    scope: DefaultMyqlColumn<{
+      dataType: "string"
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      notNull: boolean
+    }>
+    id_token: DefaultMyqlColumn<{
+      dataType: "string"
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      notNull: boolean
+    }>
+    session_state: DefaultMyqlColumn<{
+      dataType: "string"
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      notNull: boolean
+    }>
+  }
+  dialect: "mysql"
+  schema: string | undefined
+}>
+
+export type DefaultMySqlSessionsTable = MySqlTableWithColumns<{
+  name: string
+  columns: {
+    sessionToken: DefaultMyqlColumn<{
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    userId: DefaultMyqlColumn<{
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    expires: DefaultMyqlColumn<{
+      dataType: "date"
+      columnType: "MySqlTimestamp"
+      data: Date
+      notNull: true
+    }>
+  }
+  dialect: "mysql"
+  schema: string | undefined
+}>
+
+export type DefaultMySqlVerificationTokenTable = MySqlTableWithColumns<{
+  name: string
+  columns: {
+    identifier: DefaultMyqlColumn<{
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    token: DefaultMyqlColumn<{
+      columnType: "MySqlVarChar" | "MySqlText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    expires: DefaultMyqlColumn<{
+      dataType: "date"
+      columnType: "MySqlTimestamp"
+      data: Date
+      notNull: true
+    }>
+  }
+  dialect: "mysql"
+  schema: string | undefined
+}>
+
+export type DefaultMySqlSchema = {
+  usersTable: DefaultMySqlUsersTable
+  accountsTable: DefaultMySqlAccountsTable
+  sessionsTable: DefaultMySqlSessionsTable
+  verificationTokensTable: DefaultMySqlVerificationTokenTable
+}