fixup! CLI tool to issue user registration tokens

Author: sandhose

crates/cli/src/commands/manage.rs

@@ -107,10 +107,15 @@ enum Subcommand {
         token: Option<String>,
 
         /// Maximum number of times this token can be used.
-        /// If not provided, the token can be used an unlimited number of times.
-        #[arg(long)]
+        /// If not provided, the token can be used only once, unless the
+        /// `--unlimited` flag is set.
+        #[arg(long, group = "token-usage-limit")]
         usage_limit: Option<u32>,
 
+        /// Allow the token to be used an unlimited number of times.
+        #[arg(long, action = ArgAction::SetTrue, group = "token-usage-limit")]
+        unlimited: bool,
+
         /// Time in seconds after which the token expires.
         /// If not provided, the token never expires.
         #[arg(long)]
@@ -355,10 +360,18 @@ impl Options {
             SC::IssueUserRegistrationToken {
                 token,
                 usage_limit,
+                unlimited,
                 expires_in,
             } => {
                 let _span = info_span!("cli.manage.add_user_registration_token").entered();
 
+                let usage_limit = match (usage_limit, unlimited) {
+                    (Some(usage_limit), false) => Some(usage_limit),
+                    (None, false) => Some(1),
+                    (None, true) => None,
+                    (Some(_), true) => unreachable!(), // This should be handled by the clap group
+                };
+
                 let database_config = DatabaseConfig::extract_or_default(figment)?;
                 let mut conn = database_connection_from_config(&database_config).await?;
                 let txn = conn.begin().await?;