diff options
| author | Jesse Luehrs <doy@tozt.net> | 2019-11-16 10:48:23 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2019-11-16 10:48:23 -0500 |
| commit | c3aed08259c794290d8cf21fe0712b36d4c5f523 (patch) | |
| tree | 3a064d859bdc258c99f554c952643eeb2f043ce4 /teleterm/src/oauth.rs | |
| parent | b8d8dbf0ff086825ce226b02603035601fbf955f (diff) | |
| download | teleterm-c3aed08259c794290d8cf21fe0712b36d4c5f523.tar.gz teleterm-c3aed08259c794290d8cf21fe0712b36d4c5f523.zip | |
shorter names
Diffstat (limited to 'teleterm/src/oauth.rs')
| -rw-r--r-- | teleterm/src/oauth.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/teleterm/src/oauth.rs b/teleterm/src/oauth.rs index 26aecbc..680b6f4 100644 --- a/teleterm/src/oauth.rs +++ b/teleterm/src/oauth.rs @@ -32,8 +32,7 @@ pub trait Oauth { fn get_access_token_from_auth_code( &self, code: &str, - ) -> Box<dyn futures::future::Future<Item = String, Error = Error> + Send> - { + ) -> Box<dyn futures::Future<Item = String, Error = Error> + Send> { let token_cache_file = self.server_token_file(false).unwrap(); let fut = self .client() @@ -53,8 +52,7 @@ pub trait Oauth { fn get_access_token_from_refresh_token( &self, token: &str, - ) -> Box<dyn futures::future::Future<Item = String, Error = Error> + Send> - { + ) -> Box<dyn futures::Future<Item = String, Error = Error> + Send> { let token_cache_file = self.server_token_file(false).unwrap(); let fut = self .client() @@ -76,13 +74,13 @@ pub trait Oauth { fn get_username_from_access_token( self: Box<Self>, token: &str, - ) -> Box<dyn futures::future::Future<Item = String, Error = Error> + Send>; + ) -> Box<dyn futures::Future<Item = String, Error = Error> + Send>; } pub fn save_client_auth_id( auth: crate::protocol::AuthType, id: &str, -) -> impl futures::future::Future<Item = (), Error = Error> { +) -> impl futures::Future<Item = (), Error = Error> { let id_file = client_id_file(auth, false).unwrap(); let id = id.to_string(); tokio::fs::File::create(id_file.clone()) @@ -119,7 +117,7 @@ fn client_id_file( fn cache_refresh_token( token_cache_file: std::path::PathBuf, token: &oauth2::basic::BasicTokenResponse, -) -> Box<dyn futures::future::Future<Item = (), Error = Error> + Send> { +) -> Box<dyn futures::Future<Item = (), Error = Error> + Send> { let token_data = format!( "{}\n{}\n", token.refresh_token().unwrap().secret(), |