Add refresh ability to user tokens, and expose tokens for storage #22
Conversation
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
Dinnerbone
force-pushed
the
db
branch
2 times, most recently
from
852eb46 to
b1547f3
Compare
|
I can't seem to get the output of my |
|
wierd, could be a |
Emilgardis
requested changes
Dec 12, 2020
| use oauth2::{AccessToken, ClientId, RefreshToken}; | ||
| use oauth2::{HttpRequest, HttpResponse}; | ||
| use std::future::Future; | ||
|
|
||
| /// An User Token from the [OAuth implicit code flow](https://dev.twitch.tv/docs/authentication/getting-tokens-oauth#oauth-implicit-code-flow) or [OAuth authorization code flow](https://dev.twitch.tv/docs/authentication/getting-tokens-oauth#oauth-authorization-code-flow) | ||
| #[derive(Debug, Clone)] | ||
| pub struct UserToken { | ||
| access_token: AccessToken, | ||
| /// The access token used to authenticate requests with | ||
| pub access_token: AccessToken, |
There was a problem hiding this comment.
This is already exposed with TwitchToken::token() which returns &AccessToken, however I can see the value in having this pub.
src/tokens/user_token.rs
Outdated
Comment on lines
78
to
99
| async fn refresh_token<RE, C, F>( | ||
| &mut self, | ||
| http_client: C, | ||
| ) -> Result<(), RefreshTokenError<RE>> | ||
| where | ||
| RE: std::error::Error + Send + Sync + 'static, | ||
| C: FnOnce(HttpRequest) -> F, | ||
| F: Future<Output = Result<HttpResponse, RE>>, { | ||
| Err(RefreshTokenError::NoRefreshToken) | ||
| F: Future<Output = Result<HttpResponse, RE>>, | ||
| { | ||
| if let Some(client_secret) = self.client_secret.clone() { | ||
| let (access_token, expires, refresh_token) = if let Some(token) = | ||
| self.refresh_token.take() | ||
| { | ||
| crate::refresh_token(http_client, token, &self.client_id, &client_secret).await? | ||
| } else { | ||
| return Err(RefreshTokenError::NoRefreshToken); | ||
| }; | ||
| self.access_token = access_token; | ||
| self.expires = expires; | ||
| self.refresh_token = refresh_token; | ||
| } | ||
| Ok(()) |
There was a problem hiding this comment.
If no secret is available this should probably return a new error RefreshTokenError::NoClientSecret
|
looks like a fix in rustfmt rust-lang/rustfmt#4557 |
Also run cargo fmt with fix for newlines on multilined functions
|
thanks! bors r+ |
|
Build failed:
|
|
bors r+ fixed errors in #23 |
bors bot
referenced
this pull request
in twitch-rs/twitch_api
Dec 12, 2020
48: Update to user token constructor change r=Emilgardis a=Dinnerbone Counterpart to https://github.com/Emilgardis/twitch_oauth2/pull/22 Co-authored-by: Nathan Adams <[email protected]> Co-authored-by: Emil Gardström <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 changes the API by adding an extra (optional) client secret field.
I also make some fields pub so that an application can retrieve them post-refresh and store them for the next run.