the server stored tokens should also be data, not cache

3 files changed, 6 insertions, 15 deletions

diff --git a/src/dirs.rs b/src/dirs.rs
index 12a2f15..ac08f19 100644
--- a/src/dirs.rs
+++ b/src/dirs.rs
@@ -15,21 +15,11 @@ impl Dirs {
     }
 
     pub fn create_all(&self) -> Result<()> {
-        std::fs::create_dir_all(self.cache_dir())
-            .context(crate::error::CreateDir)?;
         std::fs::create_dir_all(self.data_dir())
             .context(crate::error::CreateDir)?;
         Ok(())
     }
 
-    fn cache_dir(&self) -> &std::path::Path {
-        self.project_dirs.cache_dir()
-    }
-
-    pub fn cache_file(&self, name: &str) -> std::path::PathBuf {
-        self.cache_dir().join(name)
-    }
-
     fn data_dir(&self) -> &std::path::Path {
         self.project_dirs.data_dir()
     }
diff --git a/src/oauth.rs b/src/oauth.rs
index 3504af8..bf9c4bc 100644
--- a/src/oauth.rs
+++ b/src/oauth.rs
@@ -9,9 +9,10 @@ pub trait Oauth {
     fn client(&self) -> &oauth2::basic::BasicClient;
     fn user_id(&self) -> &str;
     fn name(&self) -> &str;
-    fn token_cache_file(&self) -> std::path::PathBuf {
+
+    fn server_token_file(&self) -> std::path::PathBuf {
         let name = format!("server-oauth-{}-{}", self.name(), self.user_id());
-        crate::dirs::Dirs::new().cache_file(&name)
+        crate::dirs::Dirs::new().data_file(&name)
     }
 
     fn generate_authorize_url(&self) -> String {
@@ -27,7 +28,7 @@ pub trait Oauth {
         code: &str,
     ) -> Box<dyn futures::future::Future<Item = String, Error = Error> + Send>
     {
-        let token_cache_file = self.token_cache_file();
+        let token_cache_file = self.server_token_file();
         let fut = self
             .client()
             .exchange_code(oauth2::AuthorizationCode::new(code.to_string()))
@@ -48,7 +49,7 @@ pub trait Oauth {
         token: &str,
     ) -> Box<dyn futures::future::Future<Item = String, Error = Error> + Send>
     {
-        let token_cache_file = self.token_cache_file();
+        let token_cache_file = self.server_token_file();
         let fut = self
             .client()
             .exchange_refresh_token(&oauth2::RefreshToken::new(
diff --git a/src/server.rs b/src/server.rs
index be37b82..76dcfe9 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -434,7 +434,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
                     let client = conn.oauth_client.take().unwrap();
                     let mut new_state = conn.state.clone();
                     let fut =
-                        tokio::fs::File::open(client.token_cache_file())
+                        tokio::fs::File::open(client.server_token_file())
                             .context(crate::error::OpenFile)
                             .and_then(|file| {
                                 tokio::io::lines(std::io::BufReader::new(