Cache access tokens instead of user passwords

Author: bubelov

src/command/admin.rs

@@ -1,7 +1,26 @@
-use crate::{rpc, Result};
+use crate::{rpc, settings, Result};
 use clap::Args;
 use serde_json::json;
 
+#[derive(Args)]
+pub struct LoginArgs {
+    pub username: String,
+    pub password: String,
+    pub token_label: String,
+}
+
+pub fn login(args: &LoginArgs) -> Result<()> {
+    let res = rpc::call(
+        "create_auth_token",
+        json!({"username": args.username, "password": args.password, "token_label": args.token_label}),
+    )?;
+    let res = res.result.unwrap();
+    let token = res["token"].as_str().unwrap();
+    settings::put_str("password", token)?;
+    println!("You are now logged in as {}", args.username);
+    Ok(())
+}
+
 #[derive(Args)]
 pub struct AddAdminArgs {
     pub new_admin_name: String,

src/command/setup.rs

@@ -22,15 +22,6 @@ pub fn set_server(args: &SetServerArgs) -> Result<()> {
     Ok(())
 }
 
-#[derive(Args)]
-pub struct LoginArgs {
-    pub password: String,
-}
-
-pub fn login(args: &LoginArgs) -> Result<()> {
-    settings::put_str("password", &args.password)
-}
-
 #[derive(Args)]
 pub struct StateArgs {}
 

src/main.rs

@@ -23,8 +23,6 @@ struct Cli {
 enum Commands {
     /// Set a JSON RPC API URL
     SetServer(command::setup::SetServerArgs),
-    /// Try to login and save password for future calls, if successful
-    Login(command::setup::LoginArgs),
     /// Show all locally cached data
     State(command::setup::StateArgs),
 
@@ -57,6 +55,8 @@ enum Commands {
     /// Generate category tags for a specific element id range
     GenerateElementCategories(GenerateElementCategoriesArgs),
 
+    /// Login with your username and password and get an auth token
+    Login(command::admin::LoginArgs),
     /// Create a new admin user. New admins have no permissions by default, use add-admin-action to allow certain acitons
     AddAdmin(command::admin::AddAdminArgs),
     /// Change admin password. Knowledge of an old password is required
@@ -110,7 +110,7 @@ fn main() -> Result<()> {
     }
 
     if let Some(Commands::Login(args)) = &cli.command {
-        return command::setup::login(args);
+        return command::admin::login(args);
     }
 
     if let Some(Commands::State(args)) = &cli.command {