@oidcraft/drizzle 0.1.0 → 0.2.0

package/dist/index.d.mts

@@ -1,7 +1,7 @@
+import { AccountStore, FullAdapter, KeyStore } from "@oidcraft/adapter";
 import { AnyRelations } from "drizzle-orm";
 import { SQLiteAsyncDatabase } from "drizzle-orm/sqlite-core";
 import { PgQueryResultHKT } from "drizzle-orm/pg-core";
-import { AccountStore, FullAdapter, KeyStore } from "@oidcraft/adapter";
 import { PgAsyncDatabase } from "drizzle-orm/pg-core/async";
 /**
  * The oidcraft tables for Postgres, in `schema` or in the search path when it is omitted. A factory,
@@ -168,6 +168,21 @@ export declare const postgresTables: (schema?: string) => {
         identity: undefined;
         generated: undefined;
       }>;
+      familyId: import("drizzle-orm/pg-core").PgBuildColumn<"oidc_artifacts", import("drizzle-orm/pg-core").PgTextBuilder<[string, ...string[]]>, {
+        name: string;
+        tableName: "oidc_artifacts";
+        dataType: "string";
+        data: string;
+        driverParam: string;
+        notNull: false;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        identity: undefined;
+        generated: undefined;
+      }>;
       userCode: import("drizzle-orm/pg-core").PgBuildColumn<"oidc_artifacts", import("drizzle-orm/pg-core").PgTextBuilder<[string, ...string[]]>, {
         name: string;
         tableName: "oidc_artifacts";
@@ -1207,6 +1222,22 @@ export declare const artifacts: import("drizzle-orm/sqlite-core").SQLiteTableWit
       identity: undefined;
       generated: undefined;
     }, {}>;
+    familyId: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+      name: string;
+      tableName: "oidc_artifacts";
+      dataType: "string";
+      data: string;
+      driverParam: string;
+      notNull: false;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: [string, ...string[]];
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}>;
     userCode: import("drizzle-orm/sqlite-core").SQLiteColumn<{
       name: string;
       tableName: "oidc_artifacts";
@@ -2168,6 +2199,22 @@ export declare const schema: {
         identity: undefined;
         generated: undefined;
       }, {}>;
+      familyId: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+        name: string;
+        tableName: "oidc_artifacts";
+        dataType: "string";
+        data: string;
+        driverParam: string;
+        notNull: false;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: [string, ...string[]];
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+      }, {}>;
       userCode: import("drizzle-orm/sqlite-core").SQLiteColumn<{
         name: string;
         tableName: "oidc_artifacts";

package/dist/index.mjs

@@ -1,3 +1,4 @@
+import { noAccounts } from "@oidcraft/adapter";
 import { and, eq, gt, isNull, lte } from "drizzle-orm";
 import { index, integer, primaryKey, sqliteTable, text, uniqueIndex } from "drizzle-orm/sqlite-core";
 import { customType, index as index$1, integer as integer$1, pgSchema, pgTable, primaryKey as primaryKey$1, text as text$1, uniqueIndex as uniqueIndex$1 } from "drizzle-orm/pg-core";
@@ -21,6 +22,7 @@ const artifacts = sqliteTable("oidc_artifacts", {
 	clientId: text("client_id").notNull(),
 	accountId: text("account_id"),
 	grantId: text("grant_id"),
+	familyId: text("family_id"),
 	userCode: text("user_code"),
 	payload: text("payload", { mode: "json" }).notNull(),
 	consumedAt: integer("consumed_at", { mode: "timestamp_ms" }),
@@ -29,7 +31,9 @@ const artifacts = sqliteTable("oidc_artifacts", {
 	primaryKey({ columns: [table.kind, table.id] }),
 	index("oidc_artifacts_grant_idx").on(table.grantId),
 	index("oidc_artifacts_user_code_idx").on(table.userCode),
-	index("oidc_artifacts_expiry_idx").on(table.expiresAt)
+	index("oidc_artifacts_expiry_idx").on(table.expiresAt),
+	index("oidc_artifacts_client_idx").on(table.clientId),
+	index("oidc_artifacts_family_idx").on(table.familyId)
 ]);
 const sessions = sqliteTable("oidc_sessions", {
 	id: text("id").primaryKey(),
@@ -55,7 +59,7 @@ const grants = sqliteTable("oidc_grants", {
 	resources: text("resources", { mode: "json" }).notNull(),
 	createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull(),
 	expiresAt: integer("expires_at", { mode: "timestamp_ms" })
-}, (table) => [uniqueIndex("oidc_grants_account_client_idx").on(table.accountId, table.clientId)]);
+}, (table) => [uniqueIndex("oidc_grants_account_client_idx").on(table.accountId, table.clientId), index("oidc_grants_client_idx").on(table.clientId)]);
 const identities = sqliteTable("oidc_identities", {
 	provider: text("provider").notNull(),
 	subject: text("subject").notNull(),
@@ -137,6 +141,18 @@ const POSTGRES_MIGRATIONS = [
 	{
 		id: "0003_realms",
 		statements: ["create table oidc_realms (id text primary key, display_name text, enabled integer not null, settings text not null, created_at bigint not null, updated_at bigint not null)"]
+	},
+	{
+		id: "0004_indexes",
+		statements: [
+			"create index oidc_artifacts_client_idx on oidc_artifacts (client_id)",
+			"create index oidc_grants_client_idx on oidc_grants (client_id)",
+			"create index oidc_sessions_expiry_idx on oidc_sessions (expires_at)"
+		]
+	},
+	{
+		id: "0005_families",
+		statements: ["alter table oidc_artifacts add column family_id text", "create index oidc_artifacts_family_idx on oidc_artifacts (family_id)"]
 	}
 ];
 // ../sql/dist/sqlite.mjs
@@ -175,6 +191,18 @@ const SQLITE_MIGRATIONS = [
 	{
 		id: "0003_realms",
 		statements: ["create table oidc_realms (id text primary key, display_name text, enabled integer not null, settings text not null, created_at integer not null, updated_at integer not null)"]
+	},
+	{
+		id: "0004_indexes",
+		statements: [
+			"create index oidc_artifacts_client_idx on oidc_artifacts (client_id)",
+			"create index oidc_grants_client_idx on oidc_grants (client_id)",
+			"create index oidc_sessions_expiry_idx on oidc_sessions (expires_at)"
+		]
+	},
+	{
+		id: "0005_families",
+		statements: ["alter table oidc_artifacts add column family_id text", "create index oidc_artifacts_family_idx on oidc_artifacts (family_id)"]
 	}
 ];
 // src/postgres-schema.ts
@@ -213,6 +241,7 @@ const postgresTables = (schema) => {
 			clientId: text$1("client_id").notNull(),
 			accountId: text$1("account_id"),
 			grantId: text$1("grant_id"),
+			familyId: text$1("family_id"),
 			userCode: text$1("user_code"),
 			payload: json("payload").notNull(),
 			consumedAt: millis("consumed_at"),
@@ -221,7 +250,9 @@ const postgresTables = (schema) => {
 			primaryKey$1({ columns: [t.kind, t.id] }),
 			index$1("oidc_artifacts_grant_idx").on(t.grantId),
 			index$1("oidc_artifacts_user_code_idx").on(t.userCode),
-			index$1("oidc_artifacts_expiry_idx").on(t.expiresAt)
+			index$1("oidc_artifacts_expiry_idx").on(t.expiresAt),
+			index$1("oidc_artifacts_client_idx").on(t.clientId),
+			index$1("oidc_artifacts_family_idx").on(t.familyId)
 		]),
 		sessions: table("oidc_sessions", {
 			id: text$1("id").primaryKey(),
@@ -233,7 +264,11 @@ const postgresTables = (schema) => {
 			upstreamSessionId: text$1("upstream_session_id"),
 			clients: json("clients").notNull(),
 			expiresAt: millis("expires_at").notNull()
-		}, (t) => [index$1("oidc_sessions_account_idx").on(t.accountId), index$1("oidc_sessions_upstream_idx").on(t.idp, t.upstreamSessionId)]),
+		}, (t) => [
+			index$1("oidc_sessions_account_idx").on(t.accountId),
+			index$1("oidc_sessions_upstream_idx").on(t.idp, t.upstreamSessionId),
+			index$1("oidc_sessions_expiry_idx").on(t.expiresAt)
+		]),
 		grants: table("oidc_grants", {
 			id: text$1("id").primaryKey(),
 			accountId: text$1("account_id").notNull(),
@@ -243,7 +278,7 @@ const postgresTables = (schema) => {
 			resources: json("resources").notNull(),
 			createdAt: millis("created_at").notNull(),
 			expiresAt: millis("expires_at")
-		}, (t) => [uniqueIndex$1("oidc_grants_account_client_idx").on(t.accountId, t.clientId)]),
+		}, (t) => [uniqueIndex$1("oidc_grants_account_client_idx").on(t.accountId, t.clientId), index$1("oidc_grants_client_idx").on(t.clientId)]),
 		identities: table("oidc_identities", {
 			provider: text$1("provider").notNull(),
 			subject: text$1("subject").notNull(),
@@ -293,6 +328,7 @@ const drizzleAdapter = (options) => {
 		clientId: row.clientId,
 		...row.accountId && { accountId: row.accountId },
 		...row.grantId && { grantId: row.grantId },
+		...row.familyId && { familyId: row.familyId },
 		payload: row.payload,
 		...row.consumedAt && { consumedAt: row.consumedAt },
 		expiresAt: row.expiresAt
@@ -345,12 +381,19 @@ const drizzleAdapter = (options) => {
 			async destroy(clientId) {
 				await db.delete(clients).where(eq(clients.clientId, clientId));
 			},
-			async list() {
-				return { clients: (await db.select().from(clients)).map((row) => ({
-					...row.data,
-					createdAt: row.createdAt,
-					updatedAt: row.updatedAt
-				})) };
+			async list(cursor, limit) {
+				const ordered = db.select().from(clients).where(cursor === void 0 ? void 0 : gt(clients.clientId, cursor)).orderBy(clients.clientId);
+				const rows = await (limit === void 0 ? ordered : ordered.limit(limit + 1));
+				const more = limit !== void 0 && rows.length > limit;
+				const shown = more ? rows.slice(0, limit) : rows;
+				return {
+					clients: shown.map((row) => ({
+						...row.data,
+						createdAt: row.createdAt,
+						updatedAt: row.updatedAt
+					})),
+					...more && { cursor: shown.at(-1)?.clientId }
+				};
 			}
 		},
 		artifacts: {
@@ -361,6 +404,7 @@ const drizzleAdapter = (options) => {
 					clientId: artifact.clientId,
 					accountId: artifact.accountId ?? null,
 					grantId: artifact.grantId ?? null,
+					familyId: artifact.familyId ?? null,
 					userCode: artifact.payload.userCode ?? null,
 					payload: artifact.payload,
 					consumedAt: artifact.consumedAt ?? null,
@@ -391,6 +435,12 @@ const drizzleAdapter = (options) => {
 			async revokeByGrantId(grantId) {
 				await db.delete(artifacts).where(eq(artifacts.grantId, grantId));
 			},
+			async revokeByFamilyId(familyId) {
+				await db.delete(artifacts).where(eq(artifacts.familyId, familyId));
+			},
+			async revokeByClientId(clientId) {
+				await db.delete(artifacts).where(eq(artifacts.clientId, clientId));
+			},
 			async prune(before, limit) {
 				const doomed = await db.select({
 					kind: artifacts.kind,
@@ -409,7 +459,7 @@ const drizzleAdapter = (options) => {
 				return (await db.select().from(sessions).where(and(eq(sessions.accountId, accountId), gt(sessions.expiresAt, now())))).map(toSession);
 			},
 			async findByUpstreamSession(provider, upstreamSessionId) {
-				return (await db.select().from(sessions).where(and(eq(sessions.idp, provider), eq(sessions.upstreamSessionId, upstreamSessionId)))).map(toSession);
+				return (await db.select().from(sessions).where(and(eq(sessions.idp, provider), eq(sessions.upstreamSessionId, upstreamSessionId), gt(sessions.expiresAt, now())))).map(toSession);
 			},
 			async upsert(session) {
 				const row = {
@@ -440,6 +490,11 @@ const drizzleAdapter = (options) => {
 			},
 			async destroy(id) {
 				await db.delete(sessions).where(eq(sessions.id, id));
+			},
+			async prune(before, limit) {
+				const doomed = await db.select({ id: sessions.id }).from(sessions).where(lte(sessions.expiresAt, before)).limit(limit);
+				for (const row of doomed) await db.delete(sessions).where(and(eq(sessions.id, row.id), lte(sessions.expiresAt, before)));
+				return doomed.length;
 			}
 		},
 		grants: {
@@ -465,29 +520,43 @@ const drizzleAdapter = (options) => {
 					createdAt: grant.createdAt,
 					expiresAt: grant.expiresAt ?? null
 				};
+				const { id: _id, createdAt: _createdAt, ...changed } = row;
 				await db.insert(grants).values(row).onConflictDoUpdate({
-					target: grants.id,
-					set: row
+					target: [grants.accountId, grants.clientId],
+					set: changed
 				});
 			},
 			async destroy(id) {
 				await db.delete(grants).where(eq(grants.id, id));
+			},
+			async destroyByClientId(clientId) {
+				await db.delete(grants).where(eq(grants.clientId, clientId));
 			}
 		},
 		accounts: options.accounts ?? noAccounts,
 		keys: options.keys,
-		replay: { async claim(namespace, value, ttl) {
-			const expiresAt = new Date(Date.now() + ttl * 1e3);
-			return (await db.insert(replay).values({
-				namespace,
-				value,
-				expiresAt
-			}).onConflictDoUpdate({
-				target: [replay.namespace, replay.value],
-				set: { expiresAt },
-				setWhere: lte(replay.expiresAt, now())
-			}).returning({ value: replay.value })).length === 1;
-		} },
+		replay: {
+			async claim(namespace, value, ttl) {
+				const expiresAt = new Date(Date.now() + ttl * 1e3);
+				return (await db.insert(replay).values({
+					namespace,
+					value,
+					expiresAt
+				}).onConflictDoUpdate({
+					target: [replay.namespace, replay.value],
+					set: { expiresAt },
+					setWhere: lte(replay.expiresAt, now())
+				}).returning({ value: replay.value })).length === 1;
+			},
+			async prune(before, limit) {
+				const doomed = await db.select({
+					namespace: replay.namespace,
+					value: replay.value
+				}).from(replay).where(lte(replay.expiresAt, before)).limit(limit);
+				for (const row of doomed) await db.delete(replay).where(and(eq(replay.namespace, row.namespace), eq(replay.value, row.value), lte(replay.expiresAt, before)));
+				return doomed.length;
+			}
+		},
 		credentials: {
 			async find(accountId) {
 				const [row] = await db.select().from(credentials).where(eq(credentials.accountId, accountId)).limit(1);
@@ -561,10 +630,6 @@ const drizzleAdapter = (options) => {
 		}
 	};
 };
-const noAccounts = {
-	async find() {},
-	async claims() {}
-};
 const credentialRow = (credential) => ({
 	accountId: credential.accountId,
 	username: credential.username,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oidcraft/drizzle",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "A Drizzle storage adapter for @oidcraft/provider, on Postgres or SQLite.",
   "license": "MIT",
   "author": "Fl0r14n <florian.chis@gmail.com>",
@@ -41,11 +41,11 @@
     "verify:entries": "bun run verify-entries.ts"
   },
   "peerDependencies": {
-    "@oidcraft/adapter": "^0.1.0",
+    "@oidcraft/adapter": "^0.2.0",
     "drizzle-orm": ">=1.0.0-rc.5"
   },
   "devDependencies": {
-    "@oidcraft/adapter": "^0.1.0",
+    "@oidcraft/adapter": "^0.2.0",
     "@oidcraft/sql": "0.0.0",
     "@types/pg": "^8.23.1",
     "drizzle-orm": "1.0.0-rc.5",