Skip to content

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

TypeScript

fix: use typed control API retirement error codes

Josué2349608f201f
diff --git a/external-rest-api/package-lock.json b/external-rest-api/package-lock.json
index 4605405e5..d694ac341 100644
--- a/external-rest-api/package-lock.json
+++ b/external-rest-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-external-rest-api",
- "version": "0.1.131",
+ "version": "0.1.132",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-external-rest-api",
- "version": "0.1.131",
+ "version": "0.1.132",
"dependencies": {
"@clerum/jwt-key-policy": "file:../packages/jwt-key-policy",
"cors": "^2.8.5",
diff --git a/external-rest-api/package.json b/external-rest-api/package.json
index f87132466..4209ace94 100644
--- a/external-rest-api/package.json
+++ b/external-rest-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-external-rest-api",
- "version": "0.1.131",
+ "version": "0.1.132",
"description": "External REST API for profile, team management, and RPC token brokerage",
"main": "dist/main.js",
"engines": {
diff --git a/external-rest-api/src/releaseManifest.ts b/external-rest-api/src/releaseManifest.ts
index 7e4e0f581..bbde84627 100644
--- a/external-rest-api/src/releaseManifest.ts
+++ b/external-rest-api/src/releaseManifest.ts
@@ -8,7 +8,7 @@ export type ReleaseManifest = {
export const releaseManifest: ReleaseManifest = {
releaseId: 'v0.11.0',
- externalRestApiVersion: '0.1.131',
+ externalRestApiVersion: '0.1.132',
rpcProxyVersion: '0.1.126',
desktopVersion: '0.11.0',
minimumDesktopVersion: '0.1.252',
diff --git a/external-rest-api/src/routes/members.ts b/external-rest-api/src/routes/members.ts
index 20d7e7dae..c9765eb83 100644
--- a/external-rest-api/src/routes/members.ts
+++ b/external-rest-api/src/routes/members.ts
@@ -315,10 +315,7 @@ export function createMembersRouter(): Router {
} catch (error) {
const message = error instanceof Error ? error.message : ''
if (error instanceof ControlApiError && error.status === 400) {
- const code =
- error.body && typeof error.body === 'object' && 'error' in error.body
- ? String((error.body as { error: unknown }).error)
- : ''
+ const code = error.code ?? ''
if (code === 'reason_required' || code === 'idempotency_key_required') {
res.status(400).json(error.body)
return
diff --git a/external-rest-api/test/routes.members.test.ts b/external-rest-api/test/routes.members.test.ts
index 6ef9e95fd..0809080ce 100644
--- a/external-rest-api/test/routes.members.test.ts
+++ b/external-rest-api/test/routes.members.test.ts
@@ -2,6 +2,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
import express from 'express'
import { once } from 'node:events'
import request from 'supertest'
+import { ControlApiError } from '../src/controlApiClient.js'
import { createMembersRouter } from '../src/routes/members.js'
const authTokenMock = vi.hoisted(() => ({
@@ -108,6 +109,45 @@ describe('routes/members', () => {
)
})
+ it.each(['reason_required', 'idempotency_key_required'])(
+ 'forwards the exact Control API retirement code %s',
+ async code => {
+ authTokenMock.verifyToken.mockReturnValueOnce(claims)
+ const body = { error: code, correlationId: 'retirement-correlation' }
+ memberManagementMock.deleteManagedUser.mockRejectedValueOnce(
+ new ControlApiError('Control API rejected retirement', 400, body)
+ )
+
+ await request(makeApp())
+ .delete(`/members/${TARGET_USER_ID}`)
+ .set('authorization', 'Bearer good-token')
+ .set('Idempotency-Key', 'retire-user-2-v1')
+ .set('x-correlation-id', '11111111-1111-4111-8111-111111111111')
+ .send({ reason: 'team access no longer required' })
+ .expect(400, body)
+ }
+ )
+
+ it('does not treat a non-string Control API error as a stable retirement code', async () => {
+ authTokenMock.verifyToken.mockReturnValueOnce(claims)
+ memberManagementMock.deleteManagedUser.mockRejectedValueOnce(
+ new ControlApiError('Control API rejected retirement', 400, {
+ error: ['reason_required'],
+ })
+ )
+ const app = makeApp()
+ app.use((_error, _req, res, _next) => {
+ res.status(500).json({ error: 'internal_error' })
+ })
+
+ await request(app)
+ .delete(`/members/${TARGET_USER_ID}`)
+ .set('authorization', 'Bearer good-token')
+ .set('Idempotency-Key', 'retire-user-2-v1')
+ .send({ reason: 'team access no longer required' })
+ .expect(500, { error: 'internal_error' })
+ })
+
it.each([
[{}, 'Retirement reason is required'],
[{ reason: 'team access no longer required' }, 'Idempotency-Key header is required'],