@beechcms/api 0.6.0-preview.1 → 0.6.0-preview.2

package/src/shared/d1-session.repository.test.ts

@@ -1,125 +1,125 @@
-// SPDX-License-Identifier: BUSL-1.1
-// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
-// See LICENSE in the repository root for license terms.
-
-import { describe, it, expect, vi } from 'vitest'
-import { D1SessionRepository } from './d1-session.repository'
-import { FixedClock } from './fixed-clock'
-
-const FIXED_NOW_MS = 1700000000_000
-const NOW = Math.floor(FIXED_NOW_MS / 1000)
-const FUTURE = NOW + 7 * 24 * 3600
-const clock = new FixedClock(FIXED_NOW_MS)
-
-function makeMockDb(opts: {
-  firstResult?: unknown
-  runChanges?: number
-  allResults?: unknown[]
-} = {}) {
-  const { firstResult = null, runChanges = 1, allResults = [] } = opts
-  const runMock = vi.fn().mockResolvedValue({ success: true, meta: { changes: runChanges } })
-  const firstMock = vi.fn().mockResolvedValue(firstResult)
-  const allMock = vi.fn().mockResolvedValue({ results: allResults })
-  const bindMock = vi.fn(() => ({ first: firstMock, all: allMock, run: runMock }))
-  const prepareMock = vi.fn(() => ({ bind: bindMock }))
-  return { db: { prepare: prepareMock } as any, prepareMock, bindMock, runMock, firstMock, allMock }
-}
-
-describe('D1SessionRepository', () => {
-  describe('saveRefreshToken', () => {
-    it('calls INSERT INTO refresh_tokens with the correct bound values', async () => {
-      const { db, prepareMock, bindMock } = makeMockDb()
-      await new D1SessionRepository(db, clock).saveRefreshToken({
-        id: 'rt-1', userId: 'u1', tokenHash: 'h', expiresAt: FUTURE,
-      })
-      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('INSERT INTO refresh_tokens'))
-      expect(bindMock).toHaveBeenCalledWith('rt-1', 'u1', 'h', FUTURE, NOW)
-    })
-  })
-
-  describe('findActiveByHash', () => {
-    it('returns a RefreshTokenRecord with camelCase keys mapped from the snake_case row', async () => {
-      const row = {
-        id: 'rt-1', user_id: 'u1', token_hash: 'h',
-        expires_at: FUTURE, created_at: NOW, revoked_at: null,
-      }
-      const { db } = makeMockDb({ firstResult: row })
-      const result = await new D1SessionRepository(db, clock).findActiveByHash('h', NOW)
-      expect(result).toEqual({
-        id: 'rt-1', userId: 'u1', tokenHash: 'h',
-        expiresAt: FUTURE, createdAt: NOW, revokedAt: null,
-      })
-    })
-
-    it('returns null when no active token is found', async () => {
-      const { db } = makeMockDb({ firstResult: null })
-      expect(await new D1SessionRepository(db, clock).findActiveByHash('missing', NOW)).toBeNull()
-    })
-
-    it('passes tokenHash and nowTimestamp as bound values', async () => {
-      const { db, bindMock } = makeMockDb()
-      await new D1SessionRepository(db, clock).findActiveByHash('my-hash', NOW)
-      expect(bindMock).toHaveBeenCalledWith('my-hash', NOW)
-    })
-  })
-
-  describe('revokeByHash', () => {
-    it('returns true when one row is updated (changes = 1)', async () => {
-      const { db } = makeMockDb({ runChanges: 1 })
-      expect(await new D1SessionRepository(db, clock).revokeByHash('h', NOW)).toBe(true)
-    })
-
-    it('returns false when no row is updated (token already revoked or not found)', async () => {
-      const { db } = makeMockDb({ runChanges: 0 })
-      expect(await new D1SessionRepository(db, clock).revokeByHash('h', NOW)).toBe(false)
-    })
-  })
-
-  describe('revokeAllForUser', () => {
-    it('calls UPDATE refresh_tokens and includes the userId in the bound values', async () => {
-      const { db, prepareMock, bindMock } = makeMockDb()
-      await new D1SessionRepository(db, clock).revokeAllForUser('u1', NOW)
-      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('UPDATE refresh_tokens'))
-      expect((bindMock.mock.calls[0] as unknown[]).includes('u1')).toBe(true)
-    })
-  })
-
-  describe('listActiveForUser', () => {
-    it('returns mapped ActiveSessionSummary objects in the original order', async () => {
-      const rows = [
-        { id: 's1', created_at: NOW - 100, expires_at: FUTURE },
-        { id: 's2', created_at: NOW - 200, expires_at: FUTURE },
-      ]
-      const { db } = makeMockDb({ allResults: rows })
-      const sessions = await new D1SessionRepository(db, clock).listActiveForUser('u1', NOW, 20)
-      expect(sessions).toHaveLength(2)
-      expect(sessions[0]).toEqual({ id: 's1', createdAt: NOW - 100, expiresAt: FUTURE })
-      expect(sessions[1]).toEqual({ id: 's2', createdAt: NOW - 200, expiresAt: FUTURE })
-    })
-
-    it('returns an empty array when no active sessions exist', async () => {
-      const { db } = makeMockDb({ allResults: [] })
-      expect(await new D1SessionRepository(db, clock).listActiveForUser('u1', NOW, 20)).toEqual([])
-    })
-  })
-
-  describe('revokeById', () => {
-    it('returns true when the session is revoked (changes = 1)', async () => {
-      const { db } = makeMockDb({ runChanges: 1 })
-      expect(await new D1SessionRepository(db, clock).revokeById('s1', 'u1', NOW)).toBe(true)
-    })
-
-    it('returns false when the session is not found or belongs to another user (changes = 0)', async () => {
-      const { db } = makeMockDb({ runChanges: 0 })
-      expect(await new D1SessionRepository(db, clock).revokeById('s1', 'other-user', NOW)).toBe(false)
-    })
-
-    it('binds both sessionId and userId to prevent cross-user revocation', async () => {
-      const { db, bindMock } = makeMockDb({ runChanges: 1 })
-      await new D1SessionRepository(db, clock).revokeById('my-session', 'my-user', NOW)
-      const args = bindMock.mock.calls[0] as unknown[]
-      expect(args).toContain('my-session')
-      expect(args).toContain('my-user')
-    })
-  })
-})
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
+import { describe, it, expect, vi } from 'vitest'
+import { D1SessionRepository } from './d1-session.repository'
+import { FixedClock } from './fixed-clock'
+
+const FIXED_NOW_MS = 1700000000_000
+const NOW = Math.floor(FIXED_NOW_MS / 1000)
+const FUTURE = NOW + 7 * 24 * 3600
+const clock = new FixedClock(FIXED_NOW_MS)
+
+function makeMockDb(opts: {
+  firstResult?: unknown
+  runChanges?: number
+  allResults?: unknown[]
+} = {}) {
+  const { firstResult = null, runChanges = 1, allResults = [] } = opts
+  const runMock = vi.fn().mockResolvedValue({ success: true, meta: { changes: runChanges } })
+  const firstMock = vi.fn().mockResolvedValue(firstResult)
+  const allMock = vi.fn().mockResolvedValue({ results: allResults })
+  const bindMock = vi.fn(() => ({ first: firstMock, all: allMock, run: runMock }))
+  const prepareMock = vi.fn(() => ({ bind: bindMock }))
+  return { db: { prepare: prepareMock } as any, prepareMock, bindMock, runMock, firstMock, allMock }
+}
+
+describe('D1SessionRepository', () => {
+  describe('saveRefreshToken', () => {
+    it('calls INSERT INTO refresh_tokens with the correct bound values', async () => {
+      const { db, prepareMock, bindMock } = makeMockDb()
+      await new D1SessionRepository(db, clock).saveRefreshToken({
+        id: 'rt-1', userId: 'u1', tokenHash: 'h', expiresAt: FUTURE,
+      })
+      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('INSERT INTO refresh_tokens'))
+      expect(bindMock).toHaveBeenCalledWith('rt-1', 'u1', 'h', FUTURE, NOW)
+    })
+  })
+
+  describe('findActiveByHash', () => {
+    it('returns a RefreshTokenRecord with camelCase keys mapped from the snake_case row', async () => {
+      const row = {
+        id: 'rt-1', user_id: 'u1', token_hash: 'h',
+        expires_at: FUTURE, created_at: NOW, revoked_at: null,
+      }
+      const { db } = makeMockDb({ firstResult: row })
+      const result = await new D1SessionRepository(db, clock).findActiveByHash('h', NOW)
+      expect(result).toEqual({
+        id: 'rt-1', userId: 'u1', tokenHash: 'h',
+        expiresAt: FUTURE, createdAt: NOW, revokedAt: null,
+      })
+    })
+
+    it('returns null when no active token is found', async () => {
+      const { db } = makeMockDb({ firstResult: null })
+      expect(await new D1SessionRepository(db, clock).findActiveByHash('missing', NOW)).toBeNull()
+    })
+
+    it('passes tokenHash and nowTimestamp as bound values', async () => {
+      const { db, bindMock } = makeMockDb()
+      await new D1SessionRepository(db, clock).findActiveByHash('my-hash', NOW)
+      expect(bindMock).toHaveBeenCalledWith('my-hash', NOW)
+    })
+  })
+
+  describe('revokeByHash', () => {
+    it('returns true when one row is updated (changes = 1)', async () => {
+      const { db } = makeMockDb({ runChanges: 1 })
+      expect(await new D1SessionRepository(db, clock).revokeByHash('h', NOW)).toBe(true)
+    })
+
+    it('returns false when no row is updated (token already revoked or not found)', async () => {
+      const { db } = makeMockDb({ runChanges: 0 })
+      expect(await new D1SessionRepository(db, clock).revokeByHash('h', NOW)).toBe(false)
+    })
+  })
+
+  describe('revokeAllForUser', () => {
+    it('calls UPDATE refresh_tokens and includes the userId in the bound values', async () => {
+      const { db, prepareMock, bindMock } = makeMockDb()
+      await new D1SessionRepository(db, clock).revokeAllForUser('u1', NOW)
+      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('UPDATE refresh_tokens'))
+      expect((bindMock.mock.calls[0] as unknown[]).includes('u1')).toBe(true)
+    })
+  })
+
+  describe('listActiveForUser', () => {
+    it('returns mapped ActiveSessionSummary objects in the original order', async () => {
+      const rows = [
+        { id: 's1', created_at: NOW - 100, expires_at: FUTURE },
+        { id: 's2', created_at: NOW - 200, expires_at: FUTURE },
+      ]
+      const { db } = makeMockDb({ allResults: rows })
+      const sessions = await new D1SessionRepository(db, clock).listActiveForUser('u1', NOW, 20)
+      expect(sessions).toHaveLength(2)
+      expect(sessions[0]).toEqual({ id: 's1', createdAt: NOW - 100, expiresAt: FUTURE })
+      expect(sessions[1]).toEqual({ id: 's2', createdAt: NOW - 200, expiresAt: FUTURE })
+    })
+
+    it('returns an empty array when no active sessions exist', async () => {
+      const { db } = makeMockDb({ allResults: [] })
+      expect(await new D1SessionRepository(db, clock).listActiveForUser('u1', NOW, 20)).toEqual([])
+    })
+  })
+
+  describe('revokeById', () => {
+    it('returns true when the session is revoked (changes = 1)', async () => {
+      const { db } = makeMockDb({ runChanges: 1 })
+      expect(await new D1SessionRepository(db, clock).revokeById('s1', 'u1', NOW)).toBe(true)
+    })
+
+    it('returns false when the session is not found or belongs to another user (changes = 0)', async () => {
+      const { db } = makeMockDb({ runChanges: 0 })
+      expect(await new D1SessionRepository(db, clock).revokeById('s1', 'other-user', NOW)).toBe(false)
+    })
+
+    it('binds both sessionId and userId to prevent cross-user revocation', async () => {
+      const { db, bindMock } = makeMockDb({ runChanges: 1 })
+      await new D1SessionRepository(db, clock).revokeById('my-session', 'my-user', NOW)
+      const args = bindMock.mock.calls[0] as unknown[]
+      expect(args).toContain('my-session')
+      expect(args).toContain('my-user')
+    })
+  })
+})

