@auth/drizzle-adapter 0.3.16 → 0.4.0

package/lib/pg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../src/lib/pg.ts"],"names":[],"mappings":"AACA,OAAO,EAML,SAAS,EACT,UAAU,EACX,MAAM,qBAAqB,CAAA;AAE5B,OAAO,KAAK,EAAE,OAAO,EAAkB,MAAM,qBAAqB,CAAA;AAElE,wBAAgB,YAAY,CAAC,OAAO,EAAE,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoD9C;AAED,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAA;AAE3D,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,YAAY,CAAC,OAAO,UAAU,CAAC,EACvC,OAAO,uBAAmB,GACzB,OAAO,CAgKT"}
+{"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../src/lib/pg.ts"],"names":[],"mappings":"AACA,OAAO,EAML,SAAS,EACT,UAAU,EACX,MAAM,qBAAqB,CAAA;AAE5B,OAAO,KAAK,EAAE,OAAO,EAAkB,MAAM,qBAAqB,CAAA;AAGlE,wBAAgB,YAAY,CAAC,OAAO,EAAE,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoD9C;AAED,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAA;AAE3D,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,YAAY,CAAC,OAAO,UAAU,CAAC,EACvC,OAAO,uBAAmB,GACzB,OAAO,CA+IT"}

package/lib/pg.js

@@ -1,5 +1,6 @@
 import { and, eq } from "drizzle-orm";
 import { timestamp, pgTable as defaultPgTableFn, text, primaryKey, integer, } from "drizzle-orm/pg-core";
