π OpenHands: AI-Driven Development
(Hotfix): Handle cases where user secrets store doesn't exist (#8745)
Rohit Malhotra0023eb098293
diff --git a/openhands/server/routes/secrets.py b/openhands/server/routes/secrets.pyindex 9535e4a6c4..41cb7183d3 100644--- a/openhands/server/routes/secrets.py+++ b/openhands/server/routes/secrets.py@@ -188,10 +188,7 @@ async def load_custom_secrets_names() -> GETCustomSecrets | JSONResponse:try:if not user_secrets:- return JSONResponse(- status_code=status.HTTP_404_NOT_FOUND,- content={'error': 'User secrets not found'},- )+ return GETCustomSecrets(custom_secrets=[])custom_secrets: list[CustomSecretWithoutValueModel] = []if user_secrets.custom_secrets:@@ -220,31 +217,30 @@ async def create_custom_secret() -> JSONResponse:try:existing_secrets = await secrets_store.load()- if existing_secrets:- custom_secrets = dict(existing_secrets.custom_secrets)-- secret_name = incoming_secret.name- secret_value = incoming_secret.value- secret_description = incoming_secret.description+ custom_secrets = dict(existing_secrets.custom_secrets) if existing_secrets else {}- if secret_name in custom_secrets:- return JSONResponse(- status_code=status.HTTP_400_BAD_REQUEST,- content={'message': f'Secret {secret_name} already exists'},- )+ secret_name = incoming_secret.name+ secret_value = incoming_secret.value+ secret_description = incoming_secret.description- custom_secrets[secret_name] = CustomSecret(- secret=secret_value,- description=secret_description or '',+ if secret_name in custom_secrets:+ return JSONResponse(+ status_code=status.HTTP_400_BAD_REQUEST,+ content={'message': f'Secret {secret_name} already exists'},)- # Create a new UserSecrets that preserves provider tokens- updated_user_secrets = UserSecrets(- custom_secrets=custom_secrets,- provider_tokens=existing_secrets.provider_tokens,- )+ custom_secrets[secret_name] = CustomSecret(+ secret=secret_value,+ description=secret_description or '',+ )++ # Create a new UserSecrets that preserves provider tokens+ updated_user_secrets = UserSecrets(+ custom_secrets=custom_secrets,+ provider_tokens=existing_secrets.provider_tokens if existing_secrets else {},+ )- await secrets_store.store(updated_user_secrets)+ await secrets_store.store(updated_user_secrets)return JSONResponse(status_code=status.HTTP_201_CREATED,diff --git a/tests/unit/test_secrets_api.py b/tests/unit/test_secrets_api.pyindex dc210610d7..44443d9cfa 100644--- a/tests/unit/test_secrets_api.py+++ b/tests/unit/test_secrets_api.py@@ -138,6 +138,39 @@ async def test_add_custom_secret(test_client, file_secrets_store):)+async def test_create_custom_secret_with_no_existing_secrets(+ test_client, file_secrets_store+):+ """Test creating a custom secret when there are no existing secrets at all."""++ # Don't store any initial settings - this simulates a completely new user+ # or a situation where the secrets store is empty++ # Make the POST request to add a custom secret+ add_secret_data = {+ 'name': 'NEW_API_KEY',+ 'value': 'new-api-key-value',+ 'description': 'Test API Key',+ }+ response = test_client.post('/api/secrets', json=add_secret_data)+ assert response.status_code == 201++ # Verify that the settings were stored with the new secret+ stored_settings = await file_secrets_store.load()++ # Check that the secret was added+ assert 'NEW_API_KEY' in stored_settings.custom_secrets+ assert (+ stored_settings.custom_secrets['NEW_API_KEY'].secret.get_secret_value()+ == 'new-api-key-value'+ )+ assert stored_settings.custom_secrets['NEW_API_KEY'].description == 'Test API Key'++ # Check that provider_tokens is an empty dict, not None+ assert stored_settings.provider_tokens == {}++@pytest.mark.asyncioasync def test_update_existing_custom_secret(test_client, file_secrets_store):"""Test updating an existing custom secret's name and description (cannot change value once set)."""