Skip to content

fix: Make URL in org auth tokens optional #1766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
loewenheim merged 1 commit into from
Oct 2, 2023
+19 −14
Merged

fix: Make URL in org auth tokens optional #1766

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 19 additions & 14 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct TokenData {
/// An org slug.
org: String,
/// A base Sentry URL.
url: String,
url: Option<String>,
}

impl TokenData {
Expand Down Expand Up @@ -106,13 +106,13 @@ impl Config {

let mut url = get_default_url(&ini);

if let Some(ref token_embedded_data) = token_embedded_data {
if let Some(token_url) = token_embedded_data.as_ref().and_then(|td| td.url.as_ref()) {
if url == DEFAULT_URL || url.is_empty() {
url = token_embedded_data.url.clone();
} else if url != token_embedded_data.url {
url = token_url.clone();
} else if url != *token_url {
bail!(
"Two different url values supplied: `{}` (from token), `{url}`.",
token_embedded_data.url,
token_url,
);
}
}
Expand Down Expand Up @@ -216,8 +216,12 @@ impl Config {
self.cached_token_data = TokenData::decode(val)
.context(format!("Failed to parse org auth token {val}"))?;

if let Some(ref data) = self.cached_token_data {
self.cached_base_url = data.url.clone();
if let Some(token_url) = self
.cached_token_data
.as_ref()
.and_then(|td| td.url.as_ref())
{
self.cached_base_url = token_url.clone();
}

self.ini
Expand Down Expand Up @@ -247,12 +251,13 @@ impl Config {

/// Sets the URL
pub fn set_base_url(&mut self, url: &str) -> Result<()> {
if let Some(ref org_token) = self.cached_token_data {
if url != org_token.url {
bail!(
"Two different url values supplied: `{}` (from token), `{url}`.",
org_token.url,
);
if let Some(token_url) = self
.cached_token_data
.as_ref()
.and_then(|td| td.url.as_ref())
{
if url != token_url {
bail!("Two different url values supplied: `{token_url}` (from token), `{url}`.");
}
}
self.cached_base_url = url.to_owned();
Expand Down Expand Up @@ -769,7 +774,7 @@ mod tests {
TokenData::decode(token).unwrap().unwrap(),
TokenData {
org: "test-org".to_string(),
url: "https://sentry.io".to_string(),
url: Some("https://sentry.io".to_string()),
}
);
}
Expand Down