chore: bump zitadel_rust_client to v0.3.0

Author: sirewix

Cargo.lock

@@ -24,7 +24,7 @@ tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 url = "2.5.2"
 uuid = { version = "1.10.0", features = ["v5"] }
-zitadel-rust-client = { git = "https://github.com/famedly/zitadel-rust-client", rev = "9031cd5db17d5d6faf2e5c9bc7b502a16179883e" }
+zitadel-rust-client = { git = "https://github.com/famedly/zitadel-rust-client", tag = "v0.3.0" }
 wiremock = "0.6.2"
 csv = "1.3.0"
 tempfile = "3.12.0"

Cargo.toml

@@ -111,7 +111,7 @@ pub async fn perform_sync(config: &Config) -> Result<()> {
 /// Delete a list of users given their email addresses
 async fn delete_users_by_email(config: &Config, emails: Vec<String>) -> Result<()> {
 	let mut zitadel = Zitadel::new(config).await?;
-	let mut stream = zitadel.get_users_by_email(emails)?;
+	let mut stream = pin!(zitadel.get_users_by_email(emails)?);
 
 	while let Some(zitadel_user) = get_next_zitadel_user(&mut stream, &mut zitadel).await? {
 		zitadel.delete_user(&zitadel_user.1).await?;

src/lib.rs

@@ -1,5 +1,5 @@
 //! Helper functions for submitting data to Zitadel
-use std::path::PathBuf;
+use std::{path::PathBuf, pin::pin};
 
 use anyhow::{anyhow, bail, Context, Result};
 use base64::prelude::{Engine, BASE64_STANDARD};
@@ -15,10 +15,10 @@ use zitadel_rust_client::{
 		},
 		pagination::PaginationParams,
 		users::{
-			AddHumanUserRequest, AndQuery, IdpLink, InUserEmailsQuery, ListUsersRequest,
-			Organization, OrganizationIdQuery, SearchQuery, SetHumanEmail, SetHumanPhone,
-			SetHumanProfile, SetMetadataEntry, TypeQuery, UpdateHumanUserRequest,
-			User as ZitadelUser, UserFieldName, Userv2Type,
+			AddHumanUserRequest, AndQuery, IdpLink, InUserEmailsQuery, Organization,
+			OrganizationIdQuery, SearchQuery, SetHumanEmail, SetHumanPhone, SetHumanProfile,
+			SetMetadataEntry, TypeQuery, UpdateHumanUserRequest, User as ZitadelUser,
+			UserFieldName, Userv2Type,
 		},
 		Zitadel as ZitadelClient,
 	},
@@ -77,24 +77,23 @@ impl Zitadel {
 		&mut self,
 		emails: Vec<String>,
 	) -> Result<impl Stream<Item = Result<(ZitadelUserBuilder, String)>> + Send> {
-		self.zitadel_client
+		Ok(self
+			.zitadel_client
 			.list_users(
-				ListUsersRequest::new(vec![
+				Some(PaginationParams::DEFAULT.with_asc(true)),
+				Some(UserFieldName::NickName),
+				Some(vec![
 					SearchQuery::new().with_type_query(TypeQuery::new(Userv2Type::Human)),
 					SearchQuery::new().with_in_user_emails_query(
 						InUserEmailsQuery::new().with_user_emails(emails),
 					),
-				])
-				.with_asc(true)
-				.with_sorting_column(UserFieldName::NickName),
-			)
-			.map(|stream| {
-				stream.map(|user| {
-					let id = user.user_id().ok_or(anyhow!("Missing Zitadel user ID"))?.clone();
-					let user = search_result_to_user(user)?;
-					Ok((user, id))
-				})
-			})
+				]),
+			)?
+			.and_then(|user| async {
+				let id = user.user_id().ok_or(anyhow!("Missing Zitadel user ID"))?.clone();
+				let user = search_result_to_user(user)?;
+				Ok((user, id))
+			}))
 	}
 
 	/// Return a stream of Zitadel users
@@ -107,18 +106,16 @@ impl Zitadel {
 		Ok(self
 			.zitadel_client
 			.list_users(
-				ListUsersRequest::new(vec![SearchQuery::new().with_and_query(
-					AndQuery::new().with_queries(vec![
-						SearchQuery::new().with_type_query(TypeQuery::new(Userv2Type::Human)),
-						SearchQuery::new().with_organization_id_query(OrganizationIdQuery::new(
-							self.zitadel_config.organization_id.clone(),
-						)),
-					]),
-				)])
-				.with_asc(true)
-				.with_sorting_column(UserFieldName::NickName),
+				Some(PaginationParams::DEFAULT.with_asc(true)),
+				Some(UserFieldName::NickName),
+				Some(vec![SearchQuery::new().with_and_query(AndQuery::new().with_queries(vec![
+					SearchQuery::new().with_type_query(TypeQuery::new(Userv2Type::Human)),
+					SearchQuery::new().with_organization_id_query(OrganizationIdQuery::new(
+						self.zitadel_config.organization_id.clone(),
+					)),
+				]))]),
 			)?
-			.map(|user| {
+			.and_then(|user| async {
 				let id = user.user_id().context("Missing Zitadel user ID")?.clone();
 				let user = search_result_to_user(user)?;
 				Ok((user, id))
@@ -157,23 +154,18 @@ impl Zitadel {
 	/// Return a vector of a random sample of Zitadel users
 	/// We use this to determine the encoding of the external IDs
 	pub async fn get_users_sample(&mut self) -> Result<Vec<User>> {
-		let mut stream = self
+		let mut stream = pin!(self
 			.zitadel_client
 			.list_users(
-				ListUsersRequest::new(vec![
-					SearchQuery::new().with_type_query(TypeQuery::new(Userv2Type::Human))
-				])
-				.with_asc(true)
-				.with_sorting_column(UserFieldName::NickName)
-				.with_page_size(USER_SAMPLE_SIZE),
-			)
-			.map(|stream| {
-				stream.map(|user| {
-					let id = user.user_id().ok_or(anyhow!("Missing Zitadel user ID"))?.clone();
-					let user = search_result_to_user(user)?;
-					Ok((user, id))
-				})
-			})?;
+				Some(PaginationParams::DEFAULT.with_asc(true).with_page_size(USER_SAMPLE_SIZE)),
+				Some(UserFieldName::NickName),
+				Some(vec![SearchQuery::new().with_type_query(TypeQuery::new(Userv2Type::Human))])
+			)?
+			.and_then(|user| async {
+				let id = user.user_id().ok_or(anyhow!("Missing Zitadel user ID"))?.clone();
+				let user = search_result_to_user(user)?;
+				Ok((user, id))
+			}));
 
 		let mut users = Vec::new();