π OpenHands: AI-Driven Development
fix: clear member key on managed profile switch (#15356)
Saurya Velagapudi6393c240e0c1
diff --git a/enterprise/storage/saas_settings_store.py b/enterprise/storage/saas_settings_store.pyindex f91b77ace4..faa3eb5b47 100644--- a/enterprise/storage/saas_settings_store.py+++ b/enterprise/storage/saas_settings_store.py@@ -848,9 +848,26 @@ class SaasSettingsStore(SettingsStore):if not llm_api_key:logger.info(- 'saas_settings_store:ensure_api_key:skip_missing_api_key',+ 'saas_settings_store:ensure_api_key:missing_api_key',extra={'user_id': self.user_id, 'org_id': org_id},)+ key_alias = get_openhands_cloud_key_alias(self.user_id, org_id)+ await LiteLlmManager.delete_key_by_alias(key_alias=key_alias)+ generated_key = await LiteLlmManager.generate_key(+ self.user_id,+ org_id,+ key_alias,+ {'type': 'openhands'} if openhands_type else None,+ )+ item.agent_settings.llm.api_key = SecretStr(generated_key)+ logger.info(+ 'saas_settings_store:store:generated_openhands_key',+ extra={+ 'user_id': self.user_id,+ 'org_id': org_id,+ 'openhands_type': openhands_type,+ },+ )returnexisting_key_valid = await LiteLlmManager.verify_existing_key(diff --git a/enterprise/tests/unit/test_saas_settings_store.py b/enterprise/tests/unit/test_saas_settings_store.pyindex e2a6297020..53599b9dda 100644--- a/enterprise/tests/unit/test_saas_settings_store.py+++ b/enterprise/tests/unit/test_saas_settings_store.py@@ -661,6 +661,61 @@ async def test_store_updates_org_defaults_and_all_members_for_shared_keys(assert decrypt_value(member._llm_api_key) == 'shared-external-api-key'+async def test_store_clears_member_custom_key_when_switching_to_managed_profile(+ session_maker, async_session_maker, org_with_multiple_members_fixture+):+ from sqlalchemy import select, update+ from storage.org_member import OrgMember++ fixture = org_with_multiple_members_fixture+ admin_user_id = fixture['admin_user_id']+ org_id = fixture['org_id']+ decrypt_value = fixture['decrypt_value']++ async with async_session_maker() as session:+ await session.execute(+ update(OrgMember)+ .where(OrgMember.org_id == org_id, OrgMember.user_id == admin_user_id)+ .values(has_custom_llm_api_key=True)+ )+ await session.commit()++ store = SaasSettingsStore(str(admin_user_id))+ settings = _make_settings(model='openhands/claude-opus-4-5-20251101')++ with (+ patch('storage.saas_settings_store.a_session_maker', async_session_maker),+ patch(+ 'storage.saas_settings_store.LiteLlmManager.delete_key_by_alias',+ new_callable=AsyncMock,+ ) as mock_delete,+ patch(+ 'storage.saas_settings_store.LiteLlmManager.generate_key',+ new_callable=AsyncMock,+ return_value='sk-managed-key',+ ) as mock_generate,+ ):+ await store.store(settings)++ with session_maker() as session:+ member = (+ session.execute(+ select(OrgMember).where(+ OrgMember.org_id == org_id, OrgMember.user_id == admin_user_id+ )+ )+ .scalars()+ .first()+ )+ assert member is not None+ assert member.has_custom_llm_api_key is False+ assert decrypt_value(member._llm_api_key) == 'sk-managed-key'++ mock_delete.assert_awaited_once()+ mock_generate.assert_awaited_once()++@pytest.mark.asyncioasync def test_store_rejects_resolved_profile_settings_view(session_maker, async_session_maker, org_with_multiple_members_fixture