diff --git a/.github/workflows/step_cli_build.yml b/.github/workflows/step_cli_build.yml index 5a68c44dedc..bb6e4c30921 100644 --- a/.github/workflows/step_cli_build.yml +++ b/.github/workflows/step_cli_build.yml @@ -56,4 +56,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: step-cli-binary - path: packages/step-cli/rust-local-target/x86_64-unknown-linux-musl/release/seq \ No newline at end of file + path: packages/step-cli/rust-local-target/x86_64-unknown-linux-musl/release/step-cli \ No newline at end of file diff --git a/packages/sequent-core/src/util/external_config.rs b/packages/sequent-core/src/util/external_config.rs index 066188ed3cc..f4cb5dafaad 100644 --- a/packages/sequent-core/src/util/external_config.rs +++ b/packages/sequent-core/src/util/external_config.rs @@ -40,6 +40,14 @@ pub struct GenerateVoters { pub overseas_reference: String, pub min_age: i64, pub max_age: i64, + #[serde(default)] + pub authorized_elections_count: i64, + #[serde(default = "default_email_verified")] + pub email_verified: bool, +} + +fn default_email_verified() -> bool { + true } #[derive(Debug, Serialize, Deserialize)] diff --git a/packages/step-cli/Cargo.toml b/packages/step-cli/Cargo.toml index be01058c0da..4d8a6dc8289 100644 --- a/packages/step-cli/Cargo.toml +++ b/packages/step-cli/Cargo.toml @@ -42,5 +42,5 @@ colored = "3.0" url = "2" [[bin]] -name = "cli" +name = "step-cli" path = "src/main.rs" diff --git a/packages/step-cli/rust-local-target/release/step-cli b/packages/step-cli/rust-local-target/release/step-cli index 7571dfff861..8a3c2511d47 100755 Binary files a/packages/step-cli/rust-local-target/release/step-cli and b/packages/step-cli/rust-local-target/release/step-cli differ diff --git a/packages/step-cli/src/commands/create_contest.rs b/packages/step-cli/src/commands/create_contest.rs index 1a90cf25796..1e35a97ac9a 100644 --- a/packages/step-cli/src/commands/create_contest.rs +++ b/packages/step-cli/src/commands/create_contest.rs @@ -84,6 +84,7 @@ fn create_contest( )])); let variables = insert_contest::Variables { + name: name.to_string(), description: Some(description.to_string()), election_event_id: election_event_id.to_string(), election_id: election_id.to_string(), diff --git a/packages/step-cli/src/types/config.rs b/packages/step-cli/src/types/config.rs index 0920748c36f..c45e4bbe7c3 100644 --- a/packages/step-cli/src/types/config.rs +++ b/packages/step-cli/src/types/config.rs @@ -2,11 +2,10 @@ // // SPDX-License-Identifier: AGPL-3.0-only -use serde::{Deserialize, Serialize}; - pub use sequent_core::util::external_config::{ DuplicateVotes, ExternalConfigData, GenerateApplications, GenerateVoters, }; +use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize)] pub struct ConfigData { @@ -19,46 +18,3 @@ pub struct ConfigData { pub client_secret: String, pub username: String, } - -#[derive(Debug, Serialize, Deserialize)] -pub struct ExternalConfigData { - pub election_event_json_file: String, - pub realm_name: String, - pub tenant_id: String, - pub election_event_id: String, - pub area_id: String, - pub election_id: String, - pub generate_voters: GenerateVoters, - pub duplicate_votes: DuplicateVotes, - pub generate_applications: GenerateApplications, -} - -#[derive(Debug, Serialize, Deserialize)] -pub struct GenerateVoters { - pub csv_file_name: String, - pub fields: Vec, - pub excluded_columns: Vec, - pub email_prefix: String, - pub domain: String, - pub sequence_email_number: bool, - pub sequence_start_number: i64, - pub voter_password: String, - pub password_salt: String, - pub hashed_password: String, - pub overseas_reference: String, - pub min_age: i64, - pub max_age: i64, - pub authorized_elections_count: i64, - pub email_verified: bool, -} - -#[derive(Debug, Serialize, Deserialize)] -pub struct DuplicateVotes { - pub row_id_to_clone: String, -} - -#[derive(Debug, Serialize, Deserialize)] -pub struct GenerateApplications { - pub applicant_data: HashMap, - pub annotations: HashMap, -}