Skip to content

armgit / Pulse

Public Imported from GitHub
0

Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.

Format token lifetime repair and pin authenticated-user forwarding

pulse-triage[bot]8ac9ab7dbd62
diff --git a/frontend-modern/src/api/__tests__/security.transport.test.ts b/frontend-modern/src/api/__tests__/security.transport.test.ts
index bc733491a1..e2ebc8c00e 100644
--- a/frontend-modern/src/api/__tests__/security.transport.test.ts
+++ b/frontend-modern/src/api/__tests__/security.transport.test.ts
@@ -4,52 +4,95 @@ const fetchMock = vi.fn();
let api: typeof import('../security');
let client: typeof import('@/utils/apiClient');
beforeEach(async () => {
- vi.resetModules(); fetchMock.mockReset(); vi.stubGlobal('fetch', fetchMock);
- sessionStorage.clear(); document.cookie = 'pulse_csrf=; Max-Age=0; Path=/';
- client = await import('@/utils/apiClient'); api = await import('../security');
- client.setOrgID('org-a'); client.setApiToken('synthetic-only-auth');
+ vi.resetModules();
+ fetchMock.mockReset();
+ vi.stubGlobal('fetch', fetchMock);
+ sessionStorage.clear();
+ document.cookie = 'pulse_csrf=; Max-Age=0; Path=/';
+ client = await import('@/utils/apiClient');
+ api = await import('../security');
+ client.setOrgID('org-a');
+ client.setApiToken('synthetic-only-auth');
+});
+afterEach(() => {
+ client.clearAuth();
+ vi.unstubAllGlobals();
+ vi.unstubAllEnvs();
});
-afterEach(() => { client.clearAuth(); vi.unstubAllGlobals(); vi.unstubAllEnvs(); });
const invoke = (operation: string, options: { signal?: AbortSignal; expectedOrgID?: string }) => {
- if (operation === 'create') return api.SecurityAPI.createToken('Test', ['monitoring:read'], options);
+ if (operation === 'create')
+ return api.SecurityAPI.createToken('Test', ['monitoring:read'], options);
if (operation === 'rename') return api.SecurityAPI.renameToken('token/1', 'Renamed', options);
- if (operation === 'scope') return api.SecurityAPI.updateTokenScopes('token/1', ['monitoring:read'], options);
+ if (operation === 'scope')
+ return api.SecurityAPI.updateTokenScopes('token/1', ['monitoring:read'], options);
return api.SecurityAPI.deleteToken('token/1', options);
};
describe('API token real transport', () => {
- it.each(['create', 'rename', 'scope', 'revoke'])('does not dispatch an aborted %s after CSRF preparation', async (operation) => {
- vi.stubEnv('MODE', 'production');
- let resolve!: (response: Response) => void;
- fetchMock.mockImplementationOnce(() => new Promise<Response>((yes) => { resolve = yes; }));
- const controller = new AbortController();
- const writing = invoke(operation, { expectedOrgID: 'org-a', signal: controller.signal });
- const result = expect(writing).rejects.toMatchObject({ name: 'AbortError' });
- expect(fetchMock.mock.calls[0][0]).toBe('/api/health');
- controller.abort(); resolve(new Response('{}', { status: 200 })); await result;
- expect(fetchMock).toHaveBeenCalledTimes(1);
- });
+ it.each(['create', 'rename', 'scope', 'revoke'])(
+ 'does not dispatch an aborted %s after CSRF preparation',
+ async (operation) => {
+ vi.stubEnv('MODE', 'production');
+ let resolve!: (response: Response) => void;
+ fetchMock.mockImplementationOnce(
+ () =>
+ new Promise<Response>((yes) => {
+ resolve = yes;
+ }),
+ );
+ const controller = new AbortController();
+ const writing = invoke(operation, { expectedOrgID: 'org-a', signal: controller.signal });
+ const result = expect(writing).rejects.toMatchObject({ name: 'AbortError' });
+ expect(fetchMock.mock.calls[0][0]).toBe('/api/health');
+ controller.abort();
+ resolve(new Response('{}', { status: 200 }));
+ await result;
+ expect(fetchMock).toHaveBeenCalledTimes(1);
+ },
+ );
it('does not dispatch a confirmation into a different organisation after CSRF preparation', async () => {
vi.stubEnv('MODE', 'production');
let resolve!: (response: Response) => void;
- fetchMock.mockImplementationOnce(() => new Promise<Response>((yes) => { resolve = yes; }));
+ fetchMock.mockImplementationOnce(
+ () =>
+ new Promise<Response>((yes) => {
+ resolve = yes;
+ }),
+ );
const writing = invoke('create', { expectedOrgID: 'org-a' });
const result = expect(writing).rejects.toThrow('Organisation changed.');
- client.setOrgID('org-b'); resolve(new Response('{}', { status: 200 })); await result;
+ client.setOrgID('org-b');
+ resolve(new Response('{}', { status: 200 }));
+ await result;
expect(fetchMock).toHaveBeenCalledTimes(1);
});
- it.each(['create', 'rename', 'scope', 'revoke'].flatMap((operation) => [403, 429, 503].map((status) => ({ operation, status }))))('does not replay $operation after HTTP $status', async ({ operation, status }) => {
- fetchMock.mockResolvedValueOnce(new Response('{}', { status, headers: { 'X-CSRF-Token': 'new-synthetic-csrf', 'Retry-After': '0' } }));
+ it.each(
+ ['create', 'rename', 'scope', 'revoke'].flatMap((operation) =>
+ [403, 429, 503].map((status) => ({ operation, status })),
+ ),
+ )('does not replay $operation after HTTP $status', async ({ operation, status }) => {
+ fetchMock.mockResolvedValueOnce(
+ new Response('{}', {
+ status,
+ headers: { 'X-CSRF-Token': 'new-synthetic-csrf', 'Retry-After': '0' },
+ }),
+ );
await expect(invoke(operation, { expectedOrgID: 'org-a' })).rejects.toMatchObject({ status });
expect(fetchMock).toHaveBeenCalledTimes(1);
- expect(fetchMock.mock.calls[0][1]).toMatchObject({ headers: { 'X-Pulse-Org-ID': 'org-a', 'X-API-Token': 'synthetic-only-auth' }, credentials: 'include' });
+ expect(fetchMock.mock.calls[0][1]).toMatchObject({
+ headers: { 'X-Pulse-Org-ID': 'org-a', 'X-API-Token': 'synthetic-only-auth' },
+ credentials: 'include',
+ });
expect(client.getOrgID()).toBe('org-a');
});
it('keeps a refused inventory unavailable instead of silently falling back to default', async () => {
fetchMock.mockResolvedValueOnce(new Response('{"error":"invalid_org"}', { status: 400 }));
- await expect(api.SecurityAPI.listTokens({ expectedOrgID: 'org-a' })).rejects.toMatchObject({ status: 400 });
- expect(fetchMock).toHaveBeenCalledTimes(1); expect(client.getOrgID()).toBe('org-a');
+ await expect(api.SecurityAPI.listTokens({ expectedOrgID: 'org-a' })).rejects.toMatchObject({
+ status: 400,
+ });
+ expect(fetchMock).toHaveBeenCalledTimes(1);
+ expect(client.getOrgID()).toBe('org-a');
});
});
diff --git a/frontend-modern/src/components/Settings/__tests__/APITokenLifetimes.test.tsx b/frontend-modern/src/components/Settings/__tests__/APITokenLifetimes.test.tsx
index 1becbb7ac5..a2be9628de 100644
--- a/frontend-modern/src/components/Settings/__tests__/APITokenLifetimes.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/APITokenLifetimes.test.tsx
@@ -11,39 +11,80 @@ import { useAPITokenManagerState } from '../useAPITokenManagerState';
vi.mock('@/api/security', () => ({
SecurityAPI: {
- listTokens: vi.fn(), createToken: vi.fn(), deleteToken: vi.fn(),
- renameToken: vi.fn(), updateTokenScopes: vi.fn(),
+ listTokens: vi.fn(),
+ createToken: vi.fn(),
+ deleteToken: vi.fn(),
+ renameToken: vi.fn(),
+ updateTokenScopes: vi.fn(),
},
}));
-vi.mock('@/api/agentCapabilities', () => ({ fetchAgentCapabilitiesManifest: () => Promise.resolve({ requiredScopes: [] }) }));
-vi.mock('@/contexts/appRuntime', () => ({ useWebSocket: () => ({ markDockerRuntimesTokenRevoked: vi.fn(), markAgentsTokenRevoked: vi.fn() }) }));
-vi.mock('@/hooks/useResources', () => ({ useResources: () => ({ byType: () => [], resources: () => [] }) }));
-vi.mock('@/stores/notifications', () => ({ notificationStore: { success: vi.fn(), error: vi.fn() } }));
+vi.mock('@/api/agentCapabilities', () => ({
+ fetchAgentCapabilitiesManifest: () => Promise.resolve({ requiredScopes: [] }),
+}));
+vi.mock('@/contexts/appRuntime', () => ({
+ useWebSocket: () => ({
+ markDockerRuntimesTokenRevoked: vi.fn(),
+ markAgentsTokenRevoked: vi.fn(),
+ }),
+}));
+vi.mock('@/hooks/useResources', () => ({
+ useResources: () => ({ byType: () => [], resources: () => [] }),
+}));
+vi.mock('@/stores/notifications', () => ({
+ notificationStore: { success: vi.fn(), error: vi.fn() },
+}));
vi.mock('@/utils/logger', () => ({ logger: { error: vi.fn(), debug: vi.fn() } }));
-const record: APITokenRecord = { id: 'token-1', name: 'Known token', prefix: 'test', suffix: '1234', createdAt: '2026-11-01T00:00:00Z', scopes: ['monitoring:read'] };
-const created = { token: 'synthetic-only-secret', record: { ...record, id: 'created', name: 'Created token' } };
+const record: APITokenRecord = {
+ id: 'token-1',
+ name: 'Known token',
+ prefix: 'test',
+ suffix: '1234',
+ createdAt: '2026-11-01T00:00:00Z',
+ scopes: ['monitoring:read'],
+};
+const created = {
+ token: 'synthetic-only-secret',
+ record: { ...record, id: 'created', name: 'Created token' },
+};
const deferred = <T,>() => {
let resolve!: (value: T) => void;
let reject!: (error: Error) => void;
- const promise = new Promise<T>((yes, no) => { resolve = yes; reject = no; });
+ const promise = new Promise<T>((yes, no) => {
+ resolve = yes;
+ reject = no;
+ });
return { promise, resolve, reject };
};
let state: ReturnType<typeof useAPITokenManagerState>;
let setAllowed!: (allowed: boolean) => void;
-let setHint!: (hint: string) => void;
+let setUser!: (hint: string) => void;
let setMounted!: (mounted: boolean) => void;
const changed = vi.fn();
const Harness = () => {
const [allowed, allow] = createSignal(true);
- const [hint, hintTo] = createSignal('initial');
+ const [user, userTo] = createSignal('initial');
const [mounted, mount] = createSignal(true);
- setAllowed = allow; setHint = hintTo; setMounted = mount;
+ setAllowed = allow;
+ setUser = userTo;
+ setMounted = mount;
const Panel = () => {
- state = useAPITokenManagerState({ get canManage() { return allowed(); }, get currentUser() { return hint(); }, onTokensChanged: changed });
+ state = useAPITokenManagerState({
+ get canManage() {
+ return allowed();
+ },
+ get currentUser() {
+ return user();
+ },
+ onTokensChanged: changed,
+ });
return null;
};
- return <Show when={mounted()}><Panel /></Show>;
+ return (
+ <Show when={mounted()}>
+ <Panel />
+ </Show>
+ );
};
const ready = async () => {
render(() => <Harness />);
@@ -52,44 +93,72 @@ const ready = async () => {
};
const reveal = useTokenRevealState();
beforeEach(() => {
- vi.resetAllMocks(); setOrgID('org-a'); dismissTokenReveal();
+ vi.resetAllMocks();
+ setOrgID('org-a');
+ dismissTokenReveal();
vi.mocked(SecurityAPI.listTokens).mockResolvedValue([record]);
vi.mocked(SecurityAPI.createToken).mockResolvedValue(created);
vi.mocked(SecurityAPI.renameToken).mockResolvedValue({ ...record, name: 'Renamed' });
- vi.mocked(SecurityAPI.updateTokenScopes).mockResolvedValue({ ...record, scopes: ['settings:read'] });
+ vi.mocked(SecurityAPI.updateTokenScopes).mockResolvedValue({
+ ...record,
+ scopes: ['settings:read'],
+ });
+});
+afterEach(() => {
+ cleanup();
+ dismissTokenReveal();
+ setOrgID(null);
});
-afterEach(() => { cleanup(); dismissTokenReveal(); setOrgID(null); });
describe('API token request lifetimes', () => {
- it('ignores a late create after unmount instead of revealing its credential globally', async () => {
- await ready();
- const pending = deferred<typeof created>();
- vi.mocked(SecurityAPI.createToken).mockReturnValueOnce(pending.promise);
- const writing = state.handleGenerate();
- const options = vi.mocked(SecurityAPI.createToken).mock.calls[0][2]!;
- setMounted(false);
- expect(options.signal?.aborted).toBe(true);
- pending.resolve(created); await writing;
- expect(reveal()).toBeNull(); expect(state.newTokenValue()).toBeNull();
- expect(notificationStore.success).not.toHaveBeenCalled(); expect(changed).not.toHaveBeenCalled();
- });
+ it.each(['success', 'failure'])(
+ 'ignores a late create %s after unmount instead of revealing its credential globally',
+ async (result) => {
+ await ready();
+ const pending = deferred<typeof created>();
+ vi.mocked(SecurityAPI.createToken).mockReturnValueOnce(pending.promise);
+ const writing = state.handleGenerate();
+ const options = vi.mocked(SecurityAPI.createToken).mock.calls[0][2]!;
+ setMounted(false);
+ if (result === 'success') pending.resolve(created);
+ else pending.reject(new Error('synthetic failure'));
+ await writing;
+ expect(reveal()).toBeNull();
+ expect(state.newTokenValue()).toBeNull();
+ expect(options?.signal?.aborted).toBe(true);
+ expect(notificationStore.error).not.toHaveBeenCalled();
+ expect(notificationStore.success).not.toHaveBeenCalled();
+ expect(changed).not.toHaveBeenCalled();
+ },
+ );
it.each(['permission', 'organisation', 'user identity'])(
- 'withdraws a create across a %s change and never replays it on return', async (change) => {
+ 'withdraws a create across a %s change and never replays it on return',
+ async (change) => {
await ready();
const pending = deferred<typeof created>();
vi.mocked(SecurityAPI.createToken).mockReturnValueOnce(pending.promise);
const writing = state.handleGenerate();
const signal = vi.mocked(SecurityAPI.createToken).mock.calls[0][2]!.signal!;
- if (change === 'permission') { setAllowed(false); setAllowed(true); }
+ if (change === 'permission') {
+ setAllowed(false);
+ setAllowed(true);
+ }
if (change === 'organisation') {
- setOrgID('org-b'); eventBus.emit('org_switched', 'org-b');
- setOrgID('org-a'); eventBus.emit('org_switched', 'org-a');
+ setOrgID('org-b');
+ eventBus.emit('org_switched', 'org-b');
+ setOrgID('org-a');
+ eventBus.emit('org_switched', 'org-a');
+ }
+ if (change === 'user identity') {
+ setUser('other');
+ setUser('initial');
}
- if (change === 'user identity') { setHint('other'); setHint('initial'); }
expect(signal.aborted).toBe(true);
- pending.resolve(created); await writing;
- expect(reveal()).toBeNull(); expect(changed).not.toHaveBeenCalled();
+ pending.resolve(created);
+ await writing;
+ expect(reveal()).toBeNull();
+ expect(changed).not.toHaveBeenCalled();
expect(notificationStore.success).not.toHaveBeenCalled();
expect(SecurityAPI.createToken).toHaveBeenCalledTimes(1);
await waitFor(() => expect(state.tokensLoaded()).toBe(true));
@@ -97,58 +166,87 @@ describe('API token request lifetimes', () => {
},
);
- it.each(['success', 'failure'])('ignores a disposed inventory %s without claiming absence or notifying', async (result) => {
- const pending = deferred<APITokenRecord[]>();
- vi.mocked(SecurityAPI.listTokens).mockReturnValueOnce(pending.promise);
- render(() => <Harness />);
- const signal = vi.mocked(SecurityAPI.listTokens).mock.calls[0][0]!.signal!;
- setMounted(false); expect(signal.aborted).toBe(true);
- if (result === 'success') pending.resolve([]); else pending.reject(new Error('synthetic failure'));
- await pending.promise.catch(() => {});
- await Promise.resolve();
- expect(state.tokensLoaded()).toBe(false);
- expect(notificationStore.error).not.toHaveBeenCalled();
- });
+ it.each(['success', 'failure'])(
+ 'ignores a disposed inventory %s without claiming absence or notifying',
+ async (result) => {
+ const pending = deferred<APITokenRecord[]>();
+ vi.mocked(SecurityAPI.listTokens).mockReturnValueOnce(pending.promise);
+ render(() => <Harness />);
+ const signal = vi.mocked(SecurityAPI.listTokens).mock.calls[0][0]!.signal!;
+ setMounted(false);
+ expect(signal.aborted).toBe(true);
+ if (result === 'success') pending.resolve([]);
+ else pending.reject(new Error('synthetic failure'));
+ await pending.promise.catch(() => {});
+ await Promise.resolve();
+ expect(state.tokensLoaded()).toBe(false);
+ expect(notificationStore.error).not.toHaveBeenCalled();
+ },
+ );
it('does not let an old organisation inventory replace the new accepted read', async () => {
const oldRead = deferred<APITokenRecord[]>();
vi.mocked(SecurityAPI.listTokens).mockReturnValueOnce(oldRead.promise);
render(() => <Harness />);
const oldSignal = vi.mocked(SecurityAPI.listTokens).mock.calls[0][0]!.signal!;
- setOrgID('org-b'); eventBus.emit('org_switched', 'org-b');
+ setOrgID('org-b');
+ eventBus.emit('org_switched', 'org-b');
await waitFor(() => expect(state.tokensLoaded()).toBe(true));
- oldRead.resolve([]); await oldRead.promise; await Promise.resolve();
+ oldRead.resolve([]);
+ await oldRead.promise;
+ await Promise.resolve();
expect(oldSignal.aborted).toBe(true);
expect(state.sortedTokens()).toEqual([record]);
- expect(SecurityAPI.listTokens).toHaveBeenLastCalledWith(expect.objectContaining({ expectedOrgID: 'org-b' }));
+ expect(SecurityAPI.listTokens).toHaveBeenLastCalledWith(
+ expect.objectContaining({ expectedOrgID: 'org-b' }),
+ );
});
- it.each(['rename', 'scope', 'revoke'] as const)('ignores a late %s success after withdrawal', async (operation) => {
- await ready();
- const pending = deferred<APITokenRecord>();
- vi.mocked(SecurityAPI.renameToken).mockReturnValueOnce(pending.promise);
- vi.mocked(SecurityAPI.updateTokenScopes).mockReturnValueOnce(pending.promise);
- vi.mocked(SecurityAPI.deleteToken).mockReturnValueOnce(pending.promise.then(() => undefined));
- const writing = operation === 'rename' ? state.handleRename(record, 'Renamed') : operation === 'scope' ? state.handleUpdateScopes(record, ['settings:read']) : state.handleDelete(record);
- setAllowed(false);
- pending.resolve({ ...record, name: 'Obsolete completion' }); await writing;
- expect(notificationStore.success).not.toHaveBeenCalled(); expect(changed).not.toHaveBeenCalled();
- expect(state.sortedTokens()).not.toContainEqual(expect.objectContaining({ name: 'Obsolete completion' }));
- });
+ it.each(['rename', 'scope', 'revoke'] as const)(
+ 'ignores a late %s success after withdrawal',
+ async (operation) => {
+ await ready();
+ const pending = deferred<APITokenRecord>();
+ vi.mocked(SecurityAPI.renameToken).mockReturnValueOnce(pending.promise);
+ vi.mocked(SecurityAPI.updateTokenScopes).mockReturnValueOnce(pending.promise);
+ vi.mocked(SecurityAPI.deleteToken).mockReturnValueOnce(pending.promise.then(() => undefined));
+ const writing =
+ operation === 'rename'
+ ? state.handleRename(record, 'Renamed')
+ : operation === 'scope'
+ ? state.handleUpdateScopes(record, ['settings:read'])
+ : state.handleDelete(record);
+ setAllowed(false);
+ pending.resolve({ ...record, name: 'Obsolete completion' });
+ await writing;
+ expect(notificationStore.success).not.toHaveBeenCalled();
+ expect(changed).not.toHaveBeenCalled();
+ expect(state.sortedTokens()).not.toContainEqual(
+ expect.objectContaining({ name: 'Obsolete completion' }),
+ );
+ },
+ );
it('serialises all writes and resumes an interrupted inventory read without accepting its old snapshot', async () => {
const read = deferred<APITokenRecord[]>();
- vi.mocked(SecurityAPI.listTokens).mockReturnValueOnce(read.promise).mockResolvedValueOnce([record, created.record]);
- render(() => <Harness />); state.applyScopePreset(['monitoring:read']);
+ vi.mocked(SecurityAPI.listTokens)
+ .mockReturnValueOnce(read.promise)
+ .mockResolvedValueOnce([record, created.record]);
+ render(() => <Harness />);
+ state.applyScopePreset(['monitoring:read']);
const pending = deferred<typeof created>();
vi.mocked(SecurityAPI.createToken).mockReturnValueOnce(pending.promise);
const writing = state.handleGenerate();
- await state.handleGenerate(); await state.loadTokens();
+ await state.handleGenerate();
+ await state.loadTokens();
expect(SecurityAPI.createToken).toHaveBeenCalledTimes(1);
expect(SecurityAPI.listTokens).toHaveBeenCalledTimes(1);
- pending.resolve(created); await writing;
+ pending.resolve(created);
+ await writing;
await waitFor(() => expect(state.tokensLoaded()).toBe(true));
- read.resolve([]); await read.promise; await Promise.resolve();
+ read.resolve([]);
+ await read.promise;
+ await Promise.resolve();
expect(state.sortedTokens()).toHaveLength(2);
expect(reveal()?.token).toBe(created.token);
expect(SecurityAPI.listTokens).toHaveBeenCalledTimes(2);
@@ -156,19 +254,26 @@ describe('API token request lifetimes', () => {
});
it('clears only its owned reveal and local credential when its authority is withdrawn', async () => {
- await ready(); await state.handleGenerate();
+ await ready();
+ await state.handleGenerate();
expect(reveal()?.token).toBe(created.token);
setAllowed(false);
- expect(reveal()).toBeNull(); expect(state.newTokenValue()).toBeNull();
- state.reopenTokenDialog(); await state.copyNewMonitoringKioskLink();
- expect(reveal()).toBeNull(); expect(state.newMonitoringKioskLink()).toBeNull();
+ expect(reveal()).toBeNull();
+ expect(state.newTokenValue()).toBeNull();
+ state.reopenTokenDialog();
+ await state.copyNewMonitoringKioskLink();
+ expect(reveal()).toBeNull();
+ expect(state.newMonitoringKioskLink()).toBeNull();
});
it('does not dismiss a replacement token reveal owned by another issuer', async () => {
- await ready(); await state.handleGenerate();
+ await ready();
+ await state.handleGenerate();
showTokenReveal({ token: 'other-synthetic-secret', source: 'agent-setup' });
- const other = reveal(); setMounted(false);
- expect(reveal()).toBe(other); expect(state.newTokenValue()).toBeNull();
+ const other = reveal();
+ setMounted(false);
+ expect(reveal()).toBe(other);
+ expect(state.newTokenValue()).toBeNull();
});
it('rejects a row retained from an earlier accepted inventory', async () => {
@@ -194,7 +299,11 @@ describe('API token request lifetimes', () => {
allow(false);
await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument());
await screen.findAllByText('Known token');
- expect(within(screen.getByRole('article', { name: 'API token Known token' })).getByRole('button', { name: 'Rename' })).toBeDisabled();
+ expect(
+ within(screen.getByRole('article', { name: 'API token Known token' })).getByRole('button', {
+ name: 'Rename',
+ }),
+ ).toBeDisabled();
expect(SecurityAPI.renameToken).not.toHaveBeenCalled();
});
});
diff --git a/frontend-modern/src/components/Settings/__tests__/APITokenManager.test.tsx b/frontend-modern/src/components/Settings/__tests__/APITokenManager.test.tsx
index d0a02946a9..5883ae4458 100644
--- a/frontend-modern/src/components/Settings/__tests__/APITokenManager.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/APITokenManager.test.tsx
@@ -519,10 +519,11 @@ describe('APITokenManager', () => {
fireEvent.click(screen.getByRole('button', { name: 'Generate' }));
await waitFor(() => {
- expect(createTokenMock).toHaveBeenCalledWith('Container automation', [
- DOCKER_MANAGE_SCOPE,
- DOCKER_REPORT_SCOPE,
- ], expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }));
+ expect(createTokenMock).toHaveBeenCalledWith(
+ 'Container automation',
+ [DOCKER_MANAGE_SCOPE, DOCKER_REPORT_SCOPE],
+ expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }),
+ );
});
expect(showTokenRevealMock).toHaveBeenCalledWith(
@@ -568,10 +569,11 @@ describe('APITokenManager', () => {
fireEvent.click(screen.getByRole('button', { name: 'Generate' }));
await waitFor(() => {
- expect(createTokenMock).toHaveBeenCalledWith('Replacement agent token', [
- AGENT_CONFIG_READ_SCOPE,
- AGENT_REPORT_SCOPE,
- ], expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }));
+ expect(createTokenMock).toHaveBeenCalledWith(
+ 'Replacement agent token',
+ [AGENT_CONFIG_READ_SCOPE, AGENT_REPORT_SCOPE],
+ expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }),
+ );
});
});
@@ -662,13 +664,17 @@ describe('APITokenManager', () => {
fireEvent.click(screen.getByRole('button', { name: 'Generate' }));
await waitFor(() => {
- expect(createTokenMock).toHaveBeenCalledWith('OpenCode Pulse', [
- AI_EXECUTE_SCOPE,
- MONITORING_READ_SCOPE,
- MONITORING_WRITE_SCOPE,
- SETTINGS_READ_SCOPE,
- SETTINGS_WRITE_SCOPE,
- ], expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }));
+ expect(createTokenMock).toHaveBeenCalledWith(
+ 'OpenCode Pulse',
+ [
+ AI_EXECUTE_SCOPE,
+ MONITORING_READ_SCOPE,
+ MONITORING_WRITE_SCOPE,
+ SETTINGS_READ_SCOPE,
+ SETTINGS_WRITE_SCOPE,
+ ],
+ expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }),
+ );
});
expect(showTokenRevealMock).toHaveBeenCalledWith(
@@ -715,13 +721,17 @@ describe('APITokenManager', () => {
fireEvent.click(screen.getByRole('button', { name: 'Generate' }));
await waitFor(() => {
- expect(createTokenMock).toHaveBeenCalledWith('Patrol external agent', [
- AI_EXECUTE_SCOPE,
- MONITORING_READ_SCOPE,
- MONITORING_WRITE_SCOPE,
- SETTINGS_READ_SCOPE,
- SETTINGS_WRITE_SCOPE,
- ], expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }));
+ expect(createTokenMock).toHaveBeenCalledWith(
+ 'Patrol external agent',
+ [
+ AI_EXECUTE_SCOPE,
+ MONITORING_READ_SCOPE,
+ MONITORING_WRITE_SCOPE,
+ SETTINGS_READ_SCOPE,
+ SETTINGS_WRITE_SCOPE,
+ ],
+ expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }),
+ );
});
});
@@ -763,7 +773,11 @@ describe('APITokenManager', () => {
fireEvent.click(screen.getByRole('button', { name: 'Generate' }));
await waitFor(() => {
- expect(createTokenMock).toHaveBeenCalledWith('Audit export', [AUDIT_READ_SCOPE], expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }));
+ expect(createTokenMock).toHaveBeenCalledWith(
+ 'Audit export',
+ [AUDIT_READ_SCOPE],
+ expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }),
+ );
});
});
@@ -825,7 +839,10 @@ describe('APITokenManager', () => {
fireEvent.click(confirmBtn);
await waitFor(() => {
- expect(deleteTokenMock).toHaveBeenCalledWith('token-runtime', expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }));
+ expect(deleteTokenMock).toHaveBeenCalledWith(
+ 'token-runtime',
+ expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }),
+ );
});
expect(markDockerRuntimesTokenRevokedMock).toHaveBeenCalledWith('token-runtime', [
@@ -912,7 +929,11 @@ describe('APITokenManager', () => {
fireEvent.click(within(dialog).getByRole('button', { name: 'Save scopes' }));
await waitFor(() => {
- expect(updateTokenScopesMock).toHaveBeenCalledWith('token-edit', [MONITORING_READ_SCOPE], expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }));
+ expect(updateTokenScopesMock).toHaveBeenCalledWith(
+ 'token-edit',
+ [MONITORING_READ_SCOPE],
+ expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }),
+ );
});
expect(deleteTokenMock).not.toHaveBeenCalled();
expect(createTokenMock).not.toHaveBeenCalled();
@@ -996,9 +1017,11 @@ describe('APITokenManager', () => {
fireEvent.click(save);
await waitFor(() => {
- expect(updateTokenScopesMock).toHaveBeenCalledWith('token-edit-failure', [
- MONITORING_READ_SCOPE,
- ], expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }));
+ expect(updateTokenScopesMock).toHaveBeenCalledWith(
+ 'token-edit-failure',
+ [MONITORING_READ_SCOPE],
+ expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }),
+ );
});
expect(notificationErrorMock).toHaveBeenCalledWith('Unable to update API token scopes.');
expect(screen.getByRole('dialog', { name: 'Edit API token scopes' })).toBeInTheDocument();
@@ -1068,7 +1091,11 @@ describe('APITokenManager', () => {
fireEvent.click(within(dialog).getByRole('button', { name: 'Save' }));
await waitFor(() => {
- expect(renameTokenMock).toHaveBeenCalledWith('token-pbs', 'PBS 01 telemetry', expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }));
+ expect(renameTokenMock).toHaveBeenCalledWith(
+ 'token-pbs',
+ 'PBS 01 telemetry',
+ expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }),
+ );
expect(screen.getAllByText('PBS 01 telemetry').length).toBeGreaterThan(0);
expect(document.activeElement).toHaveTextContent('Rename');
});
@@ -1099,7 +1126,11 @@ describe('APITokenManager', () => {
fireEvent.click(screen.getByRole('button', { name: 'Generate' }));
await waitFor(() => {
- expect(createTokenMock).toHaveBeenCalledWith('Blocked token', ['monitoring:read'], expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }));
+ expect(createTokenMock).toHaveBeenCalledWith(
+ 'Blocked token',
+ ['monitoring:read'],
+ expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }),
+ );
});
expect(notificationErrorMock).toHaveBeenCalledWith(
@@ -1130,7 +1161,11 @@ describe('APITokenManager', () => {
fireEvent.click(screen.getByRole('button', { name: 'Generate' }));
await waitFor(() => {
- expect(createTokenMock).toHaveBeenCalledWith('Needs settings scope', [DOCKER_REPORT_SCOPE], expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }));
+ expect(createTokenMock).toHaveBeenCalledWith(
+ 'Needs settings scope',
+ [DOCKER_REPORT_SCOPE],
+ expect.objectContaining({ expectedOrgID: 'default', signal: expect.any(AbortSignal) }),
+ );
});
expect(notificationErrorMock).toHaveBeenCalledWith(
diff --git a/frontend-modern/src/components/Settings/__tests__/settingsPanelRegistryContext.test.ts b/frontend-modern/src/components/Settings/__tests__/settingsPanelRegistryContext.test.ts
index c9fb3188d8..46d8e2dcf6 100644
--- a/frontend-modern/src/components/Settings/__tests__/settingsPanelRegistryContext.test.ts
+++ b/frontend-modern/src/components/Settings/__tests__/settingsPanelRegistryContext.test.ts
@@ -51,6 +51,7 @@ describe('buildSettingsPanelRegistryContext', () => {
expect(context.getOrganizationSharingPanelProps().currentUser).toBe('org-owner');
expect(context.getOrganizationAccessPanelProps().currentUser).toBe('org-owner');
expect(context.getOrganizationOverviewPanelProps().currentUser).toBe('org-owner');
+ expect(context.getApiAccessPanelProps().currentUser).toBe('org-owner');
});
it('does not replace an explicitly empty principal with the configured admin', () => {
@@ -61,6 +62,7 @@ describe('buildSettingsPanelRegistryContext', () => {
} as SecurityStatus),
);
expect(context.getOrganizationSharingPanelProps().currentUser).toBe('');
+ expect(context.getApiAccessPanelProps().currentUser).toBe('');
});
it('passes the effective current user into organization panels', () => {
@@ -144,5 +146,6 @@ describe('buildSettingsPanelRegistryContext', () => {
expect(context.getOrganizationOverviewPanelProps()).toMatchObject({ currentUser: undefined });
expect(context.getOrganizationAccessPanelProps()).toMatchObject({ currentUser: undefined });
expect(context.getOrganizationSharingPanelProps()).toMatchObject({ currentUser: undefined });
+ expect(context.getApiAccessPanelProps()).toMatchObject({ currentUser: undefined });
});
});
diff --git a/frontend-modern/src/components/Settings/useAPITokenManagerState.ts b/frontend-modern/src/components/Settings/useAPITokenManagerState.ts
index 8b882f6171..b970225d5f 100644
--- a/frontend-modern/src/components/Settings/useAPITokenManagerState.ts
+++ b/frontend-modern/src/components/Settings/useAPITokenManagerState.ts
@@ -267,8 +267,7 @@ export const useAPITokenManagerState = (props: APITokenManagerProps) => {
const resetContext = () => {
if (disposed) return;
- const selectionChanged =
- selectedOrg() !== currentOrg() || selectedUser() !== props.currentUser;
+ const selectionChanged = selectedOrg() !== currentOrg() || selectedUser() !== props.currentUser;
invalidateRequests();
batch(() => {
setSelectedOrg(currentOrg());
@@ -285,9 +284,7 @@ export const useAPITokenManagerState = (props: APITokenManagerProps) => {
void loadTokens();
};
- createEffect(
- on(() => [props.canManage, props.currentUser], resetContext, { defer: true }),
- );
+ createEffect(on(() => [props.canManage, props.currentUser], resetContext, { defer: true }));
const unsubscribeOrg = eventBus.on('org_switched', resetContext);
onCleanup(() => {
disposed = true;
@@ -429,7 +426,11 @@ export const useAPITokenManagerState = (props: APITokenManagerProps) => {
const trimmedName = nameInput().trim() || undefined;
const scopeSelection = [...selectedScopes()].sort();
const scopePayload = scopeSelection.length > 0 ? scopeSelection : undefined;
- const { token, record } = await SecurityAPI.createToken(trimmedName, scopePayload, mutation.options);
+ const { token, record } = await SecurityAPI.createToken(
+ trimmedName,
+ scopePayload,
+ mutation.options,
+ );
if (!mutation.isCurrent()) return;
setTokens((previous) => [record, ...previous]);
@@ -532,7 +533,11 @@ export const useAPITokenManagerState = (props: APITokenManagerProps) => {
setUpdatingTokenId(record.id);
try {
- const updated = await SecurityAPI.updateTokenScopes(record.id, [...scopes].sort(), mutation.options);
+ const updated = await SecurityAPI.updateTokenScopes(
+ record.id,
+ [...scopes].sort(),
+ mutation.options,
+ );
if (!mutation.isCurrent()) return false;
setTokens((previous) => previous.map((token) => (token.id === updated.id ? updated : token)));
if (newTokenRecord()?.id === updated.id) {