Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(control-ui): roll back invalid OAuth creation
Miguelon Peluchonec99e5c5d276
diff --git a/control-ui/components/CreateMcpServerForm/index.tsx b/control-ui/components/CreateMcpServerForm/index.tsxindex fbfba6f36..2f9f2f9a3 100644--- a/control-ui/components/CreateMcpServerForm/index.tsx+++ b/control-ui/components/CreateMcpServerForm/index.tsx@@ -12,6 +12,7 @@ import {createMcpSecret,createMcpServer,deleteMcpSecret,+ deleteMcpServer,getAgentTeams,getAgentUsers,getContext,@@ -587,7 +588,27 @@ export function CreateMcpServerForm({selectedContextRefs)if (oauthScopeError) {- setError(oauthScopeError)+ const rollbackFailures: string[] = []+ try {+ await deleteMcpServer(name)+ } catch {+ rollbackFailures.push('connector')+ }+ if (secretCreated) {+ try {+ await deleteMcpSecret(envSecretName.trim())+ secretCreated = false+ } catch {+ rollbackFailures.push('Secret')+ }+ }+ setError(+ rollbackFailures.length === 0+ ? oauthScopeError+ : `${oauthScopeError} Automatic cleanup failed for the ${rollbackFailures.join(+ ' and '+ )}; remove it before retrying.`+ )return}diff --git a/control-ui/components/__tests__/CreateMcpServerForm.test.tsx b/control-ui/components/__tests__/CreateMcpServerForm.test.tsxindex 872f45456..ed82878f0 100644--- a/control-ui/components/__tests__/CreateMcpServerForm.test.tsx+++ b/control-ui/components/__tests__/CreateMcpServerForm.test.tsx@@ -16,6 +16,7 @@ vi.mock('../../lib/api', async () => {createMcpServer: vi.fn().mockResolvedValue({ metadata: { name: 'test-server' } }),createMcpSecret: vi.fn().mockResolvedValue({ name: 'test-credentials' }),deleteMcpSecret: vi.fn().mockResolvedValue({ name: 'test-credentials' }),+ deleteMcpServer: vi.fn().mockResolvedValue({ name: 'test-server' }),getAgentTeams: vi.fn().mockResolvedValue({ items: [] }),getAgentUsers: vi.fn().mockResolvedValue({ items: [] }),// The form no longer reads the context list; kept as a spy to lock that contract.@@ -379,7 +380,7 @@ describe('CreateMcpServerForm — submit', () => {await waitFor(() => expect(onCreated).toHaveBeenCalledTimes(1), { timeout: 1500 })})- it('does not grant a returned context-scoped OAuth connector across Agent scopes', async () => {+ it('rolls back a returned context-scoped OAuth connector and Secret across Agent scopes', async () => {vi.mocked(api.getHosts).mockResolvedValueOnce({items: [{ metadata: { name: 'agent-alpha' }, spec: { contextRef: 'ctx-alpha' } },@@ -398,13 +399,28 @@ describe('CreateMcpServerForm — submit', () => {goToAccessStep()await selectAgents('agent-alpha', 'agent-beta')continueToSecretsStep()- chooseNoCredentials()+ chooseNewSecret()+ fireEvent.change(screen.getByPlaceholderText('brave-search-credentials'), {+ target: { value: 'shared-drive-oauth' },+ })+ fireEvent.click(screen.getByRole('button', { name: 'Add Key Mapping' }))+ fireEvent.change(screen.getByPlaceholderText('api-key'), {+ target: { value: 'api-key' },+ })+ fireEvent.change(screen.getByPlaceholderText('BRAVE_API_KEY'), {+ target: { value: 'DRIVE_API_KEY' },+ })+ fireEvent.change(screen.getByPlaceholderText('sk-...'), {+ target: { value: 'test-secret' },+ })fireEvent.click(screen.getByRole('button', { name: 'Create connector' }))expect(await screen.findByText(/shared OAuth identity.*original access scope/i)).toBeInTheDocument()+ expect(api.deleteMcpServer).toHaveBeenCalledWith('shared-drive')+ expect(api.deleteMcpSecret).toHaveBeenCalledWith('shared-drive-oauth')expect(api.getContext).not.toHaveBeenCalled()expect(api.updateContext).not.toHaveBeenCalled()})diff --git a/control-ui/lib/api.ts b/control-ui/lib/api.tsindex 522130379..a8772a115 100644--- a/control-ui/lib/api.ts+++ b/control-ui/lib/api.ts@@ -1438,6 +1438,13 @@ export async function createMcpServer(payload: {return apiSend('POST', '/api/v1/admin/mcp-servers', payload) as Promise<McpServerResource>}+export async function deleteMcpServer(name: string) {+ return apiSend('DELETE', `/api/v1/admin/mcp-servers/${encodeURIComponent(name)}`) as Promise<{+ name: string+ namespace?: string+ }>+}+export async function getMcpServer(name: string) {return apiGet(`/api/v1/admin/mcp-servers/${encodeURIComponent(name)}`diff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex d7df038bc..e86cb73a8 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.495",+ "version": "0.1.496","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.495",+ "version": "0.1.496","dependencies": {"@clerum/display-field": "file:../packages/display-field","@clerum/llm-providers": "file:../packages/llm-providers",diff --git a/control-ui/package.json b/control-ui/package.jsonindex f64979846..f97d9fd97 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.495",+ "version": "0.1.496","private": true,"scripts": {"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",