chore(users/get): migrate old proto and refs

rivet-gg · Dec 21, 2024 · 53fc6b2 · 53fc6b2
1 parent a0b09cc
commit 53fc6b2
Show file tree

Hide file tree

Showing 30 changed files with 265 additions and 91 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/api/actor/Cargo.toml b/packages/api/actor/Cargo.toml
@@ -54,7 +54,6 @@ token-revoke.workspace = true
 upload-complete.workspace = true
 upload-get.workspace = true
 user.workspace = true
-user-get.workspace = true
 user-identity-get.workspace = true
 
 [dev-dependencies]

diff --git a/packages/api/actor/src/auth.rs b/packages/api/actor/src/auth.rs
@@ -157,16 +157,19 @@ impl Auth {
 		} else if let Ok(user_ent) = claims.as_user() {
 			// Get the user
 			let (user_res, game_res, team_list_res) = tokio::try_join!(
-				op!([ctx] user_get {
-					user_ids: vec![user_ent.user_id.into()],
-				}),
+				chirp_workflow::compat::op(
+					&ctx,
+					::user::ops::get::Input {
+						user_ids: vec![user_ent.user_id],
+					},
+				),
 				op!([ctx] game_get {
 					game_ids: vec![game_id.into()],
 				}),
 				chirp_workflow::compat::op(
 					&ctx,
 					user::ops::team_list::Input {
-						user_ids: vec![user_ent.user_id.into()],
+						user_ids: vec![user_ent.user_id],
 					},
 				),
 			)?;

diff --git a/packages/api/auth/Cargo.toml b/packages/api/auth/Cargo.toml
@@ -39,7 +39,6 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "json", "ansi"] }
 url = "2.2.2"
 user.workspace = true
-user-get.workspace = true
 user-identity-create.workspace = true
 uuid = { version = "1", features = ["v4"] }
 

