From 929806de25a2c476db5d1618d0141d70569fe819 Mon Sep 17 00:00:00 2001 From: clockwork-labs-bot Date: Fri, 10 Jul 2026 11:20:15 -0400 Subject: [PATCH 1/7] Clarify CLI login HTTP errors --- crates/cli/src/subcommands/login.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/crates/cli/src/subcommands/login.rs b/crates/cli/src/subcommands/login.rs index 3e7699f0316..ea300d93f32 100644 --- a/crates/cli/src/subcommands/login.rs +++ b/crates/cli/src/subcommands/login.rs @@ -206,12 +206,12 @@ impl WebLoginSessionResponse { async fn web_login(remote: &Url, open_browser: bool) -> Result { let client = reqwest::Client::new(); - let response: WebLoginTokenResponse = client + let response = client .post(remote.join("/api/auth/cli/login/request-token")?) .send() .await? - .json() - .await?; + .error_for_status()?; + let response: WebLoginTokenResponse = response.json().await?; if !response.success { return Err(anyhow::anyhow!("Failed to request token")); @@ -240,7 +240,8 @@ async fn web_login(remote: &Url, open_browser: bool) -> Result Result { let client = reqwest::Client::new(); - let response: SpacetimeDBTokenResponse = client + let response = client .post(remote.join("api/spacetimedb-token")?) .header("Authorization", format!("Bearer {web_session_token}")) .send() .await? - .json() - .await?; + .error_for_status()?; + let response: SpacetimeDBTokenResponse = response.json().await?; if !response.success { return Err(anyhow::anyhow!( From ca670e737dbca131d1ac3f20114917f05602f7ba Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 10 Jul 2026 08:33:06 -0700 Subject: [PATCH 2/7] Apply suggestion from @bfops Signed-off-by: Zeke Foppa <196249+bfops@users.noreply.github.com> --- crates/cli/src/subcommands/login.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/cli/src/subcommands/login.rs b/crates/cli/src/subcommands/login.rs index ea300d93f32..b68182628da 100644 --- a/crates/cli/src/subcommands/login.rs +++ b/crates/cli/src/subcommands/login.rs @@ -210,8 +210,9 @@ async fn web_login(remote: &Url, open_browser: bool) -> Result Date: Fri, 10 Jul 2026 08:33:42 -0700 Subject: [PATCH 3/7] Apply suggestion from @bfops Signed-off-by: Zeke Foppa <196249+bfops@users.noreply.github.com> --- crates/cli/src/subcommands/login.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/cli/src/subcommands/login.rs b/crates/cli/src/subcommands/login.rs index b68182628da..4a6d411a19b 100644 --- a/crates/cli/src/subcommands/login.rs +++ b/crates/cli/src/subcommands/login.rs @@ -241,8 +241,7 @@ async fn web_login(remote: &Url, open_browser: bool) -> Result Date: Fri, 10 Jul 2026 08:34:02 -0700 Subject: [PATCH 4/7] Apply suggestion from @bfops Signed-off-by: Zeke Foppa <196249+bfops@users.noreply.github.com> --- crates/cli/src/subcommands/login.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/cli/src/subcommands/login.rs b/crates/cli/src/subcommands/login.rs index 4a6d411a19b..cb9de72bb54 100644 --- a/crates/cli/src/subcommands/login.rs +++ b/crates/cli/src/subcommands/login.rs @@ -241,7 +241,7 @@ async fn web_login(remote: &Url, open_browser: bool) -> Result Date: Fri, 10 Jul 2026 08:34:22 -0700 Subject: [PATCH 5/7] Apply suggestion from @bfops Signed-off-by: Zeke Foppa <196249+bfops@users.noreply.github.com> --- crates/cli/src/subcommands/login.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/cli/src/subcommands/login.rs b/crates/cli/src/subcommands/login.rs index cb9de72bb54..ee8abc4c12d 100644 --- a/crates/cli/src/subcommands/login.rs +++ b/crates/cli/src/subcommands/login.rs @@ -206,7 +206,7 @@ impl WebLoginSessionResponse { async fn web_login(remote: &Url, open_browser: bool) -> Result { let client = reqwest::Client::new(); - let response = client + let response: WebLoginTokenResponse = client .post(remote.join("/api/auth/cli/login/request-token")?) .send() .await? From d40221570b7d2975dcb7d35be1eb69790d350c83 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 10 Jul 2026 08:34:40 -0700 Subject: [PATCH 6/7] Apply suggestion from @bfops Signed-off-by: Zeke Foppa <196249+bfops@users.noreply.github.com> --- crates/cli/src/subcommands/login.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/cli/src/subcommands/login.rs b/crates/cli/src/subcommands/login.rs index ee8abc4c12d..96c35ec596c 100644 --- a/crates/cli/src/subcommands/login.rs +++ b/crates/cli/src/subcommands/login.rs @@ -264,7 +264,7 @@ struct SpacetimeDBTokenData { async fn spacetimedb_login(remote: &Url, web_session_token: &String) -> Result { let client = reqwest::Client::new(); - let response = client + let response: SpacetimeDBTokenResponse = client .post(remote.join("api/spacetimedb-token")?) .header("Authorization", format!("Bearer {web_session_token}")) .send() From 57cb1065e1d507bb358aa0d5c1bff4610842bf7a Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 10 Jul 2026 08:35:05 -0700 Subject: [PATCH 7/7] Apply suggestion from @bfops Signed-off-by: Zeke Foppa <196249+bfops@users.noreply.github.com> --- crates/cli/src/subcommands/login.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/cli/src/subcommands/login.rs b/crates/cli/src/subcommands/login.rs index 96c35ec596c..c96afcee361 100644 --- a/crates/cli/src/subcommands/login.rs +++ b/crates/cli/src/subcommands/login.rs @@ -269,8 +269,9 @@ async fn spacetimedb_login(remote: &Url, web_session_token: &String) -> Result