Enterprise agent platform for building, deploying, and operating AI teammates.
fix(composio): start an actor Composio connect without the native provider row (#3812)
蓝鱼bluefish539ea3d9f14b
diff --git a/src/xagent/web/api/auth.py b/src/xagent/web/api/auth.pyindex 36e4aa928..cd2633559 100644--- a/src/xagent/web/api/auth.py+++ b/src/xagent/web/api/auth.py@@ -4410,23 +4410,25 @@ def _generic_oauth_login(native_start = auth_backend is Noneif db is None:raise RuntimeError("db session is required")- if not db_provider:- return HTMLResponse(- content="<h1>Error: Provider not configured</h1>", status_code=500- )-- client_id = _resolve_oauth_secret(provider, db_provider.client_id, "CLIENT_ID")- # A Composio start keeps only this start's state: Composio's own app- # authorizes, so our client id is never sent (composio_auth). The one- # later reader, Google shared-grant mode below, never takes a Composio- # start (#3649).- if not client_id and native_start:- return _oauth_provider_config_error(- provider, [_oauth_env_name(provider, "CLIENT_ID")]- )- auth_url = db_provider.auth_url-- redirect_uri = _resolve_oauth_redirect_uri(provider, db_provider)+ if native_start:+ if not db_provider:+ return HTMLResponse(+ content="<h1>Error: Provider not configured</h1>", status_code=500+ )+ client_id = _resolve_oauth_secret(provider, db_provider.client_id, "CLIENT_ID")+ if not client_id:+ return _oauth_provider_config_error(+ provider, [_oauth_env_name(provider, "CLIENT_ID")]+ )+ auth_url = db_provider.auth_url+ redirect_uri = _resolve_oauth_redirect_uri(provider, db_provider)+ default_scopes = db_provider.default_scopes+ else:+ # A Composio start keeps only the state; the URL built here is discarded.+ client_id = ""+ auth_url = ""+ redirect_uri = ""+ default_scopes = Noneuser_id = trusted_user_idsession_epoch: str | None = trusted_session_epoch@@ -4611,9 +4613,7 @@ def _generic_oauth_login(app_scopes = app_info["oauth_scopes"]app_optional_scopes = app_info.get("optional_oauth_scopes") or []- scopes, scope_str = _merged_oauth_scopes(- db_provider.default_scopes, app_scopes, provider- )+ scopes, scope_str = _merged_oauth_scopes(default_scopes, app_scopes, provider)# Sent via the authorize request's own optional_scope parameter (see# get_builtin_execution_fields_and_optional_scopes) rather than merged# into `scopes` above: a scope tier-gated on the connected account'sdiff --git a/tests/web/test_composio_google_connect.py b/tests/web/test_composio_google_connect.pyindex 9b40c3ab4..62b0f8ea4 100644--- a/tests/web/test_composio_google_connect.py+++ b/tests/web/test_composio_google_connect.py@@ -45,6 +45,7 @@ from xagent.web.services.user_oauth import delete_scoped_user_oauth_accountsfrom . import test_composio_facebook_connect as facebook_connectfrom .test_composio_facebook_connect import (+ CALLBACK_URL,OWNER,Browser,FakeComposio,@@ -349,6 +350,42 @@ def test_a_google_flow_uses_the_shared_callback_not_googles(google, monkeypatch)assert _flow_cookies(browser) == []+def test_a_google_composio_start_needs_no_provider_row(google, monkeypatch):+ db, user, composio = google+ app_id = "google-drive"+ _switch_on(monkeypatch, app_id)+ _install(db, user, app_id)+ monkeypatch.delenv("GOOGLE_CLIENT_ID", raising=False)+ monkeypatch.delenv("GOOGLE_CLIENT_SECRET", raising=False)+ assert (+ db.query(OAuthProvider).filter(OAuthProvider.provider_name == "google").first()+ is None+ )+ browser = Browser()++ start = auth_api.start_builtin_oauth_for_resource_owner(+ provider="google",+ app_id=app_id,+ user=user,+ resource_owner_key=OWNER,+ redirect="https://app.example.com/settings",+ db=db,+ db_provider=None,+ )+ db.commit()+ browser.receive(start)++ assert start.status_code in (302, 307)+ assert start.headers["location"].startswith(f"{CALLBACK_URL}?state=")+ begin = browser.get(db, start.headers["location"])+ assert begin.status_code == 302, begin.body+ response = browser.get(db, _verify_url(composio))++ assert response.status_code == 200, response.body+ (grant,) = _grants(db)+ assert (grant.provider, grant.token_type) == (app_id, "composio")++# --- The review gate binds native starts only -------------------------------------diff --git a/tests/web/test_composio_salesforce_connect.py b/tests/web/test_composio_salesforce_connect.pyindex 0ef198e20..0c44c4613 100644--- a/tests/web/test_composio_salesforce_connect.py+++ b/tests/web/test_composio_salesforce_connect.py@@ -175,6 +175,23 @@ def _salesforce_provider() -> SimpleNamespace:)+def _install_salesforce(db: Session, user: User) -> None:+ app = get_builtin_public_mcp_app("salesforce")+ assert app is not None+ db.add(PublicMCPApp(**app))+ db.commit()+ server = ensure_builtin_oauth_server_definition(db, app_id="salesforce")+ db.add(+ UserMCPServer(+ user_id=int(user.id),+ mcpserver_id=int(server.id),+ is_owner=True,+ is_active=True,+ )+ )+ db.commit()++def _start_salesforce(db: Session, user: User, browser: Browser) -> Any:response = auth_api.start_builtin_oauth_for_resource_owner(provider="salesforce",@@ -242,20 +259,7 @@ def test_with_the_switch_off_a_salesforce_start_stays_native():monkeypatch.delenv("XAGENT_SALESFORCE_AUTH_BACKEND", raising=False)db, user = db_session- app = get_builtin_public_mcp_app("salesforce")- assert app is not None- db.add(PublicMCPApp(**app))- db.commit()- server = ensure_builtin_oauth_server_definition(db, app_id="salesforce")- db.add(- UserMCPServer(- user_id=int(user.id),- mcpserver_id=int(server.id),- is_owner=True,- is_active=True,- )- )- db.commit()+ _install_salesforce(db, user)response = _start_salesforce(db, user, Browser())@@ -273,6 +277,29 @@ def test_with_the_switch_off_a_salesforce_start_stays_native(assert composio.calls == []+def test_with_the_switch_off_a_start_without_the_row_is_refused(+ db_session, composio_env, composio, monkeypatch+):+ monkeypatch.delenv("XAGENT_SALESFORCE_AUTH_BACKEND", raising=False)+ monkeypatch.delenv("SALESFORCE_CLIENT_ID", raising=False)+ db, user = db_session+ _install_salesforce(db, user)++ response = auth_api.start_builtin_oauth_for_resource_owner(+ provider="salesforce",+ app_id="salesforce",+ user=user,+ resource_owner_key=OWNER,+ redirect="https://app.example.com/settings",+ db=db,+ db_provider=None,+ )++ assert response.status_code == 500+ assert "Provider not configured" in response.body.decode()+ assert composio.calls == []++def test_with_the_switch_on_a_web_salesforce_connect_stays_native(salesforce):"""Only actor (Toby) connects go through Composio: an ordinary web connect,which has no resource owner key, still uses our own connected app."""@@ -346,6 +373,83 @@ def test_a_salesforce_connect_stores_the_orgs_own_user_id(salesforce):assert _flow_cookies(browser) == []+def test_a_salesforce_start_needs_no_provider_row(salesforce, monkeypatch):+ """The actor start no longer needs the native row; the hosting product and+ the connector smoke still require it until their own changes land."""+ db, user, composio = salesforce+ monkeypatch.delenv("SALESFORCE_CLIENT_ID", raising=False)+ monkeypatch.delenv("SALESFORCE_CLIENT_SECRET", raising=False)+ assert (+ db.query(OAuthProvider)+ .filter(OAuthProvider.provider_name == "salesforce")+ .first()+ is None+ )+ browser = Browser()++ start = auth_api.start_builtin_oauth_for_resource_owner(+ provider="salesforce",+ app_id="salesforce",+ user=user,+ resource_owner_key=OWNER,+ redirect="https://app.example.com/settings",+ db=db,+ db_provider=None,+ )+ db.commit()+ browser.receive(start)++ assert start.status_code in (302, 307)+ location = urlsplit(start.headers["location"])+ assert location.geturl().startswith(f"{CALLBACK_URL}?state=")+ state = auth_api.verify_token(parse_qs(location.query)["state"][0])+ assert state[composio_auth.AUTH_BACKEND_CLAIM] == composio_auth.AUTH_BACKEND++ begin = browser.get(db, start.headers["location"])+ assert begin.status_code == 302, begin.body+ response = browser.get(db, _verify_url(composio))++ assert response.status_code == 200, response.body+ (grant,) = _grants(db)+ assert (grant.provider, grant.token_type) == ("salesforce", "composio")+ assert db.query(ActorOAuthFlowState).count() == 0+++class _RecordingProvider:+ """A provider row that records every field read; none is expected."""++ def __init__(self) -> None:+ self.reads: list[str] = []++ def __getattr__(self, name: str) -> Any:+ self.reads.append(name)+ return None+++def test_a_salesforce_composio_start_reads_no_provider_field(salesforce, monkeypatch):+ db, user, composio = salesforce+ monkeypatch.delenv("SALESFORCE_CLIENT_ID", raising=False)+ monkeypatch.delenv("SALESFORCE_CLIENT_SECRET", raising=False)+ provider = _RecordingProvider()+ browser = Browser()++ start = auth_api.start_builtin_oauth_for_resource_owner(+ provider="salesforce",+ app_id="salesforce",+ user=user,+ resource_owner_key=OWNER,+ redirect="https://app.example.com/settings",+ db=db,+ db_provider=provider,+ )+ db.commit()+ browser.receive(start)++ assert start.status_code in (302, 307)+ assert start.headers["location"].startswith(f"{CALLBACK_URL}?state=")+ assert provider.reads == []++def _native_salesforce_grant(user: User, owner: str | None, token: str) -> UserOAuth:return UserOAuth(user_id=int(user.id),