From e1a8827a587949f3ac0c7a299e2745820ab368e1 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Sun, 24 Aug 2025 03:56:02 -0400 Subject: Stop returning an HTTP body from `POST /api/invite/:id`. As with the previous commits, the body was never actually being used. --- src/invite/app.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/invite/app.rs') diff --git a/src/invite/app.rs b/src/invite/app.rs index a286a8f..14c1440 100644 --- a/src/invite/app.rs +++ b/src/invite/app.rs @@ -47,7 +47,7 @@ impl<'a> Invites<'a> { name: &Name, password: &Password, accepted_at: &DateTime, - ) -> Result<(User, Secret), AcceptError> { + ) -> Result { let create = Create::begin(name, password, accepted_at); let mut tx = self.db.begin().await?; @@ -74,9 +74,9 @@ impl<'a> Invites<'a> { let secret = tx.tokens().issue(stored.user(), accepted_at).await?; tx.commit().await?; - let login = stored.publish(self.events); + let _ = stored.publish(self.events); - Ok((login.as_created(), secret)) + Ok(secret) } pub async fn expire(&self, relative_to: &DateTime) -> Result<(), sqlx::Error> { -- cgit v1.2.3 From ee9812bd35409abe9532b1d508e04c1dae63c941 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Sun, 24 Aug 2025 04:01:13 -0400 Subject: Remove the now-unused return value from the final stage of user creation. --- src/invite/app.rs | 2 +- src/setup/app.rs | 2 +- src/user/app.rs | 3 ++- src/user/create.rs | 5 +---- 4 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src/invite/app.rs') diff --git a/src/invite/app.rs b/src/invite/app.rs index 14c1440..1c85562 100644 --- a/src/invite/app.rs +++ b/src/invite/app.rs @@ -74,7 +74,7 @@ impl<'a> Invites<'a> { let secret = tx.tokens().issue(stored.user(), accepted_at).await?; tx.commit().await?; - let _ = stored.publish(self.events); + stored.publish(self.events); Ok(secret) } diff --git a/src/setup/app.rs b/src/setup/app.rs index 123cff9..1856519 100644 --- a/src/setup/app.rs +++ b/src/setup/app.rs @@ -39,7 +39,7 @@ impl<'a> Setup<'a> { let secret = tx.tokens().issue(stored.user(), created_at).await?; tx.commit().await?; - let _ = stored.publish(self.events); + stored.publish(self.events); Ok(secret) } diff --git a/src/user/app.rs b/src/user/app.rs index 5f58981..301c39c 100644 --- a/src/user/app.rs +++ b/src/user/app.rs @@ -29,7 +29,8 @@ impl<'a> Users<'a> { let stored = validated.store(&mut tx).await?; tx.commit().await?; - let user = stored.publish(self.events); + let user = stored.user().to_owned(); + stored.publish(self.events); Ok(user.as_created()) } diff --git a/src/user/create.rs b/src/user/create.rs index 0e7a118..5d7bf65 100644 --- a/src/user/create.rs +++ b/src/user/create.rs @@ -73,13 +73,10 @@ pub struct Stored { } impl Stored { - #[must_use = "dropping a user creation attempt is likely a mistake"] - pub fn publish(self, events: &Broadcaster) -> History { + pub fn publish(self, events: &Broadcaster) { let Self { user } = self; events.broadcast(user.events().map(Event::from).collect::>()); - - user } pub fn user(&self) -> &History { -- cgit v1.2.3