package/src/shared/d1-session.repository.ts

@@ -1,102 +1,102 @@
-// SPDX-License-Identifier: BUSL-1.1
-// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
-// See LICENSE in the repository root for license terms.
-
-/// <reference types="@cloudflare/workers-types" />
-import type { ISessionRepository, NewRefreshToken, RefreshTokenRecord, ActiveSessionSummary, IClock } from '@beechcms/core'
-
-type RefreshTokenRow = {
-  id: string
-  user_id: string
-  token_hash: string
-  expires_at: number
-  created_at: number
-  revoked_at: number | null
-}
-
-type SessionSummaryRow = {
-  id: string
-  created_at: number
-  expires_at: number
-}
-
-function rowToRecord(row: RefreshTokenRow): RefreshTokenRecord {
-  return {
-    id: row.id,
-    userId: row.user_id,
-    tokenHash: row.token_hash,
-    expiresAt: row.expires_at,
-    createdAt: row.created_at,
-    revokedAt: row.revoked_at,
-  }
-}
-
-export class D1SessionRepository implements ISessionRepository {
-  constructor(
-    private readonly db: D1Database,
-    private readonly clock: IClock,
-  ) {}
-
-  async saveRefreshToken(record: NewRefreshToken): Promise<void> {
-    await this.db
-      .prepare('INSERT INTO refresh_tokens (id, user_id, token_hash, expires_at, created_at) VALUES (?, ?, ?, ?, ?)')
-      .bind(record.id, record.userId, record.tokenHash, record.expiresAt, this.clock.nowSeconds())
-      .run()
-  }
-
-  async findActiveByHash(tokenHash: string, nowTimestamp: number): Promise<RefreshTokenRecord | null> {
-    const row = await this.db
-      .prepare(
-        `SELECT id, user_id, token_hash, expires_at, created_at, revoked_at
-         FROM refresh_tokens
-         WHERE token_hash = ? AND expires_at > ? AND revoked_at IS NULL
-         LIMIT 1`
-      )
-      .bind(tokenHash, nowTimestamp)
-      .first<RefreshTokenRow>()
-    return row ? rowToRecord(row) : null
-  }
-
-  async revokeByHash(tokenHash: string, nowTimestamp: number): Promise<boolean> {
-    const result = await this.db
-      .prepare(
-        `UPDATE refresh_tokens
-         SET revoked_at = ?
-         WHERE token_hash = ? AND revoked_at IS NULL AND expires_at >= ?`
-      )
-      .bind(nowTimestamp, tokenHash, nowTimestamp)
-      .run()
-    const changes = (result as unknown as { meta?: { changes?: number } })?.meta?.changes ?? 0
-    return changes > 0
-  }
-
-  async revokeAllForUser(userId: string, nowTimestamp: number): Promise<void> {
-    await this.db
-      .prepare('UPDATE refresh_tokens SET revoked_at = ? WHERE user_id = ? AND revoked_at IS NULL')
-      .bind(nowTimestamp, userId)
-      .run()
-  }
-
-  async listActiveForUser(userId: string, nowTimestamp: number, limit: number): Promise<ActiveSessionSummary[]> {
-    const { results } = await this.db
-      .prepare(
-        `SELECT id, created_at, expires_at FROM refresh_tokens
-         WHERE user_id = ? AND revoked_at IS NULL AND expires_at > ?
-         ORDER BY created_at DESC LIMIT ?`
-      )
-      .bind(userId, nowTimestamp, limit)
-      .all<SessionSummaryRow>()
-    return (results ?? []).map(row => ({ id: row.id, createdAt: row.created_at, expiresAt: row.expires_at }))
-  }
-
-  async revokeById(sessionId: string, userId: string, nowTimestamp: number): Promise<boolean> {
-    const result = await this.db
-      .prepare(
-        'UPDATE refresh_tokens SET revoked_at = ? WHERE id = ? AND user_id = ? AND revoked_at IS NULL'
-      )
-      .bind(nowTimestamp, sessionId, userId)
-      .run()
-    const changes = (result as unknown as { meta?: { changes?: number } })?.meta?.changes ?? 0
-    return changes > 0
-  }
-}
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
+/// <reference types="@cloudflare/workers-types" />
+import type { ISessionRepository, NewRefreshToken, RefreshTokenRecord, ActiveSessionSummary, IClock } from '@beechcms/core'
+
+type RefreshTokenRow = {
+  id: string
+  user_id: string
+  token_hash: string
+  expires_at: number
+  created_at: number
+  revoked_at: number | null
+}
+
+type SessionSummaryRow = {
+  id: string
+  created_at: number
+  expires_at: number
+}
+
+function rowToRecord(row: RefreshTokenRow): RefreshTokenRecord {
+  return {
+    id: row.id,
+    userId: row.user_id,
+    tokenHash: row.token_hash,
+    expiresAt: row.expires_at,
+    createdAt: row.created_at,
+    revokedAt: row.revoked_at,
+  }
+}
+
+export class D1SessionRepository implements ISessionRepository {
+  constructor(
+    private readonly db: D1Database,
+    private readonly clock: IClock,
+  ) {}
+
+  async saveRefreshToken(record: NewRefreshToken): Promise<void> {
+    await this.db
+      .prepare('INSERT INTO refresh_tokens (id, user_id, token_hash, expires_at, created_at) VALUES (?, ?, ?, ?, ?)')
+      .bind(record.id, record.userId, record.tokenHash, record.expiresAt, this.clock.nowSeconds())
+      .run()
+  }
+
+  async findActiveByHash(tokenHash: string, nowTimestamp: number): Promise<RefreshTokenRecord | null> {
+    const row = await this.db
+      .prepare(
+        `SELECT id, user_id, token_hash, expires_at, created_at, revoked_at
+         FROM refresh_tokens
+         WHERE token_hash = ? AND expires_at > ? AND revoked_at IS NULL
+         LIMIT 1`
+      )
+      .bind(tokenHash, nowTimestamp)
+      .first<RefreshTokenRow>()
+    return row ? rowToRecord(row) : null
+  }
+
+  async revokeByHash(tokenHash: string, nowTimestamp: number): Promise<boolean> {
+    const result = await this.db
+      .prepare(
+        `UPDATE refresh_tokens
+         SET revoked_at = ?
+         WHERE token_hash = ? AND revoked_at IS NULL AND expires_at >= ?`
+      )
+      .bind(nowTimestamp, tokenHash, nowTimestamp)
+      .run()
+    const changes = (result as unknown as { meta?: { changes?: number } })?.meta?.changes ?? 0
+    return changes > 0
+  }
+
+  async revokeAllForUser(userId: string, nowTimestamp: number): Promise<void> {
+    await this.db
+      .prepare('UPDATE refresh_tokens SET revoked_at = ? WHERE user_id = ? AND revoked_at IS NULL')
+      .bind(nowTimestamp, userId)
+      .run()
+  }
+
+  async listActiveForUser(userId: string, nowTimestamp: number, limit: number): Promise<ActiveSessionSummary[]> {
+    const { results } = await this.db
+      .prepare(
+        `SELECT id, created_at, expires_at FROM refresh_tokens
+         WHERE user_id = ? AND revoked_at IS NULL AND expires_at > ?
+         ORDER BY created_at DESC LIMIT ?`
+      )
+      .bind(userId, nowTimestamp, limit)
+      .all<SessionSummaryRow>()
+    return (results ?? []).map(row => ({ id: row.id, createdAt: row.created_at, expiresAt: row.expires_at }))
+  }
+
+  async revokeById(sessionId: string, userId: string, nowTimestamp: number): Promise<boolean> {
+    const result = await this.db
+      .prepare(
+        'UPDATE refresh_tokens SET revoked_at = ? WHERE id = ? AND user_id = ? AND revoked_at IS NULL'
+      )
+      .bind(nowTimestamp, sessionId, userId)
+      .run()
+    const changes = (result as unknown as { meta?: { changes?: number } })?.meta?.changes ?? 0
+    return changes > 0
+  }
+}

