Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

test(control-api): remove brittle invitation SQL assertions (R3-L9)

Josué8fcd57a97c87
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index 3ccaff2d6..b6aee6210 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.837",
+ "version": "0.1.838",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.837",
+ "version": "0.1.838",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/grok-provider-attempt-contract": "file:../packages/grok-provider-attempt-contract",
diff --git a/control-api/package.json b/control-api/package.json
index cd7929cd5..f067a278a 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.837",
+ "version": "0.1.838",
"description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets",
"main": "dist/main.js",
"engines": {
diff --git a/control-api/test/services.adminAuthDelete.test.ts b/control-api/test/services.adminAuthDelete.test.ts
index 70d026165..0b76c5e29 100644
--- a/control-api/test/services.adminAuthDelete.test.ts
+++ b/control-api/test/services.adminAuthDelete.test.ts
@@ -3,7 +3,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
const state = vi.hoisted(() => ({
targetStatus: 'active' as 'active' | 'disabled',
queries: [] as string[],
- calls: [] as Array<{ text: string; values?: unknown[] }>,
}))
const linkService = vi.hoisted(() => ({
@@ -42,9 +41,8 @@ vi.mock('../src/services/tracing/environment.js', () => ({
canonicalTracingEnvironment: vi.fn(() => 'test'),
}))
-function queryResult(text: string, values?: unknown[]) {
+function queryResult(text: string) {
state.queries.push(text)
- state.calls.push({ text, values })
if (text.includes('WITH revoked AS')) return { rows: [], rowCount: 0 }
if (text.includes('FOR UPDATE') && text.includes('status')) {
return {
@@ -93,10 +91,9 @@ describe('deleteControlAdmin lifecycle transition', () => {
beforeEach(() => {
state.targetStatus = 'active'
state.queries = []
- state.calls = []
db.withTransaction.mockImplementation(
async (callback: (tx: { query: typeof queryResult }) => unknown) =>
- callback({ query: async (text: string, values?: unknown[]) => queryResult(text, values) })
+ callback({ query: async (text: string) => queryResult(text) })
)
linkService.retireParentInTransaction.mockReset().mockResolvedValue(true)
eventService.appendInTransaction.mockReset().mockResolvedValue(undefined)
@@ -123,7 +120,7 @@ describe('deleteControlAdmin lifecycle transition', () => {
it('retires inside the caller transaction with the caller reason', async () => {
const { retireControlAdminInTransaction } = await import('../src/services/adminAuthService.js')
db.withTransaction.mockClear()
- const tx = { query: async (text: string, values?: unknown[]) => queryResult(text, values) }
+ const tx = { query: async (text: string) => queryResult(text) }
await expect(
retireControlAdminInTransaction(tx, {
@@ -142,23 +139,4 @@ describe('deleteControlAdmin lifecycle transition', () => {
})
expect(eventService.appendInTransaction).toHaveBeenCalledOnce()
})
-
- it('revokes the retiring admin invitations and paired desktop links in the same transaction', async () => {
- const { retireControlAdminInTransaction } = await import('../src/services/adminAuthService.js')
- const tx = { query: async (text: string, values?: unknown[]) => queryResult(text, values) }
-
- await expect(
- retireControlAdminInTransaction(tx, {
- actorAdminId: 'actor-admin',
- adminId: 'target-admin',
- reason: 'control_admin_retired',
- })
- ).resolves.toEqual({ deleted: true })
-
- const revocation = state.calls.find(call => call.text.includes('WITH revoked AS'))
- expect(revocation?.text).toContain('invited_by_admin_id = $1::uuid')
- expect(revocation?.text).toContain("status IN ('pending', 'opened')")
- expect(revocation?.text).toContain("purpose = 'admin_desktop_access'")
- expect(revocation?.values).toEqual(['target-admin'])
- })
})
diff --git a/control-api/test/services.controlAdminInvitationTtl.test.ts b/control-api/test/services.controlAdminInvitationTtl.test.ts
deleted file mode 100644
index 1419ad7b2..000000000
--- a/control-api/test/services.controlAdminInvitationTtl.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const query = vi.hoisted(() => vi.fn())
-const withTransaction = vi.hoisted(() => vi.fn())
-
-vi.mock('../src/config.js', () => ({
- config: { adminJwtIssuer: 'test-issuer', adminJwtAudience: 'test-audience' },
-}))
-vi.mock('../src/db.js', () => ({ pool: { query }, withTransaction }))
-vi.mock('../src/observability/logger.js', () => ({ rootLogger: { warn: vi.fn() } }))
-vi.mock('../src/services/directory/users.js', () => ({
- retireDesktopUserInTransaction: vi.fn(),
-}))
-vi.mock('../src/services/gfsDesktopOperatorLinkService.js', () => ({
- gfsDesktopOperatorLinkService: { retireParentInTransaction: vi.fn() },
-}))
-vi.mock('../src/services/tracing/adminOperationContext.js', () => ({
- currentAdministrativeRequestContext: vi.fn(() => null),
-}))
-vi.mock('../src/services/tracing/administrativeEvents.js', () => ({
- AdministrativeEventService: class {
- appendInTransaction = vi.fn()
- },
-}))
-vi.mock('../src/services/tracing/controlApiLocalAdministrativeBindingResolver.js', () => ({
- CONTROL_API_LOCAL_ADMINISTRATIVE_PRINCIPAL_V1: { kind: 'control_api_local' },
-}))
-vi.mock('../src/services/tracing/environment.js', () => ({
- canonicalTracingEnvironment: vi.fn(() => 'test'),
-}))
-
-describe('Control Admin invitation TTL SQL parameter', () => {
- beforeEach(() => {
- withTransaction
- .mockReset()
- .mockImplementation(async (work: (db: { query: typeof query }) => unknown) => work({ query }))
- query.mockReset().mockImplementation(async (text: string) => {
- if (text.includes('UPDATE control_admin_invitations')) {
- return { rows: [], rowCount: 0 }
- }
- if (text.includes('INSERT INTO control_admin_invitations')) {
- const now = new Date('2026-10-26T12:00:00.000Z')
- return {
- rows: [
- {
- id: 'invitation-1',
- email: '[email protected]',
- status: 'pending',
- expires_at: new Date(now.getTime() + 168 * 60 * 60 * 1000),
- created_at: now,
- accepted_at: null,
- invited_by_admin_id: 'admin-1',
- replace_inviter: false,
- },
- ],
- rowCount: 1,
- }
- }
- if (text.includes('SELECT id') && text.includes('control_admin_users')) {
- return { rows: [{ id: 'admin-1' }], rowCount: 1 }
- }
- throw new Error(`unexpected query: ${text}`)
- })
- })
-
- it('binds the shared seven-day TTL instead of interpolating it into SQL', async () => {
- const { createControlAdminInvitation } = await import('../src/services/adminAuthService.js')
-
- await expect(
- createControlAdminInvitation(' [email protected] ', 'admin-1')
- ).resolves.toMatchObject({ id: 'invitation-1' })
-
- const [insertSql, values] = query.mock.calls.find(([text]) =>
- String(text).includes('INSERT INTO control_admin_invitations')
- ) as [string, unknown[]]
- expect(insertSql).toContain("NOW() + ($4::int * INTERVAL '1 hour')")
- expect(values).toEqual(['[email protected]', 'admin-1', false, 168])
- })
-})
diff --git a/control-api/test/services.invitationTtl.test.ts b/control-api/test/services.invitationTtl.test.ts
index 8d4e03ccc..6d7eaa704 100644
--- a/control-api/test/services.invitationTtl.test.ts
+++ b/control-api/test/services.invitationTtl.test.ts
@@ -17,8 +17,9 @@ describe('invitation expiration policy', () => {
async function insert(purpose?: 'member_invitation' | 'password_reset') {
const normalizedPurpose = purpose || 'member_invitation'
const createdAt = new Date('2026-10-26T12:00:00.000Z')
- const query = vi.fn(async (sql: string) => {
+ const query = vi.fn(async (sql: string, values?: unknown[]) => {
if (sql.includes('WITH inserted AS')) {
+ const ttlHours = Number(values?.[6])
return {
rows: [
{
@@ -31,7 +32,7 @@ describe('invitation expiration policy', () => {
status: 'pending',
purpose: normalizedPurpose,
created_at: createdAt,
- expires_at: new Date(createdAt.getTime() + 7 * 24 * 60 * 60 * 1000),
+ expires_at: new Date(createdAt.getTime() + ttlHours * 60 * 60 * 1000),
accepted_at: null,
accepted_user_id: null,
team_name: null,
@@ -62,10 +63,16 @@ describe('invitation expiration policy', () => {
expect(setup.result.invitation.purpose).toBe('member_invitation')
expect(setup.insertValues[5]).toBe('member_invitation')
expect(setup.insertValues[6]).toBe('168')
+ expect(
+ setup.result.invitation.expires_at.getTime() - setup.result.invitation.created_at.getTime()
+ ).toBe(168 * 60 * 60 * 1000)
const reset = await insert('password_reset')
expect(reset.result.invitation.purpose).toBe('password_reset')
expect(reset.insertValues[5]).toBe('password_reset')
expect(reset.insertValues[6]).toBe('48')
+ expect(
+ reset.result.invitation.expires_at.getTime() - reset.result.invitation.created_at.getTime()
+ ).toBe(48 * 60 * 60 * 1000)
})
})