mirror of
https://github.com/Sea-Haven-Industries/open-swe.git
synced 2026-09-30 12:43:16 +00:00
58e0f84470
* fix: tag Slack threads with stored identity so they surface in web process_slack_mention gated the run on mapped_login (resolved from the stable Slack user id), but upsert_agent_thread_owner_metadata independently re-resolved the GitHub login from the Slack profile email. When that email differs from the user's mapping email (e.g. a personal vs work address), the lookup returned None, so github_login was never stamped on the thread and the thread never surfaced in the web Agents UI (which searches by github_login / triggering_user_email). Resolve the GitHub user from the store via the Slack id, pass that login through to the owner metadata, and use the mapping's stored work email (falling back to the Slack profile email for unmapped users) for both the run config and the thread tagging, so Slack-started threads reliably appear in web. * fix: stamp github_login on Slack threads so they surface in web process_slack_mention gated the run on mapped_login (resolved from the stable Slack user id) but upsert_agent_thread_owner_metadata re-resolved the login from the Slack profile email; when that email isn't the user's mapping email the lookup returns None and github_login is never stamped, so the thread is invisible in the web Agents UI (which searches by github_login / triggering_user_email). Pass the already-resolved mapped_login through to the owner metadata. The dashboard match keys on the stable GitHub login, so this is sufficient; the triggering email stays the live Slack profile value. * fix: preserve Slack email during account mapping * fix: require Slack OIDC for email mappings * chore: format Slack OIDC mapping cleanup
55 lines
1.8 KiB
Python
55 lines
1.8 KiB
Python
from __future__ import annotations
|
|
|
|
from typing import Any
|
|
|
|
import pytest
|
|
|
|
from agent.dashboard import thread_api
|
|
from agent.dashboard import user_mappings as um
|
|
|
|
|
|
class _FakeStore:
|
|
def __init__(self) -> None:
|
|
self.items: dict[tuple[tuple[str, ...], str], dict[str, Any]] = {}
|
|
|
|
async def get_item(self, namespace: list[str], key: str):
|
|
value = self.items.get((tuple(namespace), key))
|
|
return {"value": value} if value is not None else None
|
|
|
|
async def put_item(self, namespace: list[str], key: str, value: dict[str, Any]) -> None:
|
|
self.items[(tuple(namespace), key)] = value
|
|
|
|
async def search_items(self, namespace: list[str], *, limit: int = 1000):
|
|
ns = tuple(namespace)
|
|
items = [{"value": v} for (n, _k), v in self.items.items() if n == ns]
|
|
return {"items": items[:limit]}
|
|
|
|
|
|
class _FakeClient:
|
|
def __init__(self, store: _FakeStore) -> None:
|
|
self.store = store
|
|
|
|
|
|
@pytest.fixture()
|
|
def fake_store(monkeypatch: pytest.MonkeyPatch) -> _FakeStore:
|
|
store = _FakeStore()
|
|
monkeypatch.setattr(um, "_client", lambda: _FakeClient(store))
|
|
um.clear_cache()
|
|
return store
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_run_email_prefers_github_mapping(fake_store: _FakeStore) -> None:
|
|
await um.upsert_mapping(
|
|
github_login="johannes117",
|
|
work_email="johannes@langchain.dev",
|
|
)
|
|
# OAuth profile carries a personal account that isn't an org member.
|
|
profile = {"email": "johannesduplessis117@gmail.com"}
|
|
assert await thread_api._resolve_run_email("johannes117", profile) == "johannes@langchain.dev"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_run_email_falls_back_to_profile_when_unmapped(fake_store: _FakeStore) -> None:
|
|
profile = {"email": "someone@example.com"}
|
|
assert await thread_api._resolve_run_email("nomapping", profile) == "someone@example.com"
|