Fix token account override being overwritten by config apiKey#253
Closed
arvindcr4 wants to merge 1 commit intosteipete:mainfrom
Closed
Fix token account override being overwritten by config apiKey#253arvindcr4 wants to merge 1 commit intosteipete:mainfrom
arvindcr4 wants to merge 1 commit intosteipete:mainfrom
Conversation
When a token account is selected, the environment override for the token was being applied first, but then ProviderConfigEnvironment.applyAPIKeyOverride() was called afterward, which would overwrite the token account's value with the config's root apiKey. This caused issues when: 1. A user has both a root apiKey and token accounts configured 2. The root apiKey is invalid or doesn't have a plan 3. The token account's token is valid The fix returns early after applying the token account override, preventing the config's apiKey from overwriting it. Fixes both ProviderRegistry.makeEnvironment (app) and TokenAccountCLIContext.environment (CLI).
Collaborator
|
Landed via temp rebase onto main.
Thanks @arvindcr4! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
When a token account is selected, the environment override for the token was being applied first, but then
ProviderConfigEnvironment.applyAPIKeyOverride()was called afterward, which would overwrite the token account's value with the config's rootapiKey.This caused issues when:
apiKeyand token accounts configuredapiKeyis invalid or doesn't have a planThe fix returns early after applying the token account override, preventing the config's
apiKeyfrom overwriting it.Changes
ProviderRegistry.makeEnvironment(app): Return early after applying token account overrideTokenAccountCLIContext.environment(CLI): Same fixTest Plan
apiKey(invalid) and token account (valid)