@@ -3,38 +3,35 @@ use std::fmt::{Display, Formatter};
33/// Trait that refreshes a token when it is expired
44#[ async_trait:: async_trait]
55pub trait TokenCache : Sync {
6- type TokenData : Sync + Send + Clone + Display ;
7- /// Getter for the token
8- async fn get_token ( & self ) -> Option < Self :: TokenData > ;
6+ /// Returns the token that is currently held within the instance of `TokenCache`, together with
7+ /// the expiry of that token as a u64 in seconds sine the Unix Epoch (1 Jan 1970).
8+ async fn token_and_exp ( & self ) -> Option < ( String , u64 ) > ;
99
10- /// Updates the token
11- async fn set_token ( & self , token : Self :: TokenData ) -> crate :: Result < ( ) > ;
10+ /// Updates the token to the value `token`.
11+ async fn set_token ( & self , token : String , exp : u64 ) -> crate :: Result < ( ) > ;
1212
13- /// Getter for the scope
14- fn get_scope ( & self ) -> & str ;
13+ /// Returns the intended scope for the current token.
14+ async fn scope ( & self ) -> String ;
1515
16- /// Returns whether the token is expired
17- fn is_expired ( token : & Self :: TokenData ) -> bool ;
18-
19- /// Returns a valid, unexpired token
20- /// Otherwise updates and returns the token
21- async fn get ( & self , client : & reqwest:: Client ) -> crate :: Result < Self :: TokenData > {
22- match self . get_token ( ) . await {
23- Some ( token) if !Self :: is_expired ( & token) => Ok ( token) ,
16+ /// Returns a valid, unexpired token. If the contained token is expired, it updates and returns
17+ /// the token.
18+ async fn get ( & self , client : & reqwest:: Client ) -> crate :: Result < String > {
19+ match self . token_and_exp ( ) . await {
20+ Some ( ( token, exp) ) if now ( ) > exp => Ok ( token) ,
2421 _ => {
25- let scope = self . get_scope ( ) ;
26- let token = Self :: fetch_token ( client, scope) . await ?;
27- self . set_token ( token) . await ?;
22+ let ( token, exp) = self . fetch_token ( client) . await ?;
23+ self . set_token ( token, exp) . await ?;
2824
29- self . get_token ( )
25+ self . token_and_exp ( )
3026 . await
27+ . map ( |( t, _) | t)
3128 . ok_or ( crate :: Error :: Other ( "Token is not set" . to_string ( ) ) )
3229 }
3330 }
3431 }
3532
3633 /// Fetches and returns the token using the service account
37- async fn fetch_token ( client : & reqwest:: Client , scope : & str ) -> crate :: Result < Self :: TokenData > ;
34+ async fn fetch_token ( & self , client : & reqwest:: Client ) -> crate :: Result < ( String , u64 ) > ;
3835}
3936
4037#[ derive( serde:: Serialize ) ]
@@ -47,10 +44,11 @@ struct Claims {
4744}
4845
4946#[ derive( serde:: Deserialize , Debug ) ]
47+ // #[allow(dead_code)]
5048struct TokenResponse {
5149 access_token : String ,
52- expires_in : usize ,
53- token_type : String ,
50+ expires_in : u64 ,
51+ // token_type: String,
5452}
5553
5654/// This struct contains a token, an expiry, and an access scope.
@@ -63,7 +61,7 @@ pub struct Token {
6361}
6462
6563#[ derive( Debug , Clone ) ]
66- pub struct DefaultTokenData ( pub String , u64 ) ;
64+ pub struct DefaultTokenData ( String , u64 ) ;
6765
6866impl Display for DefaultTokenData {
6967 fn fmt ( & self , f : & mut Formatter < ' _ > ) -> std:: fmt:: Result {
@@ -78,40 +76,36 @@ impl Default for Token {
7876}
7977
8078impl Token {
81- pub fn new ( scope : & str ) -> Self {
79+ pub ( crate ) fn new ( scope : & str ) -> Self {
8280 Self {
8381 token : tokio:: sync:: RwLock :: new ( None ) ,
8482 access_scope : scope. to_string ( ) ,
8583 }
8684 }
8785}
86+
8887#[ async_trait:: async_trait]
8988impl TokenCache for Token {
90- type TokenData = DefaultTokenData ;
91-
92- fn get_scope ( & self ) -> & str {
93- self . access_scope . as_ref ( )
89+ async fn scope ( & self ) -> String {
90+ self . access_scope . clone ( )
9491 }
9592
96- fn is_expired ( token : & Self :: TokenData ) -> bool {
97- token. 1 > now ( )
93+ async fn token_and_exp ( & self ) -> Option < ( String , u64 ) > {
94+ self . token . read ( ) . await . as_ref ( ) . map ( |d| ( d . 0 . clone ( ) , d . 1 ) )
9895 }
9996
100- async fn get_token ( & self ) -> Option < Self :: TokenData > {
101- self . token . read ( ) . await . clone ( )
102- }
103- async fn set_token ( & self , token : Self :: TokenData ) -> crate :: Result < ( ) > {
104- * self . token . write ( ) . await = Some ( token) ;
97+ async fn set_token ( & self , token : String , exp : u64 ) -> crate :: Result < ( ) > {
98+ * self . token . write ( ) . await = Some ( DefaultTokenData ( token, exp) ) ;
10599 Ok ( ( ) )
106100 }
107101
108- async fn fetch_token ( client : & reqwest:: Client , scope : & str ) -> crate :: Result < Self :: TokenData > {
102+ async fn fetch_token ( & self , client : & reqwest:: Client ) -> crate :: Result < ( String , u64 ) > {
109103 let now = now ( ) ;
110104 let exp = now + 3600 ;
111105
112106 let claims = Claims {
113107 iss : crate :: SERVICE_ACCOUNT . client_email . clone ( ) ,
114- scope : scope. into ( ) ,
108+ scope : self . scope ( ) . await . into ( ) ,
115109 aud : "https://www.googleapis.com/oauth2/v4/token" . to_string ( ) ,
116110 exp,
117111 iat : now,
@@ -134,7 +128,7 @@ impl TokenCache for Token {
134128 . await ?
135129 . json ( )
136130 . await ?;
137- Ok ( DefaultTokenData ( response. access_token , exp ) )
131+ Ok ( ( response. access_token , now + response . expires_in ) )
138132 }
139133}
140134
0 commit comments