3 files changed, 12 insertions, 20 deletions
diff --git a/src/invite/handlers/accept/test.rs b/src/invite/handlers/accept/test.rs
index adc7aa4..283ec76 100644
--- a/src/invite/handlers/accept/test.rs
+++ b/src/invite/handlers/accept/test.rs
@@ -1,6 +1,11 @@
 use axum::extract::{Json, Path, State};
 
-use crate::{empty::Empty, invite::app::AcceptError, name::Name, test::fixtures};
+use crate::{
+    empty::Empty,
+    invite::app::AcceptError,
+    name::Name,
+    test::{fixtures, verify},
+};
 
 #[tokio::test]
 async fn valid_invite() {
@@ -34,29 +39,16 @@ async fn valid_invite() {
 
     // Verify that the issued token is valid
 
-    let secret = identity
-        .secret()
-        .expect("newly-issued identity has a token secret");
-    let (_, login) = app
-        .tokens()
-        .validate(&secret, &fixtures::now())
-        .await
-        .expect("newly-issued identity cookie is valid");
-    assert_eq!(name, login.name);
+    verify::identity::valid_for_name(&app, &identity, &name).await;
 
     // Verify that the given credentials can log in
 
     let secret = app
-        .tokens()
-        .login(&name, &password, &fixtures::now())
+        .logins()
+        .with_password(&name, &password, &fixtures::now())
         .await
         .expect("credentials given on signup are valid");
-    let (_, login) = app
-        .tokens()
-        .validate(&secret, &fixtures::now())
-        .await
-        .expect("validating a newly-issued token secret succeeds");
-    assert_eq!(name, login.name);
+    verify::token::valid_for_name(&app, &secret, &name).await;
 }
 
 #[tokio::test]
diff --git a/src/invite/handlers/issue/mod.rs b/src/invite/handlers/issue/mod.rs
index 6085f7a..4ac74cc 100644
--- a/src/invite/handlers/issue/mod.rs
+++ b/src/invite/handlers/issue/mod.rs
@@ -13,7 +13,7 @@ pub async fn handler(
     identity: Identity,
     _: Json<Request>,
 ) -> Result<Json<Invite>, Internal> {
-    let invite = app.invites().issue(&identity.user, &issued_at).await?;
+    let invite = app.invites().issue(&identity.login, &issued_at).await?;
     Ok(Json(invite))
 }
 
diff --git a/src/invite/handlers/issue/test.rs b/src/invite/handlers/issue/test.rs
index 2bf5400..4421705 100644
--- a/src/invite/handlers/issue/test.rs
+++ b/src/invite/handlers/issue/test.rs
@@ -22,6 +22,6 @@ async fn create_invite() {
     .expect("creating an invite always succeeds");
 
     // Verify the response
-    assert_eq!(issuer.user.id, invite.issuer);
+    assert_eq!(issuer.login.id, invite.issuer);
     assert_eq!(&*issued_at, &invite.issued_at);
 }