This repository has been archived by the owner on Aug 3, 2023. It is now read-only.
Add API token support #471
Merged
Conversation
This file contains 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
|
This PR is blocked until we have support for tokens in the workers UI and workers.dev. |
xtuc
reviewed
Aug 28, 2019
xtuc
reviewed
Aug 28, 2019
gabbifish
added
regression
src/commands/config/mod.rs
Outdated
Comment on lines
36
to
50
| } else { | ||
| message::warn("We don't recommend using your Global API Key! Please consider using an API Token instead. https://support.cloudflare.com/hc/en-us/articles/200167836-Managing-API-Tokens-and-Keys"); | ||
| println!("Enter email: "); | ||
| let mut email_str: String = read!("{}\n"); | ||
| email_str.truncate(email_str.trim_end().len()); | ||
| if !email_str.is_empty() { | ||
| user.email = Some(email_str); | ||
| } | ||
|
|
||
| println!("Enter global API key: "); | ||
| let mut api_key_str: String = read!("{}\n"); | ||
| api_key_str.truncate(api_key_str.trim_end().len()); | ||
| if !api_key_str.is_empty() { | ||
| user.api_key = Some(api_key_str); | ||
| } |
There was a problem hiding this comment.
shouldn't this else be moved to the level of if !api_key {} else {, not if the API token string is empty? If the API token string is empty, I'd expect an error to be thrown (might as well check for length as well), but I wouldn't expect it to just continue to entering email and key
There was a problem hiding this comment.
ah, so our baseline was that an empty string would not be serialized and would trigger the default API authentication failure message. This is preserving the preexisting behavior, but we can revisit this and think about adding additional error messages. We can do this after the RC is cut.
…rangler into gabbi/add-api-token-support
ashleymichal
suggested changes
Nov 1, 2019
Co-Authored-By: Ashley Michal <[email protected]>
Co-Authored-By: Ashley Michal <[email protected]>
ashleymichal
approved these changes
Nov 1, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This closes #354.
API tokens can now be added to
wrangler configwith the following workflow:Currently, a user is expected to enter an email/API key pair or API token.