5 files changed, 22 insertions, 22 deletions
diff --git a/src/invite/routes/invite/post.rs b/src/invite/routes/invite/post.rs
index bb68e07..58d15c2 100644
--- a/src/invite/routes/invite/post.rs
+++ b/src/invite/routes/invite/post.rs
@@ -9,9 +9,9 @@ use crate::{
     clock::RequestedAt,
     error::{Internal, NotFound},
     invite::app,
-    login::{Login, Password},
     name::Name,
     token::extract::IdentityCookie,
+    user::{Password, User},
 };
 
 pub async fn handler(
@@ -20,7 +20,7 @@ pub async fn handler(
     identity: IdentityCookie,
     Path(invite): Path<super::PathInfo>,
     Json(request): Json<Request>,
-) -> Result<(IdentityCookie, Json<Login>), Error> {
+) -> Result<(IdentityCookie, Json<User>), Error> {
     let (login, secret) = app
         .invites()
         .accept(&invite, &request.name, &request.password, &accepted_at)
diff --git a/src/invite/routes/invite/test/get.rs b/src/invite/routes/invite/test/get.rs
index c6780ed..0dc8a79 100644
--- a/src/invite/routes/invite/test/get.rs
+++ b/src/invite/routes/invite/test/get.rs
@@ -7,7 +7,7 @@ async fn valid_invite() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let issuer = fixtures::login::create(&app, &fixtures::now()).await;
+    let issuer = fixtures::user::create(&app, &fixtures::now()).await;
     let invite = fixtures::invite::issue(&app, &issuer, &fixtures::now()).await;
 
     // Call endpoint
@@ -45,7 +45,7 @@ async fn expired_invite() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let issuer = fixtures::login::create(&app, &fixtures::ancient()).await;
+    let issuer = fixtures::user::create(&app, &fixtures::ancient()).await;
     let invite = fixtures::invite::issue(&app, &issuer, &fixtures::ancient()).await;
 
     app.invites()
diff --git a/src/invite/routes/invite/test/post.rs b/src/invite/routes/invite/test/post.rs
index 40e0580..b204b32 100644
--- a/src/invite/routes/invite/test/post.rs
+++ b/src/invite/routes/invite/test/post.rs
@@ -11,12 +11,12 @@ async fn valid_invite() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let issuer = fixtures::login::create(&app, &fixtures::now()).await;
+    let issuer = fixtures::user::create(&app, &fixtures::now()).await;
     let invite = fixtures::invite::issue(&app, &issuer, &fixtures::now()).await;
 
     // Call the endpoint
 
-    let (name, password) = fixtures::login::propose();
+    let (name, password) = fixtures::user::propose();
     let identity = fixtures::cookie::not_logged_in();
     let request = post::Request {
         name: name.clone(),
@@ -68,7 +68,7 @@ async fn nonexistent_invite() {
 
     // Call the endpoint
 
-    let (name, password) = fixtures::login::propose();
+    let (name, password) = fixtures::user::propose();
     let identity = fixtures::cookie::not_logged_in();
     let request = post::Request {
         name: name.clone(),
@@ -94,7 +94,7 @@ async fn expired_invite() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let issuer = fixtures::login::create(&app, &fixtures::ancient()).await;
+    let issuer = fixtures::user::create(&app, &fixtures::ancient()).await;
     let invite = fixtures::invite::issue(&app, &issuer, &fixtures::ancient()).await;
 
     app.invites()
@@ -104,7 +104,7 @@ async fn expired_invite() {
 
     // Call the endpoint
 
-    let (name, password) = fixtures::login::propose();
+    let (name, password) = fixtures::user::propose();
     let identity = fixtures::cookie::not_logged_in();
     let request = post::Request {
         name: name.clone(),
@@ -130,10 +130,10 @@ async fn accepted_invite() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let issuer = fixtures::login::create(&app, &fixtures::ancient()).await;
+    let issuer = fixtures::user::create(&app, &fixtures::ancient()).await;
     let invite = fixtures::invite::issue(&app, &issuer, &fixtures::ancient()).await;
 
-    let (name, password) = fixtures::login::propose();
+    let (name, password) = fixtures::user::propose();
     app.invites()
         .accept(&invite.id, &name, &password, &fixtures::now())
         .await
@@ -141,7 +141,7 @@ async fn accepted_invite() {
 
     // Call the endpoint
 
-    let (name, password) = fixtures::login::propose();
+    let (name, password) = fixtures::user::propose();
     let identity = fixtures::cookie::not_logged_in();
     let request = post::Request {
         name: name.clone(),
@@ -167,23 +167,23 @@ async fn conflicting_name() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let issuer = fixtures::login::create(&app, &fixtures::ancient()).await;
+    let issuer = fixtures::user::create(&app, &fixtures::ancient()).await;
     let invite = fixtures::invite::issue(&app, &issuer, &fixtures::ancient()).await;
 
     let existing_name = Name::from("rijksmuseum");
-    app.logins()
+    app.users()
         .create(
             &existing_name,
-            &fixtures::login::propose_password(),
+            &fixtures::user::propose_password(),
             &fixtures::now(),
         )
         .await
-        .expect("creating a login in an empty environment succeeds");
+        .expect("creating a user in an empty environment succeeds");
 
     // Call the endpoint
 
     let conflicting_name = Name::from("r\u{0133}ksmuseum");
-    let password = fixtures::login::propose_password();
+    let password = fixtures::user::propose_password();
 
     let identity = fixtures::cookie::not_logged_in();
     let request = post::Request {
@@ -212,13 +212,13 @@ async fn invalid_name() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    let issuer = fixtures::login::create(&app, &fixtures::now()).await;
+    let issuer = fixtures::user::create(&app, &fixtures::now()).await;
     let invite = fixtures::invite::issue(&app, &issuer, &fixtures::now()).await;
 
     // Call the endpoint
 
-    let name = fixtures::login::propose_invalid_name();
-    let password = fixtures::login::propose_password();
+    let name = fixtures::user::propose_invalid_name();
+    let password = fixtures::user::propose_password();
     let identity = fixtures::cookie::not_logged_in();
     let request = post::Request {
         name: name.clone(),
diff --git a/src/invite/routes/post.rs b/src/invite/routes/post.rs
index 898081e..f7ca76c 100644
--- a/src/invite/routes/post.rs
+++ b/src/invite/routes/post.rs
@@ -10,7 +10,7 @@ pub async fn handler(
     identity: Identity,
     _: Json<Request>,
 ) -> Result<Json<Invite>, Internal> {
-    let invite = app.invites().issue(&identity.login, &issued_at).await?;
+    let invite = app.invites().issue(&identity.user, &issued_at).await?;
     Ok(Json(invite))
 }
 
diff --git a/src/invite/routes/test.rs b/src/invite/routes/test.rs
index 4d99660..4ea8a3d 100644
--- a/src/invite/routes/test.rs
+++ b/src/invite/routes/test.rs
@@ -23,6 +23,6 @@ async fn create_invite() {
     .expect("creating an invite always succeeds");
 
     // Verify the response
-    assert_eq!(issuer.login.id, invite.issuer);
+    assert_eq!(issuer.user.id, invite.issuer);
     assert_eq!(&*issued_at, &invite.issued_at);
 }