Add signup command

Author: bubelov

src/command/admin.rs

@@ -15,7 +15,7 @@ pub fn login(args: &LoginArgs) -> Result<()> {
         json!({"username": args.username, "password": args.password, "label": args.label}),
     )?;
     let res = res.result.unwrap();
-    let api_key = res["api_key"].as_str().unwrap();
+    let api_key = res["token"].as_str().unwrap();
     settings::put_str("password", api_key)?;
     println!("You are now logged in as {}", args.username);
     Ok(())
@@ -37,16 +37,40 @@ pub fn create_api_key(args: &CreateApiKeyArgs) -> Result<()> {
 }
 
 #[derive(Args)]
-pub struct AddAdminArgs {
-    pub new_admin_name: String,
-    pub new_admin_password: String,
+pub struct AddUserArgs {
+    pub name: String,
+    pub password: String,
 }
 
-pub fn add_admin(args: &AddAdminArgs) -> Result<()> {
+pub fn add_user(args: &AddUserArgs) -> Result<()> {
     rpc::call(
-        "add_admin",
-        json!({"new_admin_name": args.new_admin_name, "new_admin_password": args.new_admin_password}),
-    )?.print()
+        "add_user",
+        json!({"name": args.name, "password": args.password}),
+    )?
+    .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)]

src/command/event.rs

@@ -7,8 +7,10 @@ use serde_json::{json, Map, Value};
 
 #[derive(Args)]
 pub struct CreateEventArgs {
-    pub lat: i64,
-    pub lon: i64,
+    #[clap(allow_hyphen_values = true)]
+    pub lat: f64,
+    #[clap(allow_hyphen_values = true)]
+    pub lon: f64,
     pub name: String,
     pub website: String,
     pub starts_at: String,

src/main.rs

@@ -56,14 +56,16 @@ enum Commands {
     GenerateElementCategories(GenerateElementCategoriesArgs),
 
     // 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),
     /// 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
     CreateApiKey(command::admin::CreateApiKeyArgs),
     /// 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),
+    AddUser(command::admin::AddUserArgs),
     /// Allow other admin to perform a certain action. You must be super admin to use this command
     AddAdminAction(command::admin::AddAdminActionArgs),
     /// Block other admin from using a certain action. You must be super admin to use this command
@@ -171,7 +173,8 @@ fn main() -> Result<()> {
         Commands::GenerateElementIcons(args) => element::generate_element_icons(args),
         Commands::GenerateElementCategories(args) => element::generate_element_categories(args),
         // Admin
-        Commands::AddAdmin(args) => command::admin::add_admin(args),
+        Commands::Signup(args) => command::admin::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),
         Commands::GenerateInvoice(args) => command::admin::generate_invoice(args),