remove id opt in for composite primary key instead

nextauthjs · May 10, 2024 · c488cde · c488cde
1 parent abfa66e
commit c488cde
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 74 deletions.
diff --git a/packages/adapter-drizzle/src/lib/mysql.ts b/packages/adapter-drizzle/src/lib/mysql.ts
@@ -89,32 +89,43 @@ export function defineTables(
         token: varchar("token", { length: 255 }).notNull(),
         expires: timestamp("expires", { mode: "date" }).notNull(),
       },
-      (vt) => ({
-        compositePk: primaryKey({ columns: [vt.identifier, vt.token] }),
+      (verficationToken) => ({
+        compositePk: primaryKey({
+          columns: [verficationToken.identifier, verficationToken.token],
+        }),
       })
     ) satisfies DefaultMySqlVerificationTokenTable)
 
   const authenticatorsTable =
     schema.authenticatorsTable ??
-    (mysqlTable("authenticator", {
-      id: varchar("id", { length: 255 }).notNull().primaryKey(),
-      credentialID: varchar("credentialID", { length: 255 }).notNull().unique(),
-      userId: varchar("userId", { length: 255 })
-        .notNull()
-        .references(() => usersTable.id, { onDelete: "cascade" }),
-      providerAccountId: varchar("providerAccountId", {
-        length: 255,
-      }).notNull(),
-      credentialPublicKey: varchar("credentialPublicKey", {
-        length: 255,
-      }).notNull(),
-      counter: int("counter").notNull(),
-      credentialDeviceType: varchar("credentialDeviceType", {
-        length: 255,
-      }).notNull(),
-      credentialBackedUp: boolean("credentialBackedUp").notNull(),
-      transports: varchar("transports", { length: 255 }),
-    }) satisfies DefaultMySqlAuthenticatorTable)
+    (mysqlTable(
+      "authenticator",
+      {
+        credentialID: varchar("credentialID", { length: 255 })
+          .notNull()
+          .unique(),
+        userId: varchar("userId", { length: 255 })
+          .notNull()
+          .references(() => usersTable.id, { onDelete: "cascade" }),
+        providerAccountId: varchar("providerAccountId", {
+          length: 255,
+        }).notNull(),
+        credentialPublicKey: varchar("credentialPublicKey", {
+          length: 255,
+        }).notNull(),
+        counter: int("counter").notNull(),
+        credentialDeviceType: varchar("credentialDeviceType", {
+          length: 255,
+        }).notNull(),
+        credentialBackedUp: boolean("credentialBackedUp").notNull(),
+        transports: varchar("transports", { length: 255 }),
+      },
+      (authenticator) => ({
+        compositePk: primaryKey({
+          columns: [authenticator.userId, authenticator.credentialID],
+        }),
+      })
+    ) satisfies DefaultMySqlAuthenticatorTable)
 
   return {
     usersTable,
@@ -303,9 +314,7 @@ export function MySqlDrizzleAdapter(
         )
     },
     async createAuthenticator(data: AdapterAuthenticator) {
-      await client
-        .insert(authenticatorsTable)
-        .values({ ...data, id: crypto.randomUUID() })
+      await client.insert(authenticatorsTable).values(data)
 
       return await client
         .select()
@@ -535,12 +544,6 @@ export type DefaultMySqlVerificationTokenTable = MySqlTableWithColumns<{
 export type DefaultMySqlAuthenticatorTable = MySqlTableWithColumns<{
   name: string
   columns: {
-    id: DefaultMyqlColumn<{
-      columnType: "MySqlVarChar" | "MySqlText"
-      data: string
-      notNull: true
-      dataType: "string"
-    }>
     credentialID: DefaultMyqlColumn<{
       columnType: "MySqlVarChar" | "MySqlText"
       data: string

diff --git a/packages/adapter-drizzle/src/lib/pg.ts b/packages/adapter-drizzle/src/lib/pg.ts
@@ -56,13 +56,11 @@ export function defineTables(
         id_token: text("id_token"),
         session_state: text("session_state"),
       },
-      (table) => {
-        return {
-          compositePk: primaryKey({
-            columns: [table.provider, table.providerAccountId],
-          }),
-        }
-      }
+      (account) => ({
+        compositePk: primaryKey({
+          columns: [account.provider, account.providerAccountId],
+        }),
+      })
     ) satisfies DefaultPostgresAccountsTable)
 
   const sessionsTable =
@@ -84,28 +82,35 @@ export function defineTables(
         token: text("token").notNull(),
         expires: timestamp("expires", { mode: "date" }).notNull(),
       },
-      (table) => {
-        return {
-          compositePk: primaryKey({ columns: [table.identifier, table.token] }),
-        }
-      }
+      (verficationToken) => ({
+        compositePk: primaryKey({
+          columns: [verficationToken.identifier, verficationToken.token],
+        }),
+      })
     ) satisfies DefaultPostgresVerificationTokenTable)
 
   const authenticatorsTable =
     schema.authenticatorsTable ??
-    (pgTable("authenticator", {
-      id: text("id").notNull().primaryKey(),
-      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"),
-    }) satisfies DefaultPostgresAuthenticatorTable)
+    (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,
@@ -267,7 +272,7 @@ export function PostgresDrizzleAdapter(
     async createAuthenticator(data: AdapterAuthenticator) {
       const user = await client
         .insert(authenticatorsTable)
-        .values({ ...data, id: crypto.randomUUID() })
+        .values(data)
         .returning()
         .then((res) => res[0] ?? null)
 
@@ -491,12 +496,6 @@ export type DefaultPostgresVerificationTokenTable = PgTableWithColumns<{
 export type DefaultPostgresAuthenticatorTable = PgTableWithColumns<{
   name: string
   columns: {
-    id: DefaultPostgresColumn<{
-      columnType: "PgVarchar" | "PgText"
-      data: string
-      notNull: true
-      dataType: "string"
-    }>
     credentialID: DefaultPostgresColumn<{
       columnType: "PgVarchar" | "PgText"
       data: string

diff --git a/packages/adapter-drizzle/src/lib/sqlite.ts b/packages/adapter-drizzle/src/lib/sqlite.ts
@@ -79,15 +79,14 @@ export function defineTables(
         token: text("token").notNull(),
         expires: integer("expires", { mode: "timestamp_ms" }).notNull(),
       },
-      (vt) => ({
-        compositePk: primaryKey({ columns: [vt.identifier, vt.token] }),
+      (verficationToken) => ({
+        compositePk: primaryKey({ columns: [verficationToken.identifier, verficationToken.token] }),
       })
     ) satisfies DefaultSQLiteVerificationTokenTable)
 
   const authenticatorsTable =
     schema.authenticatorsTable ??
     (sqliteTable("authenticator", {
-      id: text("id").notNull().primaryKey(),
       credentialID: text("credentialID").notNull().unique(),
       userId: text("userId")
         .notNull()
@@ -100,7 +99,9 @@ export function defineTables(
         mode: "boolean",
       }).notNull(),
       transports: text("transports"),
-    }) satisfies DefaultSQLiteAuthenticatorTable)
+    }, (authenticator) => ({
+      compositePK: primaryKey({ columns: [authenticator.userId, authenticator.credentialID]})
+    })) satisfies DefaultSQLiteAuthenticatorTable)
 
   return {
     usersTable,
@@ -271,7 +272,7 @@ export function SQLiteDrizzleAdapter(
     async createAuthenticator(data: AdapterAuthenticator) {
       const user = await client
         .insert(authenticatorsTable)
-        .values({ ...data, id: crypto.randomUUID() })
+        .values(data)
         .returning()
         .then((res) => (res[0]) ?? null)
 
@@ -290,7 +291,7 @@ export function SQLiteDrizzleAdapter(
         .select()
         .from(authenticatorsTable)
         .where(eq(authenticatorsTable.userId, userId))
-        .then((res) => res.map())
+        .then((res) => res)
     },
     async updateAuthenticatorCounter(credentialID: string, newCounter: number) {
       return await client
@@ -521,12 +522,6 @@ export type DefaultSQLiteVerificationTokenTable = SQLiteTableWithColumns<{
 export type DefaultSQLiteAuthenticatorTable = SQLiteTableWithColumns<{
   name: string
   columns: {
-    id: DefaultSQLiteColumn<{
-      columnType: "SQLiteText"
-      data: string
-      notNull: true
-      dataType: "string"
-    }>
     credentialID: DefaultSQLiteColumn<{
       columnType: "SQLiteText"
       data: string