wip(auth): move to tool_storage

src/tool_source/github.rs

@@ -5,11 +5,10 @@ use reqwest::{
     blocking::Client,
     header::{ACCEPT, AUTHORIZATION, USER_AGENT},
 };
-use semver::Version;
+use semver::{Version, Op};
 use serde::{Deserialize, Serialize};
 
 use crate::auth::AuthManifest;
-use crate::home::Home;
 use crate::tool_id::ToolId;
 use crate::tool_name::ToolName;
 use crate::tool_source::Asset;
@@ -24,11 +23,10 @@ pub struct GitHubSource {
 }
 
 impl GitHubSource {
-    pub fn new(home: &Home) -> Self {
-        let token = AuthManifest::load(home).ok();
+    pub fn new(auth: Option<AuthManifest>) -> Self {
         Self {
             client: Client::new(),
-            token: token.flatten().map(|t| t.github).flatten(),
+            token: auth.map(|t| t.github).flatten()
         }
     }
 

src/tool_storage.rs

@@ -11,6 +11,7 @@ use anyhow::{bail, Context};
 use fs_err::File;
 use once_cell::unsync::OnceCell;
 
+use crate::auth::AuthManifest;
 use crate::home::Home;
 use crate::manifest::Manifest;
 use crate::tool_alias::ToolAlias;
@@ -24,6 +25,7 @@ pub struct ToolStorage {
     pub storage_dir: PathBuf,
     pub bin_dir: PathBuf,
     home: Home,
+    auth: Option<AuthManifest>,
     github: OnceCell<GitHubSource>,
 }
 
@@ -35,10 +37,13 @@ impl ToolStorage {
         let bin_dir = home.path().join("bin");
         fs_err::create_dir_all(&bin_dir)?;
 
+        let auth = AuthManifest::load(home)?;
+
         Ok(Self {
             storage_dir,
             bin_dir,
             home: home.clone(),
+            auth,
             github: OnceCell::new(),
         })
     }
@@ -154,7 +159,7 @@ impl ToolStorage {
         log::info!("Installing tool: {}", spec);
 
         log::debug!("Fetching GitHub releases...");
-        let github = self.github.get_or_init(|| GitHubSource::new(&self.home));
+        let github = self.github.get_or_init(|| GitHubSource::new(self.auth));
         let mut releases = github.get_all_releases(spec.name())?;
         releases.sort_by(|a, b| a.version.cmp(&b.version).reverse());
 
@@ -232,7 +237,7 @@ impl ToolStorage {
         log::info!("Installing tool: {id}");
 
         log::debug!("Fetching GitHub release...");
-        let github = self.github.get_or_init(|| GitHubSource::new(&self.home));
+        let github = self.github.get_or_init(|| GitHubSource::new(self.auth));
         let release = github.get_release(id)?;
 
         let mut compatible_assets = self.get_compatible_assets(&release);