Rename `login` to `user` throughout the server

4 files changed, 10 insertions, 10 deletions

diff --git a/src/boot/app.rs b/src/boot/app.rs
index 9c2559e..264d5ae 100644
--- a/src/boot/app.rs
+++ b/src/boot/app.rs
@@ -45,7 +45,7 @@ impl<'a> Boot<'a> {
 
         Ok(Snapshot {
             resume_point,
-            logins,
+            users: logins,
             channels,
             messages,
         })
diff --git a/src/boot/mod.rs b/src/boot/mod.rs
index d614df5..c52b088 100644
--- a/src/boot/mod.rs
+++ b/src/boot/mod.rs
@@ -8,7 +8,7 @@ pub use self::routes::router;
 #[derive(serde::Serialize)]
 pub struct Snapshot {
     pub resume_point: Sequence,
-    pub logins: Vec<User>,
+    pub users: Vec<User>,
     pub channels: Vec<Channel>,
     pub messages: Vec<Message>,
 }
diff --git a/src/boot/routes/get.rs b/src/boot/routes/get.rs
index c04c6b3..4873b7a 100644
--- a/src/boot/routes/get.rs
+++ b/src/boot/routes/get.rs
@@ -8,14 +8,14 @@ use crate::{app::App, boot::Snapshot, error::Internal, token::extract::Identity,
 pub async fn handler(State(app): State<App>, identity: Identity) -> Result<Response, Internal> {
     let snapshot = app.boot().snapshot().await?;
     Ok(Response {
-        login: identity.user,
+        user: identity.user,
         snapshot,
     })
 }
 
 #[derive(serde::Serialize)]
 pub struct Response {
-    pub login: User,
+    pub user: User,
     #[serde(flatten)]
     pub snapshot: Snapshot,
 }
diff --git a/src/boot/routes/test.rs b/src/boot/routes/test.rs
index 5bd9f66..55802fe 100644
--- a/src/boot/routes/test.rs
+++ b/src/boot/routes/test.rs
@@ -12,20 +12,20 @@ async fn returns_identity() {
         .await
         .expect("boot always succeeds");
 
-    assert_eq!(viewer.user, response.login);
+    assert_eq!(viewer.user, response.user);
 }
 
 #[tokio::test]
 async fn includes_logins() {
     let app = fixtures::scratch_app().await;
-    let spectator = fixtures::login::create(&app, &fixtures::now()).await;
+    let spectator = fixtures::user::create(&app, &fixtures::now()).await;
 
     let viewer = fixtures::identity::fictitious();
     let response = get::handler(State(app), viewer)
         .await
         .expect("boot always succeeds");
 
-    assert!(response.snapshot.logins.contains(&spectator));
+    assert!(response.snapshot.users.contains(&spectator));
 }
 
 #[tokio::test]
@@ -44,7 +44,7 @@ async fn includes_channels() {
 #[tokio::test]
 async fn includes_messages() {
     let app = fixtures::scratch_app().await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
     let message = fixtures::message::send(&app, &channel, &sender, &fixtures::now()).await;
 
@@ -59,7 +59,7 @@ async fn includes_messages() {
 #[tokio::test]
 async fn excludes_expired_messages() {
     let app = fixtures::scratch_app().await;
-    let sender = fixtures::login::create(&app, &fixtures::ancient()).await;
+    let sender = fixtures::user::create(&app, &fixtures::ancient()).await;
     let channel = fixtures::channel::create(&app, &fixtures::ancient()).await;
     let expired_message =
         fixtures::message::send(&app, &channel, &sender, &fixtures::ancient()).await;
@@ -80,7 +80,7 @@ async fn excludes_expired_messages() {
 #[tokio::test]
 async fn excludes_deleted_messages() {
     let app = fixtures::scratch_app().await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
     let deleted_message = fixtures::message::send(&app, &channel, &sender, &fixtures::now()).await;