Auto-fill token labels

Author: bubelov

src/command/admin.rs

@@ -6,13 +6,16 @@ use serde_json::json;
 pub struct LoginArgs {
     pub username: String,
     pub password: String,
-    pub label: String,
 }
 
 pub fn login(args: &LoginArgs) -> Result<()> {
     let res = rpc::call(
         "create_api_key",
-        json!({"username": args.username, "password": args.password, "label": args.label}),
+        json!({
+            "username": args.username,
+            "password": args.password,
+            "label": "Created by btcmap-cli"
+        }),
     )?;
     let res = res.result.unwrap();
     let api_key = res["token"].as_str().unwrap();

src/main.rs

@@ -136,7 +136,7 @@ fn main() -> Result<()> {
     }
 
     if settings::get_str("password")?.is_empty() {
-        Err("you need to login first, run btcmap-cli login <password>")?;
+        Err("you need to login first, run btcmap-cli login <username> <password>")?;
     }
 
     let command = match &cli.command {

src/rpc.rs

@@ -3,9 +3,11 @@ use crate::verbosity;
 use crate::Result;
 use colored_json::ToColoredJson;
 use serde::Deserialize;
+use serde::Serialize;
 use serde_json::{json, Value};
+use std::i64;
 
-#[derive(Deserialize)]
+#[derive(Serialize, Deserialize)]
 pub struct RpcResponse {
     pub result: Option<Value>,
     pub error: Option<Value>,
@@ -28,36 +30,67 @@ impl RpcResponse {
 }
 
 pub fn call(method: &str, params: Value) -> Result<RpcResponse> {
-    if verbosity() > 0 {
-        println!(
-            "{}",
-            serde_json::to_string(&params)?.to_colored_json_auto()?
-        );
+    match verbosity() {
+        i64::MIN..=0 => {}
+        1..=i64::MAX => {
+            println!("Calling method {method} with the following params:");
+            println!(
+                "{}",
+                serde_json::to_string(&params)?.to_colored_json_auto()?
+            );
+        }
     }
     let params = params
         .as_object()
         .ok_or("params value is not a valid JSON object")?;
-    let args = json!(
+    let req_body = json!(
         {"jsonrpc": "2.0", "method": method, "params": params, "id": 1}
     );
     let mut api_url = settings::get_str("api_url")?;
     if api_url.trim().is_empty() {
         api_url = "https://api.btcmap.org/rpc".into();
     }
     if verbosity() >= 2 {
-        println!("{}", serde_json::to_string(&args)?.to_colored_json_auto()?);
+        println!("Full request body:");
+        println!(
+            "{}",
+            serde_json::to_string(&req_body)?.to_colored_json_auto()?
+        );
     }
-    let response = ureq::post(api_url)
+    let response: RpcResponse = ureq::post(api_url)
         .header("Content-Type", "application/json")
         .header(
             "Authorization",
             format!("Bearer {}", settings::get_str("password")?),
         )
-        .send_json(args)?
+        .send_json(req_body)?
         .body_mut()
-        .read_to_string()?;
-    if verbosity() >= 2 {
-        println!("{}", response);
-    }
-    Ok(serde_json::from_str(&response)?)
+        .read_json()?;
+    match verbosity() {
+        i64::MIN..=0 => {}
+        1..=2 => {
+            if response.result.is_some() {
+                println!("RPC result:");
+                println!(
+                    "{}",
+                    serde_json::to_string(&response.result)?.to_colored_json_auto()?
+                );
+            }
+            if response.error.is_some() {
+                println!("RPC error:");
+                println!(
+                    "{}",
+                    serde_json::to_string(&response.error)?.to_colored_json_auto()?
+                );
+            }
+        }
+        3..=i64::MAX => {
+            println!("RPC response:");
+            println!(
+                "{}",
+                serde_json::to_string(&response)?.to_colored_json_auto()?
+            );
+        }
+    };
+    Ok(response)
 }