Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Rust CLI (`amendable`) for the Amendable API.
## Product facts (do not invent others)

- Site + Git HTTPS: `https://amendable.io`
- API: `https://api.amendable.io` header `access-token`
- API: `https://api.amendable.io` header `Authorization: Bearer`
- Clone: `https://amendable.io/r/<username>/<repo>.git`
- Git password is the access token. There is no SSH.
- Command name is `amendable`. Package name is `amendable-cli`.
Expand Down
4 changes: 2 additions & 2 deletions src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ impl Client {
if auth {
let token = self.token.as_deref().ok_or(Error::NotLoggedIn)?;
headers.insert(
"access-token",
reqwest::header::HeaderValue::from_str(token)
reqwest::header::AUTHORIZATION,
reqwest::header::HeaderValue::from_str(&format!("Bearer {token}"))
.map_err(|err| Error::message(err.to_string()))?,
);
}
Expand Down
16 changes: 15 additions & 1 deletion tests/common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ fn handle(state: &Arc<Mutex<MockState>>, mut request: Request) {
let url = request.url().to_string();
let (path, query) = split_url(&url);
let method = request.method().clone();
let token = header_value(&request, "access-token");
let token = bearer_token(&request);
let body = read_json(&mut request);

let response = match method {
Expand Down Expand Up @@ -363,6 +363,20 @@ fn header_value(request: &Request, name: &str) -> Option<String> {
})
}

fn bearer_token(request: &Request) -> Option<String> {
let value = header_value(request, "authorization")?;
let (scheme, credentials) = value.split_once(' ')?;
if !scheme.eq_ignore_ascii_case("bearer") {
return None;
}
let token = credentials.trim();
if token.is_empty() {
None
} else {
Some(token.to_string())
}
}

fn read_json(request: &mut Request) -> Value {
let mut buf = String::new();
let _ = std::io::Read::read_to_string(request.as_reader(), &mut buf);
Expand Down
Loading