+import { stripUndefined } from "./utils";
 export function createTables(pgTable) {
     const users = pgTable("user", {
         id: text("id").notNull().primaryKey(),
@@ -103,24 +104,11 @@ export function pgDrizzleAdapter(client, tableFn = defaultPgTableFn) {
                 .then((res) => res[0]);
         },
         async linkAccount(rawAccount) {
-            const updatedAccount = await client
+            return stripUndefined(await client
                 .insert(accounts)
                 .values(rawAccount)
                 .returning()
-                .then((res) => res[0]);
-            // Drizzle will return `null` for fields that are not defined.
-            // However, the return type is expecting `undefined`.
-            const account = {
-                ...updatedAccount,
-                access_token: updatedAccount.access_token ?? undefined,
-                token_type: updatedAccount.token_type ?? undefined,
-                id_token: updatedAccount.id_token ?? undefined,
-                refresh_token: updatedAccount.refresh_token ?? undefined,
-                scope: updatedAccount.scope ?? undefined,
-                expires_at: updatedAccount.expires_at ?? undefined,
-                session_state: updatedAccount.session_state ?? undefined,
-            };
-            return account;
+                .then((res) => res[0]));
         },
         async getUserByAccount(account) {
             const dbAccount = (await client
@@ -129,10 +117,7 @@ export function pgDrizzleAdapter(client, tableFn = defaultPgTableFn) {
                 .where(and(eq(accounts.providerAccountId, account.providerAccountId), eq(accounts.provider, account.provider)))
                 .leftJoin(users, eq(accounts.userId, users.id))
                 .then((res) => res[0])) ?? null;
-            if (!dbAccount) {
-                return null;
-            }
-            return dbAccount.user;
+            return dbAccount?.user ?? null;
         },
         async deleteSession(sessionToken) {
             const session = await client

package/lib/sqlite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../src/lib/sqlite.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,kBAAkB,EAClB,aAAa,EACd,MAAM,yBAAyB,CAAA;AAEhC,OAAO,KAAK,EAAE,OAAO,EAAkB,MAAM,qBAAqB,CAAA;AAElE,wBAAgB,YAAY,CAAC,WAAW,EAAE,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoDtD;AAED,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAA;AAE3D,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,YAAY,CAAC,OAAO,kBAAkB,CAAC,EAC/C,OAAO,2BAAuB,GAC7B,OAAO,CA6JT"}
+{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../src/lib/sqlite.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,kBAAkB,EAClB,aAAa,EACd,MAAM,yBAAyB,CAAA;AAGhC,OAAO,KAAK,EAAE,OAAO,EAAkB,MAAM,qBAAqB,CAAA;AAElE,wBAAgB,YAAY,CAAC,WAAW,EAAE,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoDtD;AAED,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAA;AAE3D,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,YAAY,CAAC,OAAO,kBAAkB,CAAC,EAC/C,OAAO,2BAAuB,GAC7B,OAAO,CA0IT"}

package/lib/sqlite.js

@@ -1,5 +1,6 @@
 import { eq, and } from "drizzle-orm";
 import { integer, sqliteTable as defaultSqliteTableFn, text, primaryKey, } from "drizzle-orm/sqlite-core";
+import { stripUndefined } from "./utils";
 export function createTables(sqliteTable) {
     const users = sqliteTable("user", {
         id: text("id").notNull().primaryKey(),
@@ -101,23 +102,7 @@ export function SQLiteDrizzleAdapter(client, tableFn = defaultSqliteTableFn) {
             return result ?? null;
         },
         async linkAccount(rawAccount) {
-            const updatedAccount = await client
-                .insert(accounts)
-                .values(rawAccount)
-                .returning()
-                .get();
-            const account = {
-                ...updatedAccount,
-                type: updatedAccount.type,
-                access_token: updatedAccount.access_token ?? undefined,
-                token_type: updatedAccount.token_type ?? undefined,
-                id_token: updatedAccount.id_token ?? undefined,
-                refresh_token: updatedAccount.refresh_token ?? undefined,
-                scope: updatedAccount.scope ?? undefined,
-                expires_at: updatedAccount.expires_at ?? undefined,
-                session_state: updatedAccount.session_state ?? undefined,
-            };
-            return account;
+            return stripUndefined(await client.insert(accounts).values(rawAccount).returning().get());
         },
         async getUserByAccount(account) {
             const results = await client
@@ -173,7 +158,6 @@ export function SQLiteDrizzleAdapter(client, tableFn = defaultSqliteTableFn) {
                 .delete(accounts)
                 .where(and(eq(accounts.providerAccountId, account.providerAccountId), eq(accounts.provider, account.provider)))
                 .run();
-            return undefined;
         },
     };
 }

package/lib/utils.d.ts

@@ -18,4 +18,9 @@ export interface MinimumSchema {
 export type SqlFlavorOptions = AnyMySqlDatabase | AnyPgDatabase | AnySQLiteDatabase;
 export type ClientFlavors<Flavor> = Flavor extends AnyMySqlDatabase ? MinimumSchema["mysql"] : Flavor extends AnyPgDatabase ? MinimumSchema["pg"] : Flavor extends AnySQLiteDatabase ? MinimumSchema["sqlite"] : never;
 export type TableFn<Flavor> = Flavor extends AnyMySqlDatabase ? MySqlTableFn : Flavor extends AnyPgDatabase ? PgTableFn : Flavor extends AnySQLiteDatabase ? SQLiteTableFn : AnySQLiteTable;
+type NonNullableProps<T> = {
+    [P in keyof T]: null extends T[P] ? never : P;
+}[keyof T];
+export declare function stripUndefined<T>(obj: T): Pick<T, NonNullableProps<T>>;
+export {};
 //# sourceMappingURL=utils.d.ts.map

package/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE5D,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,SAAS,CAAA;AACxD,OAAO,KAAK,EAAE,aAAa,IAAI,WAAW,EAAE,MAAM,YAAY,CAAA;AAC9D,OAAO,KAAK,EAAE,aAAa,IAAI,YAAY,EAAE,MAAM,aAAa,CAAA;AAEhE,MAAM,MAAM,gBAAgB,GAAG,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;AACtD,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AACrD,MAAM,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAEtE,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAClD,EAAE,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IACzC,MAAM,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;CACtD;AAED,MAAM,MAAM,gBAAgB,GACxB,gBAAgB,GAChB,aAAa,GACb,iBAAiB,CAAA;AAErB,MAAM,MAAM,aAAa,CAAC,MAAM,IAAI,MAAM,SAAS,gBAAgB,GAC/D,aAAa,CAAC,OAAO,CAAC,GACtB,MAAM,SAAS,aAAa,GAC1B,aAAa,CAAC,IAAI,CAAC,GACnB,MAAM,SAAS,iBAAiB,GAC9B,aAAa,CAAC,QAAQ,CAAC,GACvB,KAAK,CAAA;AAEb,MAAM,MAAM,OAAO,CAAC,MAAM,IAAI,MAAM,SAAS,gBAAgB,GACzD,YAAY,GACZ,MAAM,SAAS,aAAa,GAC1B,SAAS,GACT,MAAM,SAAS,iBAAiB,GAC9B,aAAa,GACb,cAAc,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE5D,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,SAAS,CAAA;AACxD,OAAO,KAAK,EAAE,aAAa,IAAI,WAAW,EAAE,MAAM,YAAY,CAAA;AAC9D,OAAO,KAAK,EAAE,aAAa,IAAI,YAAY,EAAE,MAAM,aAAa,CAAA;AAEhE,MAAM,MAAM,gBAAgB,GAAG,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;AACtD,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AACrD,MAAM,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAEtE,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAClD,EAAE,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IACzC,MAAM,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;CACtD;AAED,MAAM,MAAM,gBAAgB,GACxB,gBAAgB,GAChB,aAAa,GACb,iBAAiB,CAAA;AAErB,MAAM,MAAM,aAAa,CAAC,MAAM,IAAI,MAAM,SAAS,gBAAgB,GAC/D,aAAa,CAAC,OAAO,CAAC,GACtB,MAAM,SAAS,aAAa,GAC1B,aAAa,CAAC,IAAI,CAAC,GACnB,MAAM,SAAS,iBAAiB,GAC9B,aAAa,CAAC,QAAQ,CAAC,GACvB,KAAK,CAAA;AAEb,MAAM,MAAM,OAAO,CAAC,MAAM,IAAI,MAAM,SAAS,gBAAgB,GACzD,YAAY,GACZ,MAAM,SAAS,aAAa,GAC1B,SAAS,GACT,MAAM,SAAS,iBAAiB,GAC9B,aAAa,GACb,cAAc,CAAA;AAEtB,KAAK,gBAAgB,CAAC,CAAC,IAAI;KACxB,CAAC,IAAI,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC;CAC9C,CAAC,MAAM,CAAC,CAAC,CAAA;AAEV,wBAAgB,cAAc,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAItE"}

package/lib/utils.js

@@ -1 +1,7 @@
-export {};
+export function stripUndefined(obj) {
+    const result = {};
+    for (const key in obj)
+        if (obj[key] !== undefined)
+            result[key] = obj[key];
+    return result;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auth/drizzle-adapter",
-  "version": "0.3.16",
+  "version": "0.4.0",
   "description": "Drizzle adapter for Auth.js.",
   "homepage": "https://authjs.dev",
   "repository": "https://github.com/nextauthjs/next-auth",
@@ -36,7 +36,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@auth/core": "0.22.0"
+    "@auth/core": "0.24.0"
   },
   "devDependencies": {
     "@libsql/client": "0.4.0-pre.5",
@@ -48,15 +48,12 @@
     "mysql2": "^3.2.0",
     "postgres": "^3.3.4"
   },
-  "jest": {
-    "preset": "utils/adapter"
-  },
   "scripts": {
     "clean": "find . -type d -name \".drizzle\" | xargs rm -rf",
     "test": "pnpm test:mysql && pnpm test:sqlite && pnpm test:pg",
-    "test:mysql": "pnpm clean && ./tests/mysql/test.sh",
-    "test:sqlite": "pnpm clean && ./tests/sqlite/test.sh",
-    "test:pg": "pnpm clean && ./tests/pg/test.sh",
+    "test:mysql": "pnpm clean && ./test/mysql/test.sh",
+    "test:sqlite": "pnpm clean && ./test/sqlite/test.sh",
+    "test:pg": "pnpm clean && ./test/pg/test.sh",
     "build": "tsc",
     "dev": "drizzle-kit generate:mysql --schema=src/schema.ts --out=.drizzle && tsc -w"
   }

package/src/lib/pg.ts

@@ -10,6 +10,7 @@ import {
 } from "drizzle-orm/pg-core"
 
 import type { Adapter, AdapterAccount } from "@auth/core/adapters"
+import { stripUndefined } from "./utils"
 
 export function createTables(pgTable: PgTableFn) {
   const users = pgTable("user", {
@@ -135,26 +136,13 @@ export function pgDrizzleAdapter(
         .then((res) => res[0])
     },
     async linkAccount(rawAccount) {
-      const updatedAccount = await client
-        .insert(accounts)
-        .values(rawAccount)
-        .returning()
-        .then((res) => res[0])
-
-      // Drizzle will return `null` for fields that are not defined.
-      // However, the return type is expecting `undefined`.
-      const account = {
-        ...updatedAccount,
-        access_token: updatedAccount.access_token ?? undefined,
-        token_type: updatedAccount.token_type ?? undefined,
-        id_token: updatedAccount.id_token ?? undefined,
-        refresh_token: updatedAccount.refresh_token ?? undefined,
-        scope: updatedAccount.scope ?? undefined,
-        expires_at: updatedAccount.expires_at ?? undefined,
-        session_state: updatedAccount.session_state ?? undefined,
-      }
-
-      return account
+      return stripUndefined(
+        await client
+          .insert(accounts)
+          .values(rawAccount)
+          .returning()
+          .then((res) => res[0])
+      )
     },
     async getUserByAccount(account) {
       const dbAccount =
@@ -170,11 +158,7 @@ export function pgDrizzleAdapter(
           .leftJoin(users, eq(accounts.userId, users.id))
           .then((res) => res[0])) ?? null
 
-      if (!dbAccount) {
-        return null
-      }
-
-      return dbAccount.user
+      return dbAccount?.user ?? null
     },
     async deleteSession(sessionToken) {
       const session = await client

package/src/lib/sqlite.ts

@@ -7,6 +7,7 @@ import {
   BaseSQLiteDatabase,
   SQLiteTableFn,
 } from "drizzle-orm/sqlite-core"
+import { stripUndefined } from "./utils"
 
 import type { Adapter, AdapterAccount } from "@auth/core/adapters"
 
@@ -132,25 +133,9 @@ export function SQLiteDrizzleAdapter(
       return result ?? null
     },
     async linkAccount(rawAccount) {
-      const updatedAccount = await client
-        .insert(accounts)
-        .values(rawAccount)
-        .returning()
-        .get()
-
-      const account: AdapterAccount = {
-        ...updatedAccount,
-        type: updatedAccount.type,
-        access_token: updatedAccount.access_token ?? undefined,
-        token_type: updatedAccount.token_type ?? undefined,
-        id_token: updatedAccount.id_token ?? undefined,
-        refresh_token: updatedAccount.refresh_token ?? undefined,
-        scope: updatedAccount.scope ?? undefined,
-        expires_at: updatedAccount.expires_at ?? undefined,
-        session_state: updatedAccount.session_state ?? undefined,
-      }
-
-      return account
+      return stripUndefined(
+        await client.insert(accounts).values(rawAccount).returning().get()
+      )
     },
     async getUserByAccount(account) {
       const results = await client
@@ -166,10 +151,9 @@ export function SQLiteDrizzleAdapter(
         .get()
 
       if (!results) {
-        return null;
+        return null
       }
       return Promise.resolve(results).then((results) => results.user)
-
     },
     async deleteSession(sessionToken) {
       const result = await client
@@ -222,8 +206,6 @@ export function SQLiteDrizzleAdapter(
           )
         )
         .run()
-
-      return undefined
     },
   }
 }

package/src/lib/utils.ts

@@ -39,3 +39,13 @@ export type TableFn<Flavor> = Flavor extends AnyMySqlDatabase
     : Flavor extends AnySQLiteDatabase
       ? SQLiteTableFn
       : AnySQLiteTable
+
+type NonNullableProps<T> = {
+  [P in keyof T]: null extends T[P] ? never : P
+}[keyof T]
+
+export function stripUndefined<T>(obj: T): Pick<T, NonNullableProps<T>> {
+  const result = {} as T
+  for (const key in obj) if (obj[key] !== undefined) result[key] = obj[key]
+  return result
+}