From 0a31f6bcd806eeaf1fcfddbcfbd466db969ed006 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Wed, 27 Nov 2019 13:03:23 -0500
Subject: make the oauth methods return both tokens

---
 teleterm/src/oauth.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'teleterm/src/oauth.rs')

diff --git a/teleterm/src/oauth.rs b/teleterm/src/oauth.rs
index 0c6627c..1229855 100644
--- a/teleterm/src/oauth.rs
+++ b/teleterm/src/oauth.rs
@@ -29,10 +29,11 @@ pub trait Oauth {
         auth_url.to_string()
     }
 
-    fn get_access_token_from_auth_code(
+    fn get_tokens_from_auth_code(
         &self,
         code: &str,
-    ) -> Box<dyn futures::Future<Item = String, Error = Error> + Send> {
+    ) -> Box<dyn futures::Future<Item = (String, String), Error = Error> + Send>
+    {
         let token_cache_file = self.server_token_file(false).unwrap();
         let fut = self
             .client()
@@ -51,15 +52,16 @@ pub trait Oauth {
                     &access_token,
                     &refresh_token,
                 )
-                .map(move |_| access_token)
+                .map(move |_| (access_token, refresh_token))
             });
         Box::new(fut)
     }
 
-    fn get_access_token_from_refresh_token(
+    fn get_tokens_from_refresh_token(
         &self,
         token: &str,
-    ) -> Box<dyn futures::Future<Item = String, Error = Error> + Send> {
+    ) -> Box<dyn futures::Future<Item = (String, String), Error = Error> + Send>
+    {
         let token_cache_file = self.server_token_file(false).unwrap();
         let fut = self
             .client()
@@ -80,7 +82,7 @@ pub trait Oauth {
                     &access_token,
                     &refresh_token,
                 )
-                .map(move |_| access_token)
+                .map(move |_| (access_token, refresh_token))
             });
         Box::new(fut)
     }
-- 
cgit v1.2.3-54-g00ecf