Skip to content

πŸ™Œ OpenHands: AI-Driven Development

feat: derive provider_tokens_set from local git provider cache (#123)

Hiep Le3de362249fc0
diff --git a/__tests__/api/settings-service.test.ts b/__tests__/api/settings-service.test.ts
index e17a891ec2..2370609b0b 100644
--- a/__tests__/api/settings-service.test.ts
+++ b/__tests__/api/settings-service.test.ts
@@ -103,4 +103,29 @@ describe("SettingsService", () => {
fetchSpy.mockRestore();
});
+
+ it("derives provider_tokens_set from locally stored git provider tokens", async () => {
+ // Arrange: simulate post-save state. SecretsService.addGitProvider writes to
+ // this localStorage key after the server PUT /api/settings/secrets succeeds.
+ // The agent-server API never returns provider_tokens_set, so the GUI must
+ // derive it from local state for useUserProviders / git-settings to recognize
+ // the configured providers.
+ window.localStorage.setItem(
+ "openhands-agent-server-git-provider-tokens",
+ JSON.stringify({
+ github: { token: "ghp_test_123", host: "github.com" },
+ gitlab: { token: "glpat_test_456", host: null },
+ }),
+ );
+
+ // Act
+ const settings = await SettingsService.getSettings();
+
+ // Assert: each stored provider surfaces in provider_tokens_set with its host
+ // (or null), which is what consumers like useUserProviders read.
+ expect(settings.provider_tokens_set).toEqual({
+ github: "github.com",
+ gitlab: null,
+ });
+ });
});
diff --git a/src/api/settings-service/settings-service.api.ts b/src/api/settings-service/settings-service.api.ts
index 94ad4a41a7..eeb344457b 100644
--- a/src/api/settings-service/settings-service.api.ts
+++ b/src/api/settings-service/settings-service.api.ts
@@ -1,5 +1,6 @@
import { DEFAULT_SETTINGS } from "#/services/settings";
-import { Settings, SettingsSchema, SettingsValue } from "#/types/settings";
+import { Provider, Settings, SettingsSchema, SettingsValue } from "#/types/settings";
+import { getStoredGitProviders } from "../secrets-service";
import { createHttpClient, createSettingsClient } from "../typescript-client";
/**
@@ -115,12 +116,24 @@ const syncDerivedSettings = (settings: Partial<Settings>): Settings => {
settings.conversation_settings ?? {},
);
+ // The agent-server has no concept of provider_tokens_set; the GUI derives it
+ // from locally-stored git provider credentials so the UI knows which
+ // providers are configured after a save.
+ const storedProviders = getStoredGitProviders();
+ const derivedProviderTokensSet = Object.fromEntries(
+ Object.entries(storedProviders).map(([provider, value]) => [
+ provider,
+ value?.host ?? null,
+ ]),
+ ) as Partial<Record<Provider, string | null>>;
+
const merged = {
...deepClone(DEFAULT_SETTINGS),
...settings,
provider_tokens_set: {
...(DEFAULT_SETTINGS.provider_tokens_set ?? {}),
...(settings.provider_tokens_set ?? {}),
+ ...derivedProviderTokensSet,
},
agent_settings: agentSettings,
conversation_settings: conversationSettings,