4 files changed, 9 insertions, 9 deletions
diff --git a/src/event/handlers/stream/mod.rs b/src/event/handlers/stream/mod.rs
index d0d3f08..63bfff3 100644
--- a/src/event/handlers/stream/mod.rs
+++ b/src/event/handlers/stream/mod.rs
@@ -27,7 +27,7 @@ pub async fn handler(
     let resume_at = last_event_id.map_or(query.resume_point, LastEventId::into_inner);
 
     let stream = app.events().subscribe(resume_at).await?;
-    let stream = app.tokens().limit_stream(identity.token, stream).await?;
+    let stream = app.tokens().limit_stream(&identity.token, stream).await?;
 
     Ok(Response(stream))
 }
diff --git a/src/event/handlers/stream/test/invite.rs b/src/event/handlers/stream/test/invite.rs
index f2d6950..d4ac82d 100644
--- a/src/event/handlers/stream/test/invite.rs
+++ b/src/event/handlers/stream/test/invite.rs
@@ -33,7 +33,7 @@ async fn accepting_invite() {
         .accept(&invite.id, &name, &password, &fixtures::now())
         .await
         .expect("accepting an invite succeeds");
-    let (_, joiner) = app
+    let joiner = app
         .tokens()
         .validate(&joiner, &fixtures::now())
         .await
@@ -44,7 +44,7 @@ async fn accepting_invite() {
     let _ = events
         .filter_map(fixtures::event::stream::user)
         .filter_map(fixtures::event::stream::user::created)
-        .filter(|event| future::ready(event.user == joiner))
+        .filter(|event| future::ready(event.user.id == joiner.login.id))
         .next()
         .expect_some("a login created event is sent")
         .await;
@@ -67,7 +67,7 @@ async fn previously_accepted_invite() {
         .accept(&invite.id, &name, &password, &fixtures::now())
         .await
         .expect("accepting an invite succeeds");
-    let (_, joiner) = app
+    let joiner = app
         .tokens()
         .validate(&joiner, &fixtures::now())
         .await
@@ -90,7 +90,7 @@ async fn previously_accepted_invite() {
     let _ = events
         .filter_map(fixtures::event::stream::user)
         .filter_map(fixtures::event::stream::user::created)
-        .filter(|event| future::ready(event.user == joiner))
+        .filter(|event| future::ready(event.user.id == joiner.login.id))
         .next()
         .expect_some("a login created event is sent")
         .await;
diff --git a/src/event/handlers/stream/test/setup.rs b/src/event/handlers/stream/test/setup.rs
index 297162e..3f01ccb 100644
--- a/src/event/handlers/stream/test/setup.rs
+++ b/src/event/handlers/stream/test/setup.rs
@@ -22,7 +22,7 @@ async fn previously_completed() {
         .initial(&name, &password, &fixtures::now())
         .await
         .expect("initial setup in an empty app succeeds");
-    let (_, owner) = app
+    let owner = app
         .tokens()
         .validate(&secret, &fixtures::now())
         .await
@@ -45,7 +45,7 @@ async fn previously_completed() {
     let _ = events
         .filter_map(fixtures::event::stream::user)
         .filter_map(fixtures::event::stream::user::created)
-        .filter(|event| future::ready(event.user == owner))
+        .filter(|event| future::ready(event.user.id == owner.login.id))
         .next()
         .expect_some("a login created event is sent")
         .await;
diff --git a/src/event/handlers/stream/test/token.rs b/src/event/handlers/stream/test/token.rs
index 5af07a0..a9dfe29 100644
--- a/src/event/handlers/stream/test/token.rs
+++ b/src/event/handlers/stream/test/token.rs
@@ -125,8 +125,8 @@ async fn terminates_on_password_change() {
 
     let (_, password) = creds;
     let to = fixtures::user::propose_password();
-    app.tokens()
-        .change_password(&subscriber.user, &password, &to, &fixtures::now())
+    app.logins()
+        .change_password(&subscriber.login, &password, &to, &fixtures::now())
         .await
         .expect("expiring tokens succeeds");