Move auth functions to a separate module

Author: bubelov

src/command/admin.rs

@@ -60,29 +60,6 @@ pub fn add_user(args: &AddUserArgs) -> Result<()> {
     .print()
 }
 
-#[derive(Args)]
-pub struct SignupArgs {
-    pub name: String,
-    pub password: String,
-}
-
-pub fn sign_up(args: &SignupArgs) -> Result<()> {
-    rpc::call(
-        "add_user",
-        json!({"name": args.name, "password": args.password}),
-    )?
-    .print()?;
-    let res = rpc::call(
-        "create_api_key",
-        json!({"username": args.name, "password": args.password, "label": "Created by btcmap-cli during signup"}),
-    )?;
-    let res = res.result.unwrap();
-    let api_key = res["token"].as_str().unwrap();
-    settings::put_str("password", api_key)?;
-    println!("You are now logged in as {}", args.name);
-    Ok(())
-}
-
 #[derive(Args)]
 pub struct ChangePasswordArgs {
     pub username: String,

src/command/auth.rs

@@ -0,0 +1,26 @@
+use crate::{rpc, settings, Result};
+use clap::Args;
+use serde_json::json;
+
+#[derive(Args)]
+pub struct SignUpArgs {
+    pub name: String,
+    pub password: String,
+}
+
+pub fn sign_up(args: &SignUpArgs) -> Result<()> {
+    rpc::call(
+        "add_user",
+        json!({"name": args.name, "password": args.password}),
+    )?
+    .print()?;
+    let res = rpc::call(
+        "create_api_key",
+        json!({"username": args.name, "password": args.password, "label": "Created by btcmap-cli during signup"}),
+    )?;
+    let res = res.result.unwrap();
+    let api_key = res["token"].as_str().unwrap();
+    settings::put_str("password", api_key)?;
+    println!("You are now logged in as {}", args.name);
+    Ok(())
+}

src/command/mod.rs

@@ -1,5 +1,6 @@
 pub mod admin;
 pub mod area;
+pub mod auth;
 pub mod common;
 pub mod element;
 pub mod event;

src/main.rs

@@ -57,7 +57,7 @@ enum Commands {
 
     // Auth - https://github.com/teambtcmap/btcmap-api/blob/master/docs/rpc-api/auth.md
     /// Sign up and get an auth token
-    Signup(command::admin::SignupArgs),
+    Signup(command::auth::SignUpArgs),
     /// Change admin password. Knowledge of an old password is required
     ChangePassword(command::admin::ChangePasswordArgs),
     /// Create API key. You need to provide your username and password, as well as a key label
@@ -173,7 +173,7 @@ fn main() -> Result<()> {
         Commands::GenerateElementIcons(args) => element::generate_element_icons(args),
         Commands::GenerateElementCategories(args) => element::generate_element_categories(args),
         // Admin
-        Commands::Signup(args) => command::admin::sign_up(args),
+        Commands::Signup(args) => command::auth::sign_up(args),
         Commands::AddUser(args) => command::admin::add_user(args),
         Commands::AddAdminAction(args) => command::admin::add_admin_action(args),
         Commands::RemoveAdminAction(args) => command::admin::remove_admin_action(args),