Skip to content

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

TypeScript

fix: keep Profile desktop handoffs REST-only

Josuéeac2d3432718
diff --git a/desktop-app/src/__tests__/evenfireDeepLinkRouter.test.ts b/desktop-app/src/__tests__/evenfireDeepLinkRouter.test.ts
index 0eb7b8013..98247f2a4 100644
--- a/desktop-app/src/__tests__/evenfireDeepLinkRouter.test.ts
+++ b/desktop-app/src/__tests__/evenfireDeepLinkRouter.test.ts
@@ -102,7 +102,6 @@ describe('evenfire deep-link router', () => {
payload: {
appName: 'Acme',
externalRestApiBaseUrl: 'https://api.example.test',
- rpcProxyBaseUrl: 'https://rpc.example.test',
},
window: 'initial',
},
@@ -148,7 +147,6 @@ describe('evenfire deep-link router', () => {
payload: {
appName: 'Env',
externalRestApiBaseUrl: 'https://api.example.test',
- rpcProxyBaseUrl: '',
},
window: 'initial',
},
@@ -183,7 +181,6 @@ describe('evenfire deep-link router', () => {
payload: {
appName: 'Second',
externalRestApiBaseUrl: 'https://api.example.test',
- rpcProxyBaseUrl: '',
},
window: 'recreated',
},
diff --git a/desktop-app/src/evenfireDeepLinkRouter.ts b/desktop-app/src/evenfireDeepLinkRouter.ts
index bc435371f..6ee444227 100644
--- a/desktop-app/src/evenfireDeepLinkRouter.ts
+++ b/desktop-app/src/evenfireDeepLinkRouter.ts
@@ -50,7 +50,6 @@ export function createEvenfireDeepLinkRouter<TWindow extends RendererTarget>(
const sendDesktopEnvironmentSetup = (parsed: URL, rawUrl: string): void => {
const externalRestApiBaseUrl = parsed.searchParams.get('externalRestApiBaseUrl') || ''
- const rpcProxyBaseUrl = parsed.searchParams.get('rpcProxyBaseUrl') || ''
const appName =
parsed.searchParams.get('tenantName') || parsed.searchParams.get('appName') || ''
if (!externalRestApiBaseUrl) return
@@ -60,7 +59,6 @@ export function createEvenfireDeepLinkRouter<TWindow extends RendererTarget>(
options.focusMainWindow()
window.webContents.send('auth:desktopEnvironmentSetup', {
externalRestApiBaseUrl,
- rpcProxyBaseUrl,
appName,
})
return
diff --git a/desktop-app/src/preload.ts b/desktop-app/src/preload.ts
index 59abcb5b3..d145b5e74 100644
--- a/desktop-app/src/preload.ts
+++ b/desktop-app/src/preload.ts
@@ -106,17 +106,12 @@ const clerum = Object.freeze({
return () => ipcRenderer.off('auth:desktopSetupToken', listener)
},
onDesktopEnvironmentSetup: (
- callback: (payload: {
- externalRestApiBaseUrl: string
- rpcProxyBaseUrl: string
- appName?: string
- }) => void
+ callback: (payload: { externalRestApiBaseUrl: string; appName?: string }) => void
) => {
const listener = (
_event: Electron.IpcRendererEvent,
payload: {
externalRestApiBaseUrl: string
- rpcProxyBaseUrl: string
appName?: string
}
) => callback(payload)
diff --git a/desktop-app/src/renderer.d.ts b/desktop-app/src/renderer.d.ts
index 338a01182..ddbd4456c 100644
--- a/desktop-app/src/renderer.d.ts
+++ b/desktop-app/src/renderer.d.ts
@@ -97,11 +97,7 @@ declare global {
callback: (payload: { email: string; authorizationToken: string }) => void
) => () => void
onDesktopEnvironmentSetup: (
- callback: (payload: {
- externalRestApiBaseUrl: string
- rpcProxyBaseUrl: string
- appName?: string
- }) => void
+ callback: (payload: { externalRestApiBaseUrl: string; appName?: string }) => void
) => () => void
getDesktopReleaseStatus: () => Promise<DesktopReleaseStatus>
getDesktopAppInfo: () => Promise<DesktopAppInfo>
diff --git a/desktop-app/ui/src/App.tsx b/desktop-app/ui/src/App.tsx
index 191708402..198db9bd0 100644
--- a/desktop-app/ui/src/App.tsx
+++ b/desktop-app/ui/src/App.tsx
@@ -2703,19 +2703,14 @@ export function App() {
body={
<>
<p>
- Review the service URLs for{' '}
+ Review the External REST API for{' '}
<strong>{vm.pendingDesktopEnvironmentSetup.appName || 'Evenfire'}</strong>. Continue
- only if you trust them.
+ only if you trust this host.
</p>
<p className="auth-environment-confirm-url">
{vm.pendingDesktopEnvironmentSetup.externalRestApiBaseUrl}
</p>
{pendingEnvironmentHost ? <p className="muted">Host: {pendingEnvironmentHost}</p> : null}
- {vm.pendingDesktopEnvironmentSetup.rpcProxyBaseUrl ? (
- <p className="auth-environment-confirm-url">
- RPC proxy: {vm.pendingDesktopEnvironmentSetup.rpcProxyBaseUrl}
- </p>
- ) : null}
</>
}
cancelLabel="Cancel"
diff --git a/desktop-app/ui/src/__tests__/App.deepLinks.test.tsx b/desktop-app/ui/src/__tests__/App.deepLinks.test.tsx
index b0052cdc0..0cad49463 100644
--- a/desktop-app/ui/src/__tests__/App.deepLinks.test.tsx
+++ b/desktop-app/ui/src/__tests__/App.deepLinks.test.tsx
@@ -394,9 +394,10 @@ describe('App deep-link orchestration', () => {
expect(confirmDialogHarness.props?.title).toBe('Add desktop environment?')
const dialogBody = renderToStaticMarkup(<>{confirmDialogHarness.props?.body}</>)
expect(dialogBody).toContain(
- 'Review the service URLs for <strong>Example tenant</strong>. Continue only if you trust them.'
+ 'Review the External REST API for <strong>Example tenant</strong>. Continue only if you trust this host.'
)
- expect(dialogBody).toContain('https://rpc.example.test')
+ expect(dialogBody).toContain('https://api.example.test')
+ expect(dialogBody).not.toContain('https://rpc.example.test')
})
beforeEach(() => {
diff --git a/profile-ui/app/components/__tests__/ProfilePortalHome.test.tsx b/profile-ui/app/components/__tests__/ProfilePortalHome.test.tsx
index 231e203cc..af7282451 100644
--- a/profile-ui/app/components/__tests__/ProfilePortalHome.test.tsx
+++ b/profile-ui/app/components/__tests__/ProfilePortalHome.test.tsx
@@ -149,7 +149,7 @@ describe('Profile Portal home desktop app link', () => {
expect(handoffCopy).toHaveTextContent('Open Desktop App instead.')
expect(href.searchParams.get('externalRestApiBaseUrl')).toBe(environment.externalRestApiBaseUrl)
expect(href.searchParams.get('tenantName')).toBe(environment.appName)
- expect(href.searchParams.get('rpcProxyBaseUrl')).toBe(environment.rpcProxyBaseUrl)
+ expect(href.searchParams.get('rpcProxyBaseUrl')).toBeNull()
})
it('builds the desktop app link from the production discovery response', () => {
@@ -164,6 +164,6 @@ describe('Profile Portal home desktop app link', () => {
environment.externalRestApiBaseUrl
)
expect(parsedLink.searchParams.get('tenantName')).toBe(environment.appName)
- expect(parsedLink.searchParams.get('rpcProxyBaseUrl')).toBe(environment.rpcProxyBaseUrl)
+ expect(parsedLink.searchParams.get('rpcProxyBaseUrl')).toBeNull()
})
})
diff --git a/profile-ui/lib/desktopAppLinks.ts b/profile-ui/lib/desktopAppLinks.ts
index 9b87ff5cf..1247d8a06 100644
--- a/profile-ui/lib/desktopAppLinks.ts
+++ b/profile-ui/lib/desktopAppLinks.ts
@@ -15,9 +15,6 @@ export function buildDesktopEnvironmentLink(
externalRestApiBaseUrl: environment.externalRestApiBaseUrl,
tenantName: environment.appName || 'Evenfire',
})
- if (environment.rpcProxyBaseUrl) {
- params.set('rpcProxyBaseUrl', environment.rpcProxyBaseUrl)
- }
return `evenfire://desktop-environment?${params.toString()}`
}
diff --git a/profile-ui/package-lock.json b/profile-ui/package-lock.json
index 348c55153..21e2516b4 100644
--- a/profile-ui/package-lock.json
+++ b/profile-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-profile-ui",
- "version": "0.1.166",
+ "version": "0.1.167",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-profile-ui",
- "version": "0.1.166",
+ "version": "0.1.167",
"dependencies": {
"@clerum/desktop-app-links": "file:../packages/desktop-app-links",
"@clerum/frontend-components": "file:../packages/frontend-components",
diff --git a/profile-ui/package.json b/profile-ui/package.json
index 052c0e788..a7555ae59 100644
--- a/profile-ui/package.json
+++ b/profile-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-profile-ui",
- "version": "0.1.166",
+ "version": "0.1.167",
"private": true,
"scripts": {
"dev": "next dev",
diff --git a/profile-ui/test/desktopAppLinks.test.ts b/profile-ui/test/desktopAppLinks.test.ts
index 3848136b9..0dbbc5e54 100644
--- a/profile-ui/test/desktopAppLinks.test.ts
+++ b/profile-ui/test/desktopAppLinks.test.ts
@@ -20,10 +20,10 @@ test('buildDesktopEnvironmentLink defaults the tenant name to Evenfire', () => {
assert.equal(parsedLink.searchParams.get('tenantName'), 'Evenfire')
})
-test('buildDesktopEnvironmentLink omits an empty RPC proxy URL', () => {
+test('buildDesktopEnvironmentLink does not include the RPC proxy URL', () => {
const link = buildDesktopEnvironmentLink({
externalRestApiBaseUrl: 'https://api.example.com',
- rpcProxyBaseUrl: '',
+ rpcProxyBaseUrl: 'https://rpc.example.com',
appName: 'Example tenant',
})