diff options
| author | Jesse Luehrs <doy@tozt.net> | 2019-11-27 13:03:23 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2019-11-27 15:17:17 -0500 |
| commit | 0a31f6bcd806eeaf1fcfddbcfbd466db969ed006 (patch) | |
| tree | 6fb9e520afa91fe00615b79a3456a60603de885e /teleterm/src/server.rs | |
| parent | 23911b9ad5d942456fc2b4a517c5cf6c67e0a611 (diff) | |
| download | teleterm-0a31f6bcd806eeaf1fcfddbcfbd466db969ed006.tar.gz teleterm-0a31f6bcd806eeaf1fcfddbcfbd466db969ed006.zip | |
make the oauth methods return both tokens
Diffstat (limited to 'teleterm/src/server.rs')
| -rw-r--r-- | teleterm/src/server.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/teleterm/src/server.rs b/teleterm/src/server.rs index 866edac..2215319 100644 --- a/teleterm/src/server.rs +++ b/teleterm/src/server.rs @@ -426,10 +426,10 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static> // XXX unwrap here isn't super safe let refresh_token = refresh_token.unwrap(); client - .get_access_token_from_refresh_token( + .get_tokens_from_refresh_token( refresh_token.trim(), ) - .and_then(|access_token| { + .and_then(|(access_token, _)| { client.get_username_from_access_token( &access_token, ) @@ -618,8 +618,10 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static> let term_info = conn.state.term_info().unwrap().clone(); let fut = client - .get_access_token_from_auth_code(code) - .and_then(|token| client.get_username_from_access_token(&token)) + .get_tokens_from_auth_code(code) + .and_then(|(access_token, _)| { + client.get_username_from_access_token(&access_token) + }) .map(|username| { ( ConnectionState::LoggedIn { |