feat: Add localpart to CSV import

src/bin/migrate.rs

@@ -123,6 +123,7 @@ mod tests {
 			true,
 			None,
 			external_user_id.to_owned(),
+			None,
 		)
 	}
 
@@ -296,4 +297,28 @@ mod tests {
 		// 'i'=0x69, 'd'=0x64 => "706c61696e5f6964"
 		run_conversion_test(original_id, ExternalIdEncoding::Plain, "706c61696e5f6964");
 	}
+
+	#[tokio::test]
+	async fn test_localpart_preservation() {
+		// Test that migration preserves localpart values
+		let original_user = SyncUser::new(
+			"first name".to_owned(),
+			"last name".to_owned(),
+			"[email protected]".to_owned(),
+			None,
+			true,
+			None,
+			"Y2FmZQ==".to_owned(),             // base64 encoded external ID
+			Some("test.localpart".to_owned()), // localpart should be preserved
+		);
+
+		let migrated_user = original_user
+			.create_user_with_converted_external_id(ExternalIdEncoding::Base64)
+			.expect("Should successfully convert user");
+
+		// External ID should be converted from base64 to hex
+		assert_eq!(migrated_user.get_external_id(), hex::encode("cafe"));
+		// Localpart should remain unchanged
+		assert_eq!(migrated_user.get_localpart(), Some("test.localpart"));
+	}
 }

src/lib.rs

@@ -34,7 +34,15 @@ pub async fn get_next_zitadel_user(
 				.ok()
 				.and_then(|metadata| metadata.metadata().value());
 
+			let localpart = zitadel
+				.zitadel_client
+				.get_user_metadata(&zitadel_user.1, "localpart")
+				.await
+				.ok()
+				.and_then(|metadata| metadata.metadata().value());
+
 			zitadel_user.0.preferred_username = preferred_username;
+			zitadel_user.0.localpart = localpart;
 
 			Ok(Some(zitadel_user))
 		}

src/sources/csv.rs

@@ -68,6 +68,9 @@
 	last_name: String,
 	/// The user's phone number
 	phone: String,
+	/// The user's localpart (optional)
+	#[serde(default)]
+	localpart: String,
 }
 
 impl CsvData {
@@ -81,6 +84,7 @@
 			preferred_username: Some(csv_data.email.clone()),
 			external_user_id: hex::encode(csv_data.email),
 			enabled: true,
+			localpart: (!csv_data.localpart.is_empty()).then_some(csv_data.localpart),
 		}
 	}
 }
