Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions apps/server/src/provider/ClaudeProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,16 @@ function formatClaudeSubscriptionAuthLabel(subscriptionType: string): string {
return `Claude ${subscriptionLabel} Subscription`;
}

function hasApiKey(apiKeySource: string | undefined): boolean {
return Boolean(apiKeySource) && apiKeySource !== "none";
}

function claudeAuthMetadata(input: {
readonly subscriptionType: string | undefined;
readonly authMethod: string | undefined;
readonly apiKeySource: string | undefined;
}): { readonly type: string; readonly label: string } | undefined {
if (normalizeClaudeAuthMethod(input.authMethod) === "apiKey") {
if (normalizeClaudeAuthMethod(input.authMethod) === "apiKey" || hasApiKey(input.apiKeySource)) {
return {
type: "apiKey",
label: "Claude API Key",
Expand Down Expand Up @@ -216,8 +221,7 @@ function claudeAuthStatus(
}
if (capabilities.tokenSource !== "none") return "authenticated";
// API keys can authenticate with tokenSource: none; also check key and account fields.
const hasApiKey = Boolean(capabilities.apiKeySource) && capabilities.apiKeySource !== "none";
return hasApiKey || capabilities.email || capabilities.subscriptionType
return hasApiKey(capabilities.apiKeySource) || capabilities.email || capabilities.subscriptionType
? "authenticated"
: "unauthenticated";
}
Expand Down Expand Up @@ -844,6 +848,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
claudeAuthMetadata({
subscriptionType: capabilities.subscriptionType,
authMethod: capabilities.tokenSource,
apiKeySource: capabilities.apiKeySource,
});
const usageCheckedAt = capabilities.usageCheckedAt ?? checkedAt;
const usageLimits = !capabilities.usage
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/provider/ProviderRegistry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4261,6 +4261,7 @@ it.layer(
);
assert.strictEqual(status.status, "ready");
assert.strictEqual(status.auth.status, "authenticated");
assert.strictEqual(status.auth.label, "Claude API Key");
}).pipe(
Effect.provide(
layerMockSpawner((args) => {
Expand Down
Loading