Improved error handling

Author: jdetter

crates/cli/src/subcommands/dns.rs

@@ -1,10 +1,10 @@
 use crate::common_args;
 use crate::config::Config;
-use crate::util::{add_auth_header_opt, get_auth_header};
+use crate::util::{add_auth_header_opt, get_auth_header, ResponseExt};
 use clap::ArgMatches;
 use clap::{Arg, Command};
 
-use spacetimedb_client_api_messages::name::DomainName;
+use spacetimedb_client_api_messages::name::{DomainName, SetDomainsResult};
 
 pub fn cli() -> Command {
     Command::new("rename")
@@ -44,10 +44,22 @@ pub async fn exec(mut config: Config, args: &ArgMatches) -> Result<(), anyhow::E
     let builder = add_auth_header_opt(builder, &auth_header);
 
     let response = builder.send().await?;
-    let status = response.status();
-    let response_body = response.text().await?;
+    let status = &response.status();
+    let result : SetDomainsResult = response.json_or_error().await?;
+
     if !status.is_success() {
-        anyhow::bail!("Error: {response_body}");
+        anyhow::bail!(match result {
+            SetDomainsResult::Success => "".to_string(),
+            SetDomainsResult::PermissionDenied { domain } =>
+                format!("Permission denied for domain: {}", domain),
+            SetDomainsResult::PermissionDeniedOnAny { domains } =>
+                format!("Permission denied for domains: {:?}", domains),
+            SetDomainsResult::DatabaseNotFound =>
+                format!("Database {} not found", database_identity),
+            SetDomainsResult::NotYourDatabase { .. } =>
+                format!("You cannot rename {} because it is owned by another identity.", database_identity),
+            SetDomainsResult::OtherError(err) => err,
+            });
     }
 
     println!("Name set to {} for identity {}.", domain, database_identity);

crates/client-api/src/routes/database.rs

@@ -704,13 +704,12 @@ pub async fn set_names<S: ControlStateDelegate>(
         ));
     }
 
-    for name in validated_names {
+    for name in &validated_names {
         if ctx.lookup_identity(name.as_str()).unwrap().is_some() {
             return Ok((
                 StatusCode::BAD_REQUEST,
                 axum::Json(name::SetDomainsResult::OtherError(
-                    format!("Cannot rename to {} because it already is in use.", name.as_str()))),
-            ));
+                    format!("Cannot rename to {} because it already is in use.", name.as_str())))));
         }
     }