add auth, fix url

Author: lcian

Cargo.lock

@@ -80,6 +80,7 @@ secrecy = "0.8.0"
 lru = "0.16.0"
 backon = { version = "1.5.2", features = ["std", "std-blocking-sleep"] }
 tokio = { version = "1.47", features = ["rt"] }
+http = "1.4.0"
 
 [dev-dependencies]
 assert_cmd = "2.0.11"

Cargo.toml

@@ -4,16 +4,19 @@ use std::path::Path;
 use anyhow::{Context as _, Result};
 use clap::{Arg, ArgMatches, Command};
 use console::style;
+use http::header::AUTHORIZATION;
 use log::{debug, info};
-use objectstore_client::{Client, Usecase};
+use objectstore_client::{Client, ClientBuilder, Usecase};
+use secrecy::ExposeSecret as _;
 use sha2::{Digest as _, Sha256};
 use walkdir::WalkDir;
 
 use crate::api::Api;
-use crate::config::Config;
+use crate::config::{Auth, Config};
 use crate::utils::api::get_org_project_id;
 use crate::utils::args::ArgExt as _;
 use crate::utils::objectstore::get_objectstore_url;
+use http::{self, HeaderValue};
 
 const EXPERIMENTAL_WARNING: &str =
     "[EXPERIMENTAL] The \"build snapshots\" command is experimental. \
@@ -135,8 +138,26 @@ fn upload_files(
     project: &str,
     snapshot_id: &str,
 ) -> Result<()> {
+    let config = Config::current();
+    let auth = config
+        .get_auth()
+        .ok_or_else(|| anyhow::anyhow!("Authentication required"))?;
+    let token = match auth {
+        Auth::Token(token) => token.raw().expose_secret(),
+    };
+
     let url = get_objectstore_url(Api::current(), org)?;
-    let client = Client::new(url)?;
+    let client = ClientBuilder::new(url.clone())
+        .configure_reqwest(move |r| {
+            let mut headers = http::HeaderMap::new();
+            headers.insert(
+                AUTHORIZATION,
+                HeaderValue::from_str(&format!("Bearer {token}"))
+                    .expect("always a valid header value"),
+            );
+            r.default_headers(headers)
+        })
+        .build()?;
 
     let (org, project) = get_org_project_id(Api::current(), org, project)?;
     let session = Usecase::new("preprod")

src/commands/build/snapshots.rs

@@ -7,5 +7,5 @@ use crate::api::Api;
 pub fn get_objectstore_url(api: impl AsRef<Api>, org: &str) -> Result<String> {
     let api = api.as_ref().authenticated()?;
     let base = api.fetch_organization_details(org)?.links.region_url;
-    Ok(format!("{base}/api/0/objectstore"))
+    Ok(format!("{base}/api/0/organizations/{org}/objectstore"))
 }