Merge pull request #19 from rivet-gg/max/identity-service

Add identity service

Author: NathanFlurry

cli/src/commands/avatar.rs

@@ -0,0 +1,64 @@
+use anyhow::{Context, Result};
+use clap::Parser;
+use tabled::Tabled;
+
+use crate::util::{fmt, term, upload};
+
+#[derive(Parser)]
+pub enum SubCommand {
+	List,
+}
+
+impl SubCommand {
+	pub async fn execute(&self, ctx: &cli_core::Ctx) -> Result<()> {
+		match self {
+			SubCommand::List => {
+				let custom_avatars_res = ctx
+					.client()
+					.list_game_custom_avatars()
+					.game_id(&ctx.game_id)
+					.send()
+					.await
+					.context("client.list_game_custom_avatars")?;
+
+				#[derive(Tabled)]
+				struct CustomAvatar {
+					#[tabled(rename = "Url")]
+					url: String,
+					#[tabled(rename = "Created")]
+					created: String,
+					#[tabled(rename = "Size")]
+					size: String,
+				}
+
+				let custom_avatars = custom_avatars_res
+					.custom_avatars()
+					.context("custom_avatars_res.custom_avatars")?
+					.iter()
+					.map(|custom_avatar| {
+						Ok(CustomAvatar {
+							url: custom_avatar
+								.url()
+								.context("custom_avatar.url")?
+								.to_string(),
+							created: fmt::date(
+								custom_avatar
+									.create_ts()
+									.context("custom_avatar.create_ts")?,
+							),
+							size: upload::format_file_size(
+								custom_avatar
+									.content_length()
+									.context("custom_avatar.content_length")? as u64,
+							)?,
+						})
+					})
+					.collect::<Result<Vec<_>>>()?;
+
+				term::table(&custom_avatars);
+
+				Ok(())
+			}
+		}
+	}
+}

cli/src/commands/mod.rs

@@ -1,3 +1,4 @@
+pub mod avatar;
 pub mod build;
 pub mod dev;
 pub mod game;

cli/src/main.rs

@@ -49,6 +49,10 @@ enum SubCommand {
 		#[clap(subcommand)]
 		command: site::SubCommand,
 	},
+	Avatar {
+		#[clap(subcommand)]
+		command: avatar::SubCommand,
+	},
 }
 
 #[tokio::main]
@@ -82,6 +86,7 @@ async fn main() -> Result<()> {
 				game_id = ctx.game_id
 			);
 		}
+		SubCommand::Avatar { command } => command.execute(&ctx).await?,
 		SubCommand::Dev { command } => command.execute(&term, &ctx).await?,
 		SubCommand::Game { command } => command.execute(&ctx).await?,
 		SubCommand::Namespace { command } => command.execute(&ctx).await?,

cli/tests/static/basic/rivet.version.toml

@@ -20,3 +20,12 @@
 
 [kv]
 
+[identity]
+	custom_display_names = ["a", "b"]
+
+	custom_avatars = [
+		"7bbdaa3a-4620-4342-a407-55dfeecdef16",
+		"e4e075b0-f5ae-4b02-b4bd-edf1737cd35d",
+	]
+
+

core/src/config/version/identity.rs

@@ -0,0 +1,75 @@
+use serde::Deserialize;
+
+use crate::error::Error;
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct Identity {
+	pub custom_display_names: Vec<CustomDisplayName>,
+	pub custom_avatars: Vec<CustomAvatar>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(untagged)]
+pub enum CustomDisplayName {
+	Full { display_name: String },
+	DisplayName(String),
+}
+
+impl CustomDisplayName {
+	fn display_name(&self) -> &str {
+		match self {
+			Self::Full { display_name } => &display_name,
+			Self::DisplayName(display_name) => &display_name,
+		}
+	}
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(untagged)]
+pub enum CustomAvatar {
+	Full { upload_id: String },
+	UploadId(String),
+}
+
+impl CustomAvatar {
+	fn upload_id(&self) -> &str {
+		match self {
+			Self::Full { upload_id } => &upload_id,
+			Self::UploadId(upload_id) => &upload_id,
+		}
+	}
+}
+
+impl Identity {
+	pub fn build_model(
+		&self,
+		_game: &rivet_cloud::model::GameFull,
+	) -> Result<rivet_cloud::model::IdentityVersionConfig, Error> {
+		use rivet_cloud::model::*;
+
+		let custom_display_names = self
+			.custom_display_names
+			.iter()
+			.map(|custom_display_name| {
+				CustomDisplayName::builder()
+					.display_name(custom_display_name.display_name())
+					.build()
+			})
+			.collect::<Vec<_>>();
+		let custom_avatars = self
+			.custom_avatars
+			.iter()
+			.map(|custom_avatar| {
+				CustomAvatar::builder()
+					.upload_id(custom_avatar.upload_id())
+					.build()
+			})
+			.collect::<Vec<_>>();
+
+		Ok(IdentityVersionConfig::builder()
+			.set_custom_display_names(Some(custom_display_names))
+			.set_custom_avatars(Some(custom_avatars))
+			.build())
+	}
+}

core/src/config/version/mod.rs

@@ -3,6 +3,7 @@ use serde::Deserialize;
 use crate::error::Error;
 
 pub mod cdn;
+pub mod identity;
 pub mod kv;
 pub mod mm;
 
@@ -15,6 +16,8 @@ pub struct Version {
 	pub matchmaker: Option<mm::Matchmaker>,
 	#[serde(default)]
 	pub kv: Option<kv::Kv>,
+	#[serde(default)]
+	pub identity: Option<identity::Identity>,
 }
 
 impl Version {
@@ -33,6 +36,12 @@ impl Version {
 					.transpose()?,
 			)
 			.set_kv(self.kv.as_ref().map(|x| x.build_model(game)).transpose()?)
+			.set_identity(
+				self.identity
+					.as_ref()
+					.map(|x| x.build_model(game))
+					.transpose()?,
+			)
 			.build())
 	}
 }