fix(flows): save Token properly

The installed flow didn't explicitly set the retrieved token absolute, which would cause failures down the road.
dermesser · May 20, 2016 · 57a3151 · 57a3151
1 parent a9d0b06
commit 57a3151
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/common.rs b/src/common.rs
@@ -117,7 +117,7 @@ impl Token {
 
     /// Returns a DateTime object representing our expiry date.
     pub fn expiry_date(&self) -> DateTime<UTC> {
-        UTC.timestamp(self.expires_in_timestamp.unwrap(), 0)
+        UTC.timestamp(self.expires_in_timestamp.expect("Tokens without an absolute expiry are invalid"), 0)
     }
 
     /// Adjust our stored expiry format to be absolute, using the current time.

diff --git a/src/installed.rs b/src/installed.rs
@@ -139,14 +139,15 @@ impl<C> InstalledFlow<C> where C: BorrowMut<hyper::Client>
 
         // Successful response
         if tokens.access_token.is_some() {
-            let token = Token {
+            let mut token = Token {
                 access_token: tokens.access_token.unwrap(),
                 refresh_token: tokens.refresh_token.unwrap(),
                 token_type: tokens.token_type.unwrap(),
                 expires_in: tokens.expires_in,
                 expires_in_timestamp: None,
             };
-
+
+            token.set_expiry_absolute();
             Result::Ok(token)
         } else {
             let err = io::Error::new(io::ErrorKind::Other,