Stop returning an HTTP body from `POST /api/invite/:id`.

As with the previous commits, the body was never actually being used.

5 files changed, 24 insertions, 14 deletions

diff --git a/src/event/handlers/stream/test/invite.rs b/src/event/handlers/stream/test/invite.rs
index 01372ce..f2d6950 100644
--- a/src/event/handlers/stream/test/invite.rs
+++ b/src/event/handlers/stream/test/invite.rs
@@ -28,11 +28,16 @@ async fn accepting_invite() {
     // Accept the invite
 
     let (name, password) = fixtures::user::propose();
-    let (joiner, _) = app
+    let joiner = app
         .invites()
         .accept(&invite.id, &name, &password, &fixtures::now())
         .await
         .expect("accepting an invite succeeds");
+    let (_, joiner) = app
+        .tokens()
+        .validate(&joiner, &fixtures::now())
+        .await
+        .expect("a newly-issued secret is valid");
 
     // Expect a login created event
 
@@ -57,11 +62,16 @@ async fn previously_accepted_invite() {
     // Accept the invite
 
     let (name, password) = fixtures::user::propose();
-    let (joiner, _) = app
+    let joiner = app
         .invites()
         .accept(&invite.id, &name, &password, &fixtures::now())
         .await
         .expect("accepting an invite succeeds");
+    let (_, joiner) = app
+        .tokens()
+        .validate(&joiner, &fixtures::now())
+        .await
+        .expect("a newly-issued secret is valid");
 
     // Subscribe
 
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<Secret, AcceptError> {
         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> {
diff --git a/src/invite/handlers/accept/mod.rs b/src/invite/handlers/accept/mod.rs
index 9fa4d6a..cdf385f 100644
--- a/src/invite/handlers/accept/mod.rs
+++ b/src/invite/handlers/accept/mod.rs
@@ -7,12 +7,12 @@ use axum::{
 use crate::{
     app::App,
     clock::RequestedAt,
+    empty::Empty,
     error::{Internal, NotFound},
     invite::{app, handlers::PathInfo},
     name::Name,
     password::Password,
     token::extract::IdentityCookie,
-    user::User,
 };
 
 #[cfg(test)]
@@ -24,14 +24,14 @@ pub async fn handler(
     identity: IdentityCookie,
     Path(invite): Path<PathInfo>,
     Json(request): Json<Request>,
-) -> Result<(IdentityCookie, Json<User>), Error> {
-    let (login, secret) = app
+) -> Result<(IdentityCookie, Empty), Error> {
+    let secret = app
         .invites()
         .accept(&invite, &request.name, &request.password, &accepted_at)
         .await
         .map_err(Error)?;
     let identity = identity.set(secret);
-    Ok((identity, Json(login)))
+    Ok((identity, Empty))
 }
 
 #[derive(serde::Deserialize)]
diff --git a/src/invite/handlers/accept/test.rs b/src/invite/handlers/accept/test.rs
index 7139985..adc7aa4 100644
--- a/src/invite/handlers/accept/test.rs
+++ b/src/invite/handlers/accept/test.rs
@@ -1,6 +1,6 @@
 use axum::extract::{Json, Path, State};
 
-use crate::{invite::app::AcceptError, name::Name, test::fixtures};
+use crate::{empty::Empty, invite::app::AcceptError, name::Name, test::fixtures};
 
 #[tokio::test]
 async fn valid_invite() {
@@ -18,7 +18,7 @@ async fn valid_invite() {
         name: name.clone(),
         password: password.clone(),
     };
-    let (identity, Json(response)) = super::handler(
+    let (identity, Empty) = super::handler(
         State(app.clone()),
         fixtures::now(),
         identity,
@@ -31,7 +31,6 @@ async fn valid_invite() {
     // Verify the response
 
     assert!(identity.secret().is_some());
-    assert_eq!(name, response.name);
 
     // Verify that the issued token is valid
 
@@ -43,7 +42,7 @@ async fn valid_invite() {
         .validate(&secret, &fixtures::now())
         .await
         .expect("newly-issued identity cookie is valid");
-    assert_eq!(response, login);
+    assert_eq!(name, login.name);
 
     // Verify that the given credentials can log in
 
@@ -57,7 +56,7 @@ async fn valid_invite() {
         .validate(&secret, &fixtures::now())
         .await
         .expect("validating a newly-issued token secret succeeds");
-    assert_eq!(response, login);
+    assert_eq!(name, login.name);
 }
 
 #[tokio::test]
diff --git a/src/user/history.rs b/src/user/history.rs
index 72e0aee..4f99130 100644
--- a/src/user/history.rs
+++ b/src/user/history.rs
@@ -20,6 +20,7 @@ impl History {
     // if this returns a redacted or modified version of the user. If we  implement
     // renames by redacting the original name, then this should return the edited
     // user, not the original, even if that's not how it was "as created.")
+    #[cfg(test)]
     pub fn as_created(&self) -> User {
         self.user.clone()
     }