Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions backend/druks/user_settings/schemas.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime
from datetime import UTC, datetime
from typing import TYPE_CHECKING, Any, Literal

from pydantic import BaseModel, ConfigDict, Field
Expand Down Expand Up @@ -47,6 +47,9 @@ def from_row(
connection: "HarnessConnection | None",
account: "Account",
) -> "HarnessResponse":
connected = bool(connection) and (
not connection.expires_at or connection.expires_at > datetime.now(UTC)
)
return cls(
name=settings.name,
provider=settings.provider,
Expand All @@ -55,7 +58,7 @@ def from_row(
timeout=settings.timeout,
fast_mode=settings.fast_mode,
allowed_models=settings.allowed_models,
connected=bool(connection),
connected=connected,
kind=connection.kind if connection else None,
account=account.username if connection else None,
provider_email=connection.provider_email if connection else None,
Expand Down
18 changes: 18 additions & 0 deletions backend/tests/test_api_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,24 @@ def test_harness_card_reports_identity(tmp_path: Path, druks_db):
assert claude["providerEmail"] == "seat@corp.com"


def test_harness_card_reads_expired_token_as_not_connected(tmp_path: Path, druks_db):
from datetime import UTC, datetime, timedelta

from druks.accounts.models import Account
from druks.harnesses.models import HarnessConnection

HarnessConnection.connect(
harness="claude",
account=Account.get_or_create("op@example.com"),
payload={"claudeAiOauth": {"accessToken": "x"}},
expires_at=datetime.now(UTC) - timedelta(hours=1),
provider_email="seat@corp.com",
)
with _build_client(tmp_path) as client:
claude = {h["name"]: h for h in client.get("/api/settings/harnesses").json()}["claude"]
assert claude["connected"] is False


def test_disconnect_removes_only_the_requesting_accounts_connection(tmp_path: Path, druks_db):
from conftest import connect_harness
from druks.harnesses.claude import ClaudeHarness
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/BrowserSessionsPane.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export function BrowserSessionsPane() {
return (
<div className="set-pane mcp-pane browser-sessions-pane">
<header className="mcp-pane-head">
<h2 className="mcp-pane-title">Browser sessions</h2>
<h2 className="mcp-pane-title">Browser</h2>
<p className="mcp-pane-sub">
Sign-ins your extensions declare, kept as encrypted browser state.
</p>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/SettingsModal.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ describe('SettingsModal extension fields', () => {
stubFetch()
renderModal()

fireEvent.click(await screen.findByRole('button', { name: 'Browser sessions' }))
fireEvent.click(await screen.findByRole('button', { name: 'Browser' }))

expect(await screen.findByRole('heading', { name: 'Browser sessions' })).toBeTruthy()
expect(await screen.findByRole('heading', { name: 'Browser' })).toBeTruthy()
expect(
await screen.findByText('No installed extension declares a browser session.'),
).toBeTruthy()
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/SettingsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ export function SettingsModal({ open, onClose }: Props) {
<RailItem icon="general" label="General" active={section === 'general'} onClick={() => setSection('general')} />
<RailItem icon="harnesses" label="Harnesses" active={section === 'harnesses'} onClick={() => setSection('harnesses')} />
<RailItem icon="services" label="Services" active={section === 'services'} onClick={() => setSection('services')} />
<RailItem icon="browser-sessions" label="Browser sessions" active={section === 'browser-sessions'} onClick={() => setSection('browser-sessions')} />
<RailItem icon="browser-sessions" label="Browser" active={section === 'browser-sessions'} onClick={() => setSection('browser-sessions')} />
<RailItem icon="skills" label="Skills" active={section === 'skills'} onClick={() => setSection('skills')} />
<RailItem icon="mcp" label="MCP" active={section === 'mcp'} onClick={() => setSection('mcp')} />
<RailItem icon="agent-access" label="Tokens" active={section === 'agent-access'} onClick={() => setSection('agent-access')} />
Expand Down