Switch to header auth

Author: bubelov

src/command/setup.rs

@@ -1,4 +1,4 @@
-use crate::{rpc, settings, verbosity, Result};
+use crate::{settings, verbosity, Result};
 use clap::Args;
 use colored_json::ToColoredJson;
 use serde_json::json;
@@ -28,22 +28,7 @@ pub struct LoginArgs {
 }
 
 pub fn login(args: &LoginArgs) -> Result<()> {
-    let old_password = settings::get_str("password")?;
-    settings::put_str("password", &args.password)?;
-    match rpc::call("get_area", json!({ "id": "th" })) {
-        Ok(res) => match res.error {
-            Some(_) => {
-                res.print()?;
-                settings::put_str("password", &old_password)?;
-                Err("Password is likely wrong")?
-            }
-            None => Ok(()),
-        },
-        Err(e) => {
-            settings::put_str("password", &old_password)?;
-            Err(e)?
-        }
-    }
+    settings::put_str("password", &args.password)
 }
 
 #[derive(Args)]

src/rpc.rs

@@ -27,17 +27,16 @@ impl RpcResponse {
     }
 }
 
-pub fn call(method: &str, mut params: Value) -> Result<RpcResponse> {
+pub fn call(method: &str, params: Value) -> Result<RpcResponse> {
     if verbosity() > 0 {
         println!(
             "{}",
             serde_json::to_string(&params)?.to_colored_json_auto()?
         );
     }
     let params = params
-        .as_object_mut()
+        .as_object()
         .ok_or("params value is not a valid JSON object")?;
-    params.insert("password".into(), settings::get_str("password")?.into());
     let args = json!(
         {"jsonrpc": "2.0", "method": method, "params": params, "id": 1}
     );
@@ -49,7 +48,11 @@ pub fn call(method: &str, mut params: Value) -> Result<RpcResponse> {
         println!("{}", serde_json::to_string(&args)?.to_colored_json_auto()?);
     }
     let response = ureq::post(api_url)
-        //.header("Content-Type", "application/json")
+        .header("Content-Type", "application/json")
+        .header(
+            "Authorization",
+            format!("Bearer {}", settings::get_str("password")?),
+        )
         .send_json(args)?
         .body_mut()
         .read_to_string()?;