Skip to content

feat: validating user id from orchestrator #1769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tfheud wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: validating user id from orchestrator #1769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 42 additions & 22 deletions clients/cli/src/register.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,33 +53,53 @@ pub async fn register_user(
}

// Check if the wallet address is already registered with the orchestrator.

if let Ok(user_id) = orchestrator.get_user(wallet_address).await {
print_cmd_info!(
"Wallet address is already registered with user ID.",
"User ID: {}, Wallet Address: {}",
wallet_address,
user_id
);
let config = Config::new(
user_id,
wallet_address.to_string(),
String::new(), // node_id is empty for now
orchestrator.environment().clone(),
);
// Save the configuration file with the user ID and wallet address.
config
.save(config_path)
.map_err(|e| handle_cmd_error!(e, "Failed to save config."))?;

if !user_id.is_empty() && uuid::Uuid::parse_str(&user_id).is_err() {
Copy link
Collaborator

@collinjackson collinjackson Sep 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is intended to be a nested if statement, it should be indented. I'm not sure this is important to explicitly check though as orchestrator should always return valid user ids

print_cmd_error!("❌ Invalid user ID returned by orchestrator.");
return Err(Box::from("Invalid user ID format returned by orchestrator."));
}

// Guide user to next step
print_cmd_info!(
"✅ User registration complete!",
"Next step - register a node: nexus-cli register-node"
);

let wallet_address = wallet_address.to_lowercase();

return Ok(());

if config_path.exists() {
let existing_config = Config::load_from_file(config_path)
.map_err(|e| handle_cmd_error!(e, "Failed to load existing config."))?;
if existing_config.user_id != user_id || existing_config.wallet_address.to_lowercase() != wallet_address {
print_cmd_error!("❌ Config file exists with different user details.");
return Err(Box::from("Config file contains conflicting user details."));
}
}

print_cmd_info!(
"Wallet address is already registered with user ID.",
"User ID: {}, Wallet Address: {}",
user_id,
wallet_address
);
let config = Config::new(
user_id,
wallet_address,
String::new(), // node_id is empty for now
orchestrator.environment().clone(),
);
// Save the configuration file with the user ID and wallet address.
config
.save(config_path)
.map_err(|e| handle_cmd_error!(e, "Failed to save config."))?;

// Guide user to next step
print_cmd_info!(
"✅ User registration complete!",
"Next step - register a node: nexus-cli register-node"
);

return Ok(());
}

// Otherwise, register the user with the orchestrator.
let uuid = uuid::Uuid::new_v4().to_string();
match orchestrator.register_user(&uuid, wallet_address).await {
Expand Down