Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix: reject malformed retirement error codes (R18-L3)
Josuéc80a82c92525
diff --git a/external-rest-api/package-lock.json b/external-rest-api/package-lock.jsonindex d694ac341..14b61a155 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.132",+ "version": "0.1.133","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-external-rest-api",- "version": "0.1.132",+ "version": "0.1.133","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.jsonindex 4209ace94..06d61c74d 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.132",+ "version": "0.1.133","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.tsindex bbde84627..f9cbed9ac 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.132',+ externalRestApiVersion: '0.1.133',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.tsindex c9765eb83..3de5c5762 100644--- a/external-rest-api/src/routes/members.ts+++ b/external-rest-api/src/routes/members.ts@@ -1,7 +1,7 @@import { type NextFunction, type Response, Router } from 'express'import { ipKeyGenerator, rateLimit } from 'express-rate-limit'import { randomUUID } from 'node:crypto'-import { ControlApiError } from '../controlApiClient.js'+import { ControlApiError, ControlApiUnexpectedResponseError } from '../controlApiClient.js'import { type AuthedRequest, extractAuthToken, requireAuth } from '../middleware/auth.js'import {cancelManagedInvitation,@@ -320,6 +320,10 @@ export function createMembersRouter(): Router {res.status(400).json(error.body)return}+ if (error.code === null) {+ next(new ControlApiUnexpectedResponseError())+ return+ }}if (message.includes('(403)')) {res.status(403).json({ error: 'You do not control all teams this member belongs to' })diff --git a/external-rest-api/test/routes.members.test.ts b/external-rest-api/test/routes.members.test.tsindex 0809080ce..3543e4e8b 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 { createApp } from '../src/app.js'import { ControlApiError } from '../src/controlApiClient.js'import { createMembersRouter } from '../src/routes/members.js'@@ -131,21 +132,21 @@ describe('routes/members', () => {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'],- })+ new ControlApiError(+ `Control API DELETE /external/members/${TARGET_USER_ID} failed (400): reason_required`,+ 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}`)+ await request(createApp())+ .delete(`/api/v1/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' })+ .expect(500, {+ error: 'Internal Server Error',+ message: 'Control API returned an unsupported response',+ })})it.each([