Skip to content

Fix token account override being overwritten by config apiKey #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arvindcr4 wants to merge 1 commit into from
+4 −0
Closed

Fix token account override being overwritten by config apiKey #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Sources/CodexBar/ProviderRegistry.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,15 @@ struct ProviderRegistry {
settings: settings,
override: tokenOverride)
var env = base
// If token account is selected, use its token instead of config's apiKey
if let account, let override = TokenAccountSupportCatalog.envOverride(
for: provider,
token: account.token)
{
for (key, value) in override {
env[key] = value
}
return env
}
return ProviderConfigEnvironment.applyAPIKeyOverride(
base: env,
Expand Down
2 changes: 2 additions & 0 deletions Sources/CodexBarCLI/TokenAccountCLI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,14 @@ struct TokenAccountCLIContext {
account: ProviderTokenAccount?) -> [String: String]
{
var env = base
// If token account is selected, use its token instead of config's apiKey
if let account,
let override = TokenAccountSupportCatalog.envOverride(for: provider, token: account.token)
{
for (key, value) in override {
env[key] = value
}
return env
}
let providerConfig = self.providerConfig(for: provider)
env = ProviderConfigEnvironment.applyAPIKeyOverride(
Expand Down