feat: Implement !admin oidc unlink

src/admin/admin.rs

@@ -19,47 +19,48 @@ use crate::{
 #[derive(Debug, Parser)]
 #[command(name = conduwuit_core::BRANDING, version = conduwuit_core::version())]
 pub enum AdminCommand {
-	#[command(subcommand)]
 	/// Commands for managing appservices
+	#[command(subcommand)]
 	Appservices(AppserviceCommand),
 
-	#[command(subcommand)]
 	/// Commands for managing local users
+	#[command(subcommand)]
 	Users(UserCommand),
 
-	#[command(subcommand)]
 	/// Commands for managing registration tokens
+	#[command(subcommand)]
 	Token(TokenCommand),
 
+	/// Commands for managing OIDC
 	#[command(subcommand)]
 	Oidc(OidcCommand),
 
-	#[command(subcommand)]
 	/// Commands for managing rooms
+	#[command(subcommand)]
 	Rooms(RoomCommand),
 
-	#[command(subcommand)]
 	/// Commands for managing federation
+	#[command(subcommand)]
 	Federation(FederationCommand),
 
-	#[command(subcommand)]
 	/// Commands for managing the server
+	#[command(subcommand)]
 	Server(ServerCommand),
 
-	#[command(subcommand)]
 	/// Commands for managing media
+	#[command(subcommand)]
 	Media(MediaCommand),
 
-	#[command(subcommand)]
 	/// Commands for checking integrity
+	#[command(subcommand)]
 	Check(CheckCommand),
 
-	#[command(subcommand)]
 	/// Commands for debugging things
+	#[command(subcommand)]
 	Debug(DebugCommand),
 
-	#[command(subcommand)]
 	/// Low-level queries for database getters and iterators
+	#[command(subcommand)]
 	Query(QueryCommand),
 }
 

src/admin/oidc/commands.rs

@@ -6,12 +6,20 @@ impl crate::Context<'_> {
 	pub(super) async fn oidc_link(&self, user_id: String, subject: String) -> Result {
 		let user_id = parse_active_local_user_id(self.services, &user_id).await?;
 
-		self.services.oidc.link_user(&user_id, &subject).await;
+		self.services.oidc.link_user(&user_id, &subject);
 
-		self.write_str("Account linked successfully").await?;
+		self.write_str(&format!("Subject `{subject}` linked to account `{user_id}`."))
+			.await?;
 
 		Ok(())
 	}
 
-	pub(super) async fn oidc_unlink(&self, _user_id: String) -> Result { todo!() }
+	pub(super) async fn oidc_unlink(&self, subject: String) -> Result {
+		self.services.oidc.unlink_user(&subject);
+
+		self.write_str(&format!("Subject `{subject}` unlinked."))
+			.await?;
+
+		Ok(())
+	}
 }

src/admin/oidc/mod.rs

@@ -14,8 +14,9 @@ pub enum OidcCommand {
 		subject: String,
 	},
 
+	/// Unlink the given subject claim from its associated user ID.
 	#[clap(name = "unlink")]
 	OidcUnlink {
-		user_id: String,
+		subject: String,
 	},
 }