Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
test(control-api): invoke controlUIAuth middleware directly in unit tests
Alfredo Lopezd8647ffc2fbb
diff --git a/control-api/package-lock.json b/control-api/package-lock.jsonindex a96253c29..9797df431 100644--- a/control-api/package-lock.json+++ b/control-api/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-api",- "version": "0.1.478",+ "version": "0.1.479","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-api",- "version": "0.1.478",+ "version": "0.1.479","dependencies": {"@clerum/display-field": "file:../packages/display-field","@clerum/image-policy": "file:../packages/image-policy",diff --git a/control-api/package.json b/control-api/package.jsonindex 37d7af3a5..4ab6c5546 100644--- a/control-api/package.json+++ b/control-api/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-api",- "version": "0.1.478",+ "version": "0.1.479","description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets","main": "dist/main.js","engines": {diff --git a/control-api/test/middleware.controlUIAuth.test.ts b/control-api/test/middleware.controlUIAuth.test.tsindex 0c8fbe163..28ee85c6c 100644--- a/control-api/test/middleware.controlUIAuth.test.ts+++ b/control-api/test/middleware.controlUIAuth.test.ts@@ -1,9 +1,7 @@import { beforeEach, describe, expect, it, vi } from 'vitest'-import express from 'express'-import request from 'supertest'+import type { NextFunction, Response } from 'express'import type { UiAuthedRequest } from '../src/middleware/controlUIAuth.js'import { requireAuthForControlUI } from '../src/middleware/controlUIAuth.js'-import { rateLimitMiddleware } from '../src/middleware/rateLimitMiddleware.js'const adminTokenMock = vi.hoisted(() => ({verifyAdminToken: vi.fn(),@@ -14,22 +12,8 @@ const adminSvcMock = vi.hoisted(() => ({isAdminTokenRevoked: vi.fn(),}))-const mockCheckAndIncrement = vi.hoisted(() => vi.fn())-vi.mock('../src/utils/auth/adminAuthToken.js', () => adminTokenMock)vi.mock('../src/services/adminAuthService.js', () => adminSvcMock)-vi.mock('../src/services/rateLimiterService.js', () => ({- checkAndIncrement: (...args: unknown[]) => mockCheckAndIncrement(...args),-}))-vi.mock('../src/observability/metrics.js', () => ({- rateLimitHitsTotal: { inc: vi.fn() },-}))--const testAuthRateLimit = rateLimitMiddleware({- bucketType: 'control_ui_auth_test',- maxPerMinute: 100,- getBucketKey: () => 'control-ui-auth-test',-})const BASE_CLAIMS = {sub: 'admin-id',@@ -40,12 +24,41 @@ const BASE_CLAIMS = {sessionVersion: 2,}-function makeProtectedApp() {- const app = express()- app.get('/protected', testAuthRateLimit, requireAuthForControlUI, (req: UiAuthedRequest, res) => {- res.status(200).json({ adminId: req.adminAuth?.sub })- })- return app+function mockReq(cookie?: string, extraHeaders: Record<string, string> = {}): UiAuthedRequest {+ const headers: Record<string, string> = { ...extraHeaders }+ if (cookie) headers.cookie = cookie+ return {+ headers,+ header(name: string) {+ const key = name.toLowerCase()+ return headers[key] ?? headers[name]+ },+ } as UiAuthedRequest+}++function mockRes() {+ const res = {+ statusCode: 200,+ body: undefined as unknown,+ status(code: number) {+ res.statusCode = code+ return res+ },+ json(payload: unknown) {+ res.body = payload+ return res+ },+ }+ return res as Response & { statusCode: number; body: unknown }+}++async function invokeMiddleware(+ req: UiAuthedRequest,+ res: ReturnType<typeof mockRes>,+ next: NextFunction = vi.fn()+): Promise<{ next: NextFunction }> {+ await requireAuthForControlUI(req, res, next)+ return { next }}describe('middleware/controlUIAuth', () => {@@ -53,14 +66,6 @@ describe('middleware/controlUIAuth', () => {adminTokenMock.verifyAdminToken.mockReset()adminSvcMock.findAdminById.mockReset()adminSvcMock.isAdminTokenRevoked.mockReset()- mockCheckAndIncrement.mockReset()- mockCheckAndIncrement.mockResolvedValue({- allowed: true,- remaining: 99,- resetMs: Date.now() + 60_000,- windowStartMs: Date.now(),- count: 1,- })})it('accepts the HttpOnly admin session cookie as the UI auth token', async () => {@@ -72,21 +77,25 @@ describe('middleware/controlUIAuth', () => {sessionVersion: 2,})- const res = await request(makeProtectedApp())- .get('/protected')- .set('cookie', 'control_ui_admin_session=admin-cookie-token')- .expect(200)+ const req = mockReq('control_ui_admin_session=admin-cookie-token')+ const res = mockRes()+ const next = vi.fn()+ await invokeMiddleware(req, res, next)- expect(res.body).toEqual({ adminId: 'admin-id' })+ expect(next).toHaveBeenCalledOnce()+ expect(req.adminAuth?.sub).toBe('admin-id')expect(adminTokenMock.verifyAdminToken).toHaveBeenCalledWith('admin-cookie-token')})it('rejects legacy bearer tokens for Control UI browser auth', async () => {- await request(makeProtectedApp())- .get('/protected')- .set('authorization', 'Bearer old-admin-token')- .expect(401)-+ const req = mockReq(undefined, { authorization: 'Bearer old-admin-token' })+ const res = mockRes()+ const next = vi.fn()+ await invokeMiddleware(req, res, next)++ expect(res.statusCode).toBe(401)+ expect(res.body).toEqual({ error: 'Unauthorized' })+ expect(next).not.toHaveBeenCalled()expect(adminTokenMock.verifyAdminToken).not.toHaveBeenCalled()})@@ -94,12 +103,14 @@ describe('middleware/controlUIAuth', () => {adminTokenMock.verifyAdminToken.mockReturnValue(BASE_CLAIMS)adminSvcMock.isAdminTokenRevoked.mockResolvedValue(true)- await request(makeProtectedApp())- .get('/protected')- .set('cookie', 'control_ui_admin_session=admin-cookie-token')- .expect(401)+ const req = mockReq('control_ui_admin_session=admin-cookie-token')+ const res = mockRes()+ const next = vi.fn()+ await invokeMiddleware(req, res, next)+ expect(res.statusCode).toBe(401)expect(adminSvcMock.findAdminById).not.toHaveBeenCalled()+ expect(next).not.toHaveBeenCalled()})it('rejects stale sessionVersion claims after password reset', async () => {@@ -111,10 +122,13 @@ describe('middleware/controlUIAuth', () => {sessionVersion: 2,})- await request(makeProtectedApp())- .get('/protected')- .set('cookie', 'control_ui_admin_session=admin-cookie-token')- .expect(401)+ const req = mockReq('control_ui_admin_session=admin-cookie-token')+ const res = mockRes()+ const next = vi.fn()+ await invokeMiddleware(req, res, next)++ expect(res.statusCode).toBe(401)+ expect(next).not.toHaveBeenCalled()})it('rejects disabled administrator accounts', async () => {@@ -126,10 +140,13 @@ describe('middleware/controlUIAuth', () => {sessionVersion: 2,})- await request(makeProtectedApp())- .get('/protected')- .set('cookie', 'control_ui_admin_session=admin-cookie-token')- .expect(401)+ const req = mockReq('control_ui_admin_session=admin-cookie-token')+ const res = mockRes()+ const next = vi.fn()+ await invokeMiddleware(req, res, next)++ expect(res.statusCode).toBe(401)+ expect(next).not.toHaveBeenCalled()})it('propagates findAdminById failures via Express error handling', async () => {@@ -137,21 +154,13 @@ describe('middleware/controlUIAuth', () => {adminSvcMock.isAdminTokenRevoked.mockResolvedValue(false)adminSvcMock.findAdminById.mockRejectedValue(new Error('pg connection terminated'))- const app = express()- app.get('/protected', testAuthRateLimit, requireAuthForControlUI, (_req, res) => {- res.status(200).json({ ok: true })- })- app.use(- (err: Error, _req: express.Request, res: express.Response, _next: express.NextFunction) => {- res.status(500).json({ error: err.message })- }- )-- const res = await request(app)- .get('/protected')- .set('cookie', 'control_ui_admin_session=admin-cookie-token')- .expect(500)-- expect(res.body).toEqual({ error: 'pg connection terminated' })+ const req = mockReq('control_ui_admin_session=admin-cookie-token')+ const res = mockRes()+ const next = vi.fn()+ await invokeMiddleware(req, res, next)++ expect(next).toHaveBeenCalledOnce()+ expect(next.mock.calls[0][0]).toEqual(new Error('pg connection terminated'))+ expect(res.statusCode).toBe(200)})})