@@ -139,11 +143,11 @@
 	fn test_get_users() {
 		let mut config = load_config();
 		let csv_content = indoc! {r#"
-          email,first_name,last_name,phone
-          [email protected],John,Doe,+1111111111
-          [email protected],Jane,Smith,+2222222222
-          [email protected],Alice,Johnson,
-          [email protected],Bob,Williams,+4444444444
+          email,first_name,last_name,phone,localpart
+          [email protected],John,Doe,+1111111111,john.doe
+          [email protected],Jane,Smith,+2222222222,
+          [email protected],Alice,Johnson,,alice.johnson
+          [email protected],Bob,Williams,+4444444444,
         "#};
 		let _file = test_helpers::temp_csv_file(&mut config, csv_content);
 
@@ -155,18 +159,60 @@
 
 		let users = result.expect("Failed to get users");
 		assert_eq!(users.len(), 4, "Unexpected number of users");
+
+		// Test user with localpart
 		assert_eq!(users[0].first_name, "John", "Unexpected first name at index 0");
 		assert_eq!(users[0].email, "[email protected]", "Unexpected email at index 0");
-		assert_eq!(users[3].last_name, "Williams", "Unexpected last name at index 3");
+		assert_eq!(
+			users[0].external_user_id,
+			hex::encode("[email protected]".as_bytes()),
+			"Unexpected external_user_id at index 0"
+		);
+		assert_eq!(
+			users[0].localpart,
+			Some("john.doe".to_owned()),
+			"Unexpected localpart at index 0"
+		);
+
+		// Test user without localpart (empty string)
+		assert_eq!(users[1].email, "[email protected]", "Unexpected email at index 1");
+		assert_eq!(
+			users[1].external_user_id,
+			hex::encode("[email protected]".as_bytes()),
+			"Unexpected external_user_id at index 1"
+		);
+		assert_eq!(users[1].localpart, None, "Unexpected localpart at index 1");
+
+		// Test user with localpart but no phone
+		assert_eq!(users[2].email, "[email protected]", "Unexpected email at index 2");
+		assert_eq!(
+			users[2].external_user_id,
+			hex::encode("[email protected]".as_bytes()),
+			"Unexpected external_user_id at index 2"
+		);
+		assert_eq!(
+			users[2].localpart,
+			Some("alice.johnson".to_owned()),
+			"Unexpected localpart at index 2"
+		);
 		assert_eq!(users[2].phone, None, "Unexpected phone at index 2");
+
+		// Test user without localpart (empty string) but with phone
+		assert_eq!(users[3].email, "[email protected]", "Unexpected email at index 3");
+		assert_eq!(
+			users[3].external_user_id,
+			hex::encode("[email protected]".as_bytes()),
+			"Unexpected external_user_id at index 3"
+		);
+		assert_eq!(users[3].localpart, None, "Unexpected localpart at index 3");
 		assert_eq!(users[3].phone, Some("+4444444444".to_owned()), "Unexpected phone at index 3");
 	}
 
 	#[test]
 	fn test_get_users_empty_file() {
 		let mut config = load_config();
 		let csv_content = indoc! {r#"
-          email,first_name,last_name,phone
+          email,first_name,last_name,phone,localpart
         "#};
 		let _file = test_helpers::temp_csv_file(&mut config, csv_content);
 
@@ -204,7 +250,7 @@
 		let mut config = load_config();
 		let csv_content = indoc! {r#"
           first_name
-          [email protected],John,Doe,+1111111111
+          [email protected],John,Doe,+1111111111,john.doe
         "#};
 		let _file = test_helpers::temp_csv_file(&mut config, csv_content);
 
@@ -220,9 +266,9 @@
 	fn test_get_users_invalid_content() {
 		let mut config = load_config();
 		let csv_content = indoc! {r#"
-          email,first_name,last_name,phone
+          email,first_name,last_name,phone,localpart
           [email protected]
-          [email protected],Jane,Smith,+2222222222
+          [email protected],Jane,Smith,+2222222222,jane.smith
         "#};
 		let _file = test_helpers::temp_csv_file(&mut config, csv_content);
 
@@ -236,5 +282,41 @@
 		assert_eq!(users.len(), 1, "Unexpected number of users");
 		assert_eq!(users[0].email, "[email protected]", "Unexpected email at index 0");
 		assert_eq!(users[0].last_name, "Smith", "Unexpected last name at index 0");
+		assert_eq!(
+			users[0].external_user_id,
+			hex::encode("[email protected]".as_bytes()),
+			"Unexpected external_user_id at index 0"
+		);
+		assert_eq!(
+			users[0].localpart,
+			Some("jane.smith".to_owned()),
+			"Unexpected localpart at index 0"
+		);
+	}
+
+	#[test]
+	fn test_backward_compatibility() {
+		// Test that old CSV format without localpart column still works
+		let mut config = load_config();
+		let csv_content = indoc! {r#"
+          email,first_name,last_name,phone
+          [email protected],John,Doe,+1111111111
+          [email protected],Jane,Smith,+2222222222
+        "#};
+		let _file = test_helpers::temp_csv_file(&mut config, csv_content);
+
+		let csv_config = config.sources.csv.expect("CsvSource configuration is missing");
+		let csv = CsvSource::new(csv_config);
+
+		let result = csv.read_csv();
+		assert!(result.is_ok(), "Failed to get users: {:?}", result);
+
+		let users = result.expect("Failed to get users");
+		assert_eq!(users.len(), 2, "Unexpected number of users");
+		// All users should have None localpart
+		assert!(
+			users.iter().all(|u| u.localpart.is_none()),
+			"Expected all users to have None localpart"
+		);
 	}
 }

src/sources/ldap.rs

@@ -128,6 +128,7 @@ impl LdapSource {
 			external_user_id: ldap_user_id,
 			phone,
 			enabled,
+			localpart: None,
 		})
 	}
 }

src/user.rs

@@ -37,11 +37,13 @@ pub struct User {
 	pub(crate) preferred_username: Option<String>,
 	/// The user's external (non-Zitadel) ID
 	pub(crate) external_user_id: String,
+	/// The user's localpart (used as Zitadel userId)
+	pub(crate) localpart: Option<String>,
 }
 
 impl User {
 	/// Create a new user instance, used in tests
-	#[allow(clippy::must_use_candidate)]
+	#[allow(clippy::must_use_candidate, clippy::too_many_arguments)]
 	pub fn new(
 		first_name: String,
 		last_name: String,
@@ -50,8 +52,18 @@ impl User {
 		enabled: bool,
 		preferred_username: Option<String>,
 		external_user_id: String,
+		localpart: Option<String>,
 	) -> Self {
-		Self { first_name, last_name, email, phone, enabled, preferred_username, external_user_id }
+		Self {
+			first_name,
+			last_name,
+			email,
+			phone,
+			enabled,
+			preferred_username,
+			external_user_id,
+			localpart,
+		}
 	}
 
 	/// Convert a Zitadel user to our internal representation
@@ -84,6 +96,7 @@ impl User {
 			preferred_username: None,
 			external_user_id: external_id,
 			enabled: true,
+			localpart: None,
 		})
 	}
 
@@ -93,6 +106,12 @@ impl User {
 		format!("{}, {}", self.last_name, self.first_name)
 	}
 
+	/// Get the localpart
+	#[must_use]
+	pub fn get_localpart(&self) -> Option<&str> {
+		self.localpart.as_deref()
+	}
+
 	/// Get the external user ID
 	#[must_use]
 	pub fn get_external_id(&self) -> &str {
@@ -210,6 +229,7 @@ impl PartialEq for User {
 			&& self.enabled == other.enabled
 			&& self.preferred_username == other.preferred_username
 			&& self.external_user_id == other.external_user_id
+			&& self.localpart == other.localpart
 	}
 }
 
@@ -222,6 +242,7 @@ impl std::fmt::Debug for User {
 			.field("phone", &"***")
 			.field("preferred_username", &"***")
 			.field("external_user_id", &self.external_user_id)
+			.field("localpart", &self.localpart)
 			.field("enabled", &self.enabled)
 			.finish()
 	}

src/zitadel.rs

@@ -161,14 +161,17 @@ impl Zitadel {
 			return Ok(());
 		}
 
-		let localpart = if self.feature_flags.contains(&FeatureFlag::PlainLocalpart) {
+		// Use the localpart from the user if available, otherwise generate one
+		let localpart = if let Some(localpart) = &imported_user.localpart {
+			localpart.clone()
+		} else if self.feature_flags.contains(&FeatureFlag::PlainLocalpart) {
 			String::from_utf8(imported_user.get_external_id_bytes()?)
 				.context(format!("Unsupported binary external ID for user: {:?}", imported_user))?
 		} else {
 			imported_user.get_famedly_uuid()?
 		};
 
-		let mut metadata = vec![SetMetadataEntry::new("localpart".to_owned(), localpart)];
+		let mut metadata = vec![SetMetadataEntry::new("localpart".to_owned(), localpart.clone())];
 
 		if let Some(preferred_username) = imported_user.preferred_username.clone() {
 			metadata
@@ -185,7 +188,8 @@ impl Zitadel {
 		.with_organization(
 			Organization::new().with_org_id(self.zitadel_config.organization_id.clone()),
 		)
-		.with_metadata(metadata);
+		.with_metadata(metadata)
+		.with_user_id(localpart); // Set the Zitadel userId to the localpart
 
 		if let Some(phone) = imported_user.phone.clone() {
 			user.set_phone(
@@ -250,6 +254,16 @@ impl Zitadel {
 			updated_user.external_user_id
 		);
 
+		// Check if localpart has changed and emit warning if it has
+		if old_user.localpart != updated_user.localpart {
+			tracing::warn!(
+				"Cannot update Zitadel userId (localpart) for user {:?} having old localpart: {:?}, and new localpart: {:?}",
+				old_user,
+				old_user.localpart,
+				updated_user.localpart
+			);
+		}
+
 		if self.feature_flags.is_enabled(FeatureFlag::DryRun) {
 			tracing::warn!("Skipping update due to dry run");
 			return Ok(());
@@ -336,7 +350,7 @@ pub fn search_result_to_user(user: ZitadelUser) -> Result<User> {
 		.ok_or(anyhow!("Missing external ID found for user"))?;
 
 	// TODO: If async closures become a reality, we
-	// should capture the correct preferred_username
+	// should capture the correct preferred_username and localpart from metadata
 	// here.
 	let user = User::try_from_zitadel_user(human_user.clone(), nick_name.clone())?;
 	Ok(user)