Skip to content

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

TypeScript

fix: use typed RPC denial error codes (R13-7)

Josuéfa3142b7006a
diff --git a/external-rest-api/package-lock.json b/external-rest-api/package-lock.json
index 14b61a155..8646f53c4 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.133",
+ "version": "0.1.135",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-external-rest-api",
- "version": "0.1.133",
+ "version": "0.1.135",
"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 06d61c74d..fd6ea41a9 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.133",
+ "version": "0.1.135",
"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 f9cbed9ac..a789c7299 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.133',
+ externalRestApiVersion: '0.1.135',
rpcProxyVersion: '0.1.126',
desktopVersion: '0.11.0',
minimumDesktopVersion: '0.1.252',
diff --git a/external-rest-api/src/services/rpcService.ts b/external-rest-api/src/services/rpcService.ts
index 7a2f839a4..62f467fbd 100644
--- a/external-rest-api/src/services/rpcService.ts
+++ b/external-rest-api/src/services/rpcService.ts
@@ -31,10 +31,7 @@ export async function issueRpcAccessToken(
// instead of collapsing every 403 to a generic message. The desktop app and
// logs can then distinguish "needs a team" from a genuine auth failure.
if (error instanceof ControlApiError && error.status === 403) {
- const reason =
- error.body && typeof error.body === 'object' && 'error' in error.body
- ? String((error.body as { error: unknown }).error)
- : 'forbidden'
+ const reason = error.code ?? 'forbidden'
return { error: reason }
}
throw error
diff --git a/external-rest-api/test/services.rpc.test.ts b/external-rest-api/test/services.rpc.test.ts
index 93da81a71..58ca3ac7c 100644
--- a/external-rest-api/test/services.rpc.test.ts
+++ b/external-rest-api/test/services.rpc.test.ts
@@ -27,6 +27,22 @@ describe('rpcService.issueRpcAccessToken', () => {
expect(result).toEqual({ error: 'desktop_requires_team' })
})
+ it('uses the generic forbidden reason when a 403 error code is not a string', async () => {
+ for (const body of [{ error: ['desktop_requires_team'] }, { error: 42 }]) {
+ clientMock.controlApiRequest.mockRejectedValueOnce(
+ new ControlApiError(
+ `Control API POST /external/rpc/token failed (403): ${String(body.error)}`,
+ 403,
+ body
+ )
+ )
+
+ await expect(
+ issueRpcAccessToken('session', ['desktop:view'], ['pro-agent'])
+ ).resolves.toEqual({ error: 'forbidden' })
+ }
+ })
+
it('returns the issued token unchanged on success', async () => {
const token = {
token: 't',
@@ -50,6 +66,8 @@ describe('rpcService.issueRpcAccessToken', () => {
})
)
- await expect(issueRpcAccessToken('session', ['host:message:invoke'], ['pro-agent'])).rejects.toThrow()
+ await expect(
+ issueRpcAccessToken('session', ['host:message:invoke'], ['pro-agent'])
+ ).rejects.toThrow()
})
})