package/src/shared/d1-setup-checklist.repository.ts

@@ -1,36 +1,36 @@
-// SPDX-License-Identifier: BUSL-1.1
-// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
-// See LICENSE in the repository root for license terms.
-
-/// <reference types="@cloudflare/workers-types" />
-
-export interface ISetupChecklistRepository {
-  getExistingTableNames(): Promise<Set<string>>
-  countAdmins(): Promise<number>
-  countEntriesInSeed(slug: string): Promise<number>
-}
-
-export class D1SetupChecklistRepository implements ISetupChecklistRepository {
-  constructor(private readonly db: D1Database) {}
-
-  async getExistingTableNames(): Promise<Set<string>> {
-    const result = await this.db
-      .prepare(`SELECT name FROM sqlite_master WHERE type='table'`)
-      .all<{ name: string }>()
-    return new Set((result.results ?? []).map(row => row.name))
-  }
-
-  async countAdmins(): Promise<number> {
-    const result = await this.db
-      .prepare(`SELECT COUNT(*) as count FROM users WHERE role = 'admin'`)
-      .first<{ count: number }>()
-    return result?.count ?? 0
-  }
-
-  async countEntriesInSeed(slug: string): Promise<number> {
-    const result = await this.db
-      .prepare(`SELECT COUNT(*) as count FROM content_${slug}`)
-      .first<{ count: number }>()
-    return result?.count ?? 0
-  }
-}
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
+/// <reference types="@cloudflare/workers-types" />
+
+export interface ISetupChecklistRepository {
+  getExistingTableNames(): Promise<Set<string>>
+  countAdmins(): Promise<number>
+  countEntriesInSeed(slug: string): Promise<number>
+}
+
+export class D1SetupChecklistRepository implements ISetupChecklistRepository {
+  constructor(private readonly db: D1Database) {}
+
+  async getExistingTableNames(): Promise<Set<string>> {
+    const result = await this.db
+      .prepare(`SELECT name FROM sqlite_master WHERE type='table'`)
+      .all<{ name: string }>()
+    return new Set((result.results ?? []).map(row => row.name))
+  }
+
+  async countAdmins(): Promise<number> {
+    const result = await this.db
+      .prepare(`SELECT COUNT(*) as count FROM users WHERE role = 'admin'`)
+      .first<{ count: number }>()
+    return result?.count ?? 0
+  }
+
+  async countEntriesInSeed(slug: string): Promise<number> {
+    const result = await this.db
+      .prepare(`SELECT COUNT(*) as count FROM content_${slug}`)
+      .first<{ count: number }>()
+    return result?.count ?? 0
+  }
+}