diff --git a/packages/api/auth/src/auth.rs b/packages/api/auth/src/auth.rs
@@ -51,9 +51,12 @@ impl Auth {
 		let claims = self.claims()?;
 		let user_ent = claims.as_user()?;
 
-		let user_res = op!([ctx] user_get {
-			user_ids: vec![user_ent.user_id.into()],
-		})
+		let user_res = chirp_workflow::compat::op(
+			&ctx,
+			::user::ops::get::Input {
+				user_ids: vec![user_ent.user_id],
+			},
+		)
 		.await?;
 		let Some(user) = user_res.users.first() else {
 			bail_with!(TOKEN_REVOKED)

diff --git a/packages/api/auth/src/route/tokens.rs b/packages/api/auth/src/route/tokens.rs
@@ -137,8 +137,8 @@ pub async fn identity(
 
 	// Verify user is not deleted
 	if has_refresh_token {
-		let user_res = op!([ctx] user_get {
-			user_ids: vec![user_ent.user_id.into()],
+		let user_res = (*ctx).op(::user::ops::get::Input {
+			user_ids: vec![user_ent.user_id],
 		})
 		.await?;
 		let user = unwrap!(user_res.users.first());

diff --git a/packages/api/cloud/Cargo.toml b/packages/api/cloud/Cargo.toml
@@ -109,7 +109,6 @@ upload-file-list.workspace = true
 upload-get.workspace = true
 upload-prepare.workspace = true
 user.workspace = true
-user-get.workspace = true
 user-identity-get.workspace = true
 rivet-config.workspace = true
 rivet-env.workspace = true

diff --git a/packages/api/cloud/src/auth.rs b/packages/api/cloud/src/auth.rs
@@ -60,9 +60,12 @@ impl Auth {
 		let claims = self.claims()?;
 		let user_ent = claims.as_user()?;
 
-		let user_res = op!([ctx] user_get {
-			user_ids: vec![user_ent.user_id.into()],
-		})
+		let user_res = chirp_workflow::compat::op(
+			&ctx,
+			::user::ops::get::Input {
+				user_ids: vec![user_ent.user_id],
+			},
+		)
 		.await?;
 		let Some(user) = user_res.users.first() else {
 			bail_with!(TOKEN_REVOKED)

diff --git a/packages/api/games/Cargo.toml b/packages/api/games/Cargo.toml
@@ -47,7 +47,6 @@ token-create.workspace = true
 upload-complete.workspace = true
 upload-get.workspace = true
 user.workspace = true
-user-get.workspace = true
 user-identity-get.workspace = true
 rivet-config.workspace = true
 rivet-env.workspace = true

diff --git a/packages/api/games/src/auth.rs b/packages/api/games/src/auth.rs
@@ -97,9 +97,12 @@ impl Auth {
 		} else if let Ok(user_ent) = claims.as_user() {
 			// Get the user
 			let (user_res, game_res, team_list_res) = tokio::try_join!(
-				op!([ctx] user_get {
-					user_ids: vec![user_ent.user_id.into()],
-				}),
+				chirp_workflow::compat::op(
+					&ctx,
+					::user::ops::get::Input {
+						user_ids: vec![user_ent.user_id],
+					},
+				),
 				op!([ctx] game_get {
 					game_ids: vec![game_id.into()],
 				}),

diff --git a/packages/api/group/Cargo.toml b/packages/api/group/Cargo.toml
@@ -52,7 +52,6 @@ team-user-ban-list.workspace = true
 token-revoke.workspace = true
 upload-prepare.workspace = true
 user.workspace = true
-user-get.workspace = true
 user-identity-get.workspace = true
 rivet-config.workspace = true
 rivet-env.workspace = true

diff --git a/packages/api/group/src/auth.rs b/packages/api/group/src/auth.rs
@@ -56,9 +56,12 @@ impl Auth {
 		let claims = self.claims()?;
 		let user_ent = claims.as_user()?;
 
-		let user_res = op!([ctx] user_get {
-			user_ids: vec![user_ent.user_id.into()],
-		})
+		let user_res = chirp_workflow::compat::op(
+			&ctx,
+			::user::ops::get::Input {
+				user_ids: vec![user_ent.user_id],
+			},
+		)
 		.await?;
 		let Some(user) = user_res.users.first() else {
 			bail_with!(TOKEN_REVOKED)
@@ -86,9 +89,12 @@ impl Auth {
 			let (_, user_ent) = self.user(ctx).await?;
 
 			// Get user
-			let user_res = op!([ctx] user_get {
-				user_ids: vec![user_ent.user_id.into()]
-			})
+			let user_res = chirp_workflow::compat::op(
+				&ctx,
+				::user::ops::get::Input {
+					user_ids: vec![user_ent.user_id],
+				},
+			)
 			.await?;
 
 			let user = unwrap!(user_res.users.first(), "user not found");

diff --git a/packages/api/group/src/fetch/identity.rs b/packages/api/group/src/fetch/identity.rs
@@ -9,9 +9,9 @@ use crate::{auth::Auth, convert};
 
 pub async fn users(
 	ctx: &Ctx<Auth>,
-	user_ids: Vec<common::Uuid>,
-) -> GlobalResult<user::get::Response> {
-	op!([ctx] user_get {
+	user_ids: Vec<Uuid>,
+) -> GlobalResult<::user::ops::get::Output> {
+	(*ctx).op(::user::ops::get::Input {
 		user_ids: user_ids,
 	})
 	.await

diff --git a/packages/api/group/src/route/groups.rs b/packages/api/group/src/route/groups.rs
@@ -287,7 +287,13 @@ pub async fn members(
 
 	// NOTE: We don't use fetch::identities::handles here because the end model is `GroupMember` not `IdentityHandle`
 	// Fetch team member and join request data
-	let users = fetch::identity::users(&ctx, user_ids.clone()).await?;
+	let users = fetch::identity::users(
+		&ctx,
+		user_ids
+			.iter()
+			.map(|u| u.as_uuid())
+			.collect::<Vec<_>>()
+	).await?;
 
 	let raw_user_ent_id = Into::<common::Uuid>::into(user_ent.user_id);
 	let members = users
@@ -424,7 +430,13 @@ pub async fn join_requests(
 	// NOTE: We don't use fetch::identities::handles here because the end model is `GroupMember` not
 	// `IdentityHandle`
 	// Fetch team member and join request data
-	let users = fetch::identity::users(&ctx, user_ids.clone()).await?;
+	let users = fetch::identity::users(
+		&ctx,
+		user_ids
+			.iter()
+			.map(|u| u.as_uuid())
+			.collect::<Vec<_>>()
+	).await?;
 
 	let raw_user_ent_id = Into::<common::Uuid>::into(user_ent.user_id);
 	let join_requests = users
@@ -1248,7 +1260,13 @@ pub async fn bans(
 	// NOTE: We don't use fetch::identities::handles here because the end model is `BannedIdentity` not
 	// `IdentityHandle`
 	// Fetch team member and ban data
-	let users = fetch::identity::users(&ctx, user_ids.clone()).await?;
+	let users = fetch::identity::users(
+		&ctx,
+		user_ids
+			.iter()
+			.map(|u| u.as_uuid())
+			.collect::<Vec<_>>()
+	).await?;
 
 	let raw_user_ent_id = Into::<common::Uuid>::into(user_ent.user_id);
 	let banned_identities = users

diff --git a/packages/api/identity/Cargo.toml b/packages/api/identity/Cargo.toml
@@ -53,7 +53,6 @@ token-revoke.workspace = true
 upload-prepare.workspace = true
 user.workspace = true
 user-avatar-upload-complete.workspace = true
-user-get.workspace = true
 user-identity-get.workspace = true
 rivet-config.workspace = true
 rivet-env.workspace = true

diff --git a/packages/api/identity/src/auth.rs b/packages/api/identity/src/auth.rs
@@ -116,9 +116,12 @@ impl Auth {
 		let claims = self.claims()?;
 		let user_ent = claims.as_user()?;
 
-		let user_res = op!([ctx] user_get {
-			user_ids: vec![user_ent.user_id.into()],
-		})
+		let user_res = chirp_workflow::compat::op(
+			&ctx,
+			::user::ops::get::Input {
+				user_ids: vec![user_ent.user_id],
+			},
+		)
 		.await?;
 		let Some(user) = user_res.users.first() else {
 			bail_with!(TOKEN_REVOKED)
@@ -143,9 +146,12 @@ impl Auth {
 		let user_ent = self.user(ctx).await?;
 
 		// Get user
-		let user_res = op!([ctx] user_get {
-			user_ids: vec![user_ent.user_id.into()]
-		})
+		let user_res = chirp_workflow::compat::op(
+			&ctx,
+			::user::ops::get::Input {
+				user_ids: vec![user_ent.user_id],
+			},
+		)
 		.await?;
 
 		let user = unwrap!(user_res.users.first(), "user not found");

diff --git a/packages/api/portal/Cargo.toml b/packages/api/portal/Cargo.toml
@@ -43,7 +43,6 @@ team-get.workspace = true
 team-member-count.workspace = true
 token-revoke.workspace = true
 user.workspace = true
-user-get.workspace = true
 rivet-config.workspace = true
 rivet-env.workspace = true
 

diff --git a/packages/api/portal/src/auth.rs b/packages/api/portal/src/auth.rs
@@ -53,9 +53,12 @@ impl Auth {
 		let claims = self.claims()?;
 		let user_ent = claims.as_user()?;
 
-		let user_res = op!([ctx] user_get {
-			user_ids: vec![user_ent.user_id.into()],
-		})
+		let user_res = chirp_workflow::compat::op(
+			&ctx,
+			::user::ops::get::Input {
+				user_ids: vec![user_ent.user_id],
+			},
+		)
 		.await?;
 		let Some(user) = user_res.users.first() else {
 			bail_with!(TOKEN_REVOKED)
@@ -80,9 +83,12 @@ impl Auth {
 		let user_ent = self.user(ctx).await?;
 
 		// Get user
-		let user_res = op!([ctx] user_get {
-			user_ids: vec![user_ent.user_id.into()]
-		})
+		let user_res = chirp_workflow::compat::op(
+			&ctx,
+			::user::ops::get::Input {
+				user_ids: vec![user_ent.user_id],
+			},
+		)
 		.await?;
 
 		let user = unwrap!(user_res.users.first(), "user not found");

diff --git a/packages/common/convert/Cargo.toml b/packages/common/convert/Cargo.toml
@@ -37,7 +37,6 @@ team-profile-validate.workspace = true
 team-validate.workspace = true
 tier.workspace = true
 user.workspace = true
-user-get.workspace = true
 user-identity-get.workspace = true
 
 rivet-api.workspace = true