Skip to content

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

TypeScript

fix(control-api): bind Control Admin invitation TTL (R3-L2)

Josué3da6d69982a4
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index 11a4080f9..be6075d51 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.830",
+ "version": "0.1.833",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.830",
+ "version": "0.1.833",
"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 b43cb6d2b..7850bbcdb 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.830",
+ "version": "0.1.833",
"description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets",
"main": "dist/main.js",
"engines": {
diff --git a/control-api/src/services/adminAuthService.ts b/control-api/src/services/adminAuthService.ts
index 33be389b2..11f4cdd40 100644
--- a/control-api/src/services/adminAuthService.ts
+++ b/control-api/src/services/adminAuthService.ts
@@ -892,7 +892,7 @@ export async function createControlAdminInvitation(
)
INSERT INTO control_admin_invitations(email, invited_by_admin_id, replace_inviter, expires_at)
SELECT $1, locked_inviter.id, $3::boolean,
- NOW() + INTERVAL '${INVITATION_TTL_HOURS} hours'
+ NOW() + ($4::int * INTERVAL '1 hour')
FROM locked_inviter
WHERE NOT EXISTS (
SELECT 1 FROM control_admin_users WHERE lower(email) = lower($1)
@@ -903,7 +903,7 @@ export async function createControlAdminInvitation(
AND status IN ('pending', 'opened')
)
RETURNING ${INVITATION_COLUMNS}`,
- [normalizedEmail, invitedByAdminId, replaceInviter]
+ [normalizedEmail, invitedByAdminId, replaceInviter, INVITATION_TTL_HOURS]
)
} catch (error) {
if (
diff --git a/control-api/test/services.controlAdminInvitationTtl.test.ts b/control-api/test/services.controlAdminInvitationTtl.test.ts
new file mode 100644
index 000000000..1419ad7b2
--- /dev/null
+++ b/control-api/test/services.controlAdminInvitationTtl.test.ts
@@ -0,0 +1,79 @@
+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])
+ })
+})