Skip to content

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

TypeScript

fix(desktop-app): reject ambiguous environment before logout (R12-M3)

Josuéfa4e18a17f2d
diff --git a/desktop-app/ui/src/hooks/domain/__tests__/useAuthController.desktopEnvironment.test.tsx b/desktop-app/ui/src/hooks/domain/__tests__/useAuthController.desktopEnvironment.test.tsx
index 190b5d988..f063039fd 100644
--- a/desktop-app/ui/src/hooks/domain/__tests__/useAuthController.desktopEnvironment.test.tsx
+++ b/desktop-app/ui/src/hooks/domain/__tests__/useAuthController.desktopEnvironment.test.tsx
@@ -522,6 +522,59 @@ describe('Desktop environment handoff', () => {
expect(screen.getByTestId('pending-rpc')).toHaveTextContent('none')
})
+ it('rejects ambiguous saved REST profiles before asking to sign out', async () => {
+ const duplicateProfiles = [
+ {
+ appName: 'Example tenant duplicate one',
+ externalRestApiBaseUrl: `${targetEnvironment.externalRestApiBaseUrl}/api/v2`,
+ rpcProxyBaseUrl: 'https://rpc-duplicate-one.example.test',
+ },
+ {
+ appName: 'Example tenant duplicate two',
+ externalRestApiBaseUrl: `${targetEnvironment.externalRestApiBaseUrl}/api/v3`,
+ rpcProxyBaseUrl: 'https://rpc-duplicate-two.example.test',
+ },
+ ]
+ for (const profile of duplicateProfiles)
+ await runtimeConfigModule!.saveDesktopRuntimeConfig(profile)
+ const state = await runtimeConfigModule!.getDesktopRuntimeConfigState()
+ for (const profile of duplicateProfiles) {
+ const option = state.options.find(candidate => candidate.appName === profile.appName)
+ if (!option?.configPath)
+ throw new Error('The runtime config producer did not persist profile')
+ const contents = JSON.parse(await fsp.readFile(option.configPath, 'utf8')) as {
+ externalRestApiBaseUrl: string
+ }
+ contents.externalRestApiBaseUrl = `${targetEnvironment.externalRestApiBaseUrl}/api/v1/`
+ await fsp.writeFile(option.configPath, JSON.stringify(contents), 'utf8')
+ }
+ vi.resetModules()
+ runtimeConfigModule = await import('../../../../../src/config')
+ const reloadedState = await runtimeConfigModule.getDesktopRuntimeConfigState()
+ const otherOption = reloadedState.options.find(
+ option => option.externalRestApiBaseUrl === otherEnvironment.externalRestApiBaseUrl
+ )
+ if (!otherOption) throw new Error('The runtime config producer did not return the other target')
+ await runtimeConfigModule!.selectDesktopRuntimeConfigOption(otherOption.id)
+
+ render(<Probe />)
+ await waitFor(() => expect(screen.getByTestId('configuration-loaded')).toHaveTextContent('yes'))
+ await act(async () => setAuthenticatedForTest?.(true))
+ mocks.logoutForEnvironmentMismatch.mockClear()
+
+ await dispatchDesktopEnvironmentLink({
+ ...targetEnvironment,
+ externalRestApiBaseUrl: `${targetEnvironment.externalRestApiBaseUrl}/api/v1`,
+ })
+
+ expect(screen.getByTestId('pending-environment-switch')).toHaveTextContent('none')
+ expect(mocks.logoutForEnvironmentMismatch).not.toHaveBeenCalled()
+ expect(mocks.setStatus).toHaveBeenCalledWith(
+ 'Desktop setup link rejected because multiple saved environments use this REST API.',
+ 'error'
+ )
+ })
+
it('keeps the current session when the user cancels a REST environment switch', async () => {
render(<Probe />)
await waitFor(() => expect(screen.getByTestId('configuration-loaded')).toHaveTextContent('yes'))
diff --git a/desktop-app/ui/src/hooks/domain/desktopEnvironmentHandoff.ts b/desktop-app/ui/src/hooks/domain/desktopEnvironmentHandoff.ts
index 4206925b1..3fabb3b84 100644
--- a/desktop-app/ui/src/hooks/domain/desktopEnvironmentHandoff.ts
+++ b/desktop-app/ui/src/hooks/domain/desktopEnvironmentHandoff.ts
@@ -169,6 +169,15 @@ export function createDesktopEnvironmentSetupHandler({
linkedConfig.externalRestApiBaseUrl
)
)
+ if (restMatches.saved.length > 1 && !activeRestEndpointMatches) {
+ setPendingDesktopEnvironmentSetup(null)
+ setStatus(
+ 'Desktop setup link rejected because multiple saved environments use this REST API.',
+ 'error'
+ )
+ return
+ }
+
if (authState.isAuthenticated && !activeRestEndpointMatches) {
const switchConfirmed = await requestEnvironmentSwitchConfirmation({
activeEnvironmentName: configState.currentConfig?.appName?.trim() || 'Current environment',
@@ -283,15 +292,6 @@ export function createDesktopEnvironmentSetupHandler({
return
}
- if (restMatches.saved.length > 1) {
- setPendingDesktopEnvironmentSetup(null)
- setStatus(
- 'Desktop setup link rejected because multiple saved environments use this REST API.',
- 'error'
- )
- return
- }
-
// The backend supplies the RPC endpoint after the user confirms this REST API.
if (!(await ownsSessionGeneration(sessionGeneration))) return
authState = getAuthState()