Rename `login` to `user` throughout the server

7 files changed, 34 insertions, 34 deletions

diff --git a/src/event/app.rs b/src/event/app.rs
index 447a98f..45a9099 100644
--- a/src/event/app.rs
+++ b/src/event/app.rs
@@ -33,8 +33,8 @@ impl<'a> Events<'a> {
 
         let mut tx = self.db.begin().await?;
 
-        let logins = tx.users().replay(resume_at).await?;
-        let login_events = logins
+        let users = tx.users().replay(resume_at).await?;
+        let user_events = users
             .iter()
             .map(user::History::events)
             .kmerge_by(Sequence::merge)
@@ -57,7 +57,7 @@ impl<'a> Events<'a> {
             .filter(Sequence::after(resume_at))
             .map(Event::from);
 
-        let replay_events = login_events
+        let replay_events = user_events
             .merge_by(channel_events, Sequence::merge)
             .merge_by(message_events, Sequence::merge)
             .collect::<Vec<_>>();
diff --git a/src/event/mod.rs b/src/event/mod.rs
index 773adc3..3ab88ec 100644
--- a/src/event/mod.rs
+++ b/src/event/mod.rs
@@ -16,7 +16,7 @@ pub use self::{
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum Event {
-    Login(user::Event),
+    User(user::Event),
     Channel(channel::Event),
     Message(message::Event),
 }
@@ -24,7 +24,7 @@ pub enum Event {
 impl Sequenced for Event {
     fn instant(&self) -> Instant {
         match self {
-            Self::Login(event) => event.instant(),
+            Self::User(event) => event.instant(),
             Self::Channel(event) => event.instant(),
             Self::Message(event) => event.instant(),
         }
@@ -33,7 +33,7 @@ impl Sequenced for Event {
 
 impl From<user::Event> for Event {
     fn from(event: user::Event) -> Self {
-        Self::Login(event)
+        Self::User(event)
     }
 }
 
diff --git a/src/event/routes/test/invite.rs b/src/event/routes/test/invite.rs
index 80b4291..1d1bec6 100644
--- a/src/event/routes/test/invite.rs
+++ b/src/event/routes/test/invite.rs
@@ -12,7 +12,7 @@ async fn accepting_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;
     let resume_point = fixtures::boot::resume_point(&app).await;
 
@@ -30,7 +30,7 @@ async fn accepting_invite() {
 
     // Accept the invite
 
-    let (name, password) = fixtures::login::propose();
+    let (name, password) = fixtures::user::propose();
     let (joiner, _) = app
         .invites()
         .accept(&invite.id, &name, &password, &fixtures::now())
@@ -40,8 +40,8 @@ async fn accepting_invite() {
     // Expect a login created event
 
     let _ = events
-        .filter_map(fixtures::event::login)
-        .filter_map(fixtures::event::login::created)
+        .filter_map(fixtures::event::user)
+        .filter_map(fixtures::event::user::created)
         .filter(|event| future::ready(event.user == joiner))
         .next()
         .expect_some("a login created event is sent")
@@ -53,13 +53,13 @@ async fn previously_accepted_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;
     let resume_point = fixtures::boot::resume_point(&app).await;
 
     // Accept the invite
 
-    let (name, password) = fixtures::login::propose();
+    let (name, password) = fixtures::user::propose();
     let (joiner, _) = app
         .invites()
         .accept(&invite.id, &name, &password, &fixtures::now())
@@ -81,8 +81,8 @@ async fn previously_accepted_invite() {
     // Expect a login created event
 
     let _ = events
-        .filter_map(fixtures::event::login)
-        .filter_map(fixtures::event::login::created)
+        .filter_map(fixtures::event::user)
+        .filter_map(fixtures::event::user::created)
         .filter(|event| future::ready(event.user == joiner))
         .next()
         .expect_some("a login created event is sent")
diff --git a/src/event/routes/test/message.rs b/src/event/routes/test/message.rs
index fafaeb3..84a3aec 100644
--- a/src/event/routes/test/message.rs
+++ b/src/event/routes/test/message.rs
@@ -32,7 +32,7 @@ async fn sending() {
 
     // Send a message
 
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let message = app
         .messages()
         .send(
@@ -65,7 +65,7 @@ async fn previously_sent() {
 
     // Send a message
 
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let message = app
         .messages()
         .send(
@@ -105,7 +105,7 @@ async fn sent_in_multiple_channels() {
     // Set up the environment
 
     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 resume_point = fixtures::boot::resume_point(&app).await;
 
     let channels = [
@@ -156,7 +156,7 @@ async fn sent_sequentially() {
 
     let app = fixtures::scratch_app().await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let resume_point = fixtures::boot::resume_point(&app).await;
 
     let messages = vec![
@@ -200,7 +200,7 @@ async fn expiring() {
 
     let app = fixtures::scratch_app().await;
     let channel = fixtures::channel::create(&app, &fixtures::ancient()).await;
-    let sender = fixtures::login::create(&app, &fixtures::ancient()).await;
+    let sender = fixtures::user::create(&app, &fixtures::ancient()).await;
     let message = fixtures::message::send(&app, &channel, &sender, &fixtures::ancient()).await;
     let resume_point = fixtures::boot::resume_point(&app).await;
 
@@ -239,7 +239,7 @@ async fn previously_expired() {
 
     let app = fixtures::scratch_app().await;
     let channel = fixtures::channel::create(&app, &fixtures::ancient()).await;
-    let sender = fixtures::login::create(&app, &fixtures::ancient()).await;
+    let sender = fixtures::user::create(&app, &fixtures::ancient()).await;
     let message = fixtures::message::send(&app, &channel, &sender, &fixtures::ancient()).await;
     let resume_point = fixtures::boot::resume_point(&app).await;
 
@@ -278,7 +278,7 @@ async fn deleting() {
 
     let app = fixtures::scratch_app().await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let message = fixtures::message::send(&app, &channel, &sender, &fixtures::now()).await;
     let resume_point = fixtures::boot::resume_point(&app).await;
 
@@ -317,7 +317,7 @@ async fn previously_deleted() {
 
     let app = fixtures::scratch_app().await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let message = fixtures::message::send(&app, &channel, &sender, &fixtures::now()).await;
     let resume_point = fixtures::boot::resume_point(&app).await;
 
@@ -356,7 +356,7 @@ async fn previously_purged() {
 
     let app = fixtures::scratch_app().await;
     let channel = fixtures::channel::create(&app, &fixtures::ancient()).await;
-    let sender = fixtures::login::create(&app, &fixtures::ancient()).await;
+    let sender = fixtures::user::create(&app, &fixtures::ancient()).await;
     let message = fixtures::message::send(&app, &channel, &sender, &fixtures::ancient()).await;
     let resume_point = fixtures::boot::resume_point(&app).await;
 
diff --git a/src/event/routes/test/resume.rs b/src/event/routes/test/resume.rs
index dc27691..633eae3 100644
--- a/src/event/routes/test/resume.rs
+++ b/src/event/routes/test/resume.rs
@@ -15,7 +15,7 @@ async fn resume() {
 
     let app = fixtures::scratch_app().await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let resume_point = fixtures::boot::resume_point(&app).await;
 
     let initial_message = fixtures::message::send(&app, &channel, &sender, &fixtures::now()).await;
@@ -96,7 +96,7 @@ async fn serial_resume() {
     // Set up the environment
 
     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_a = fixtures::channel::create(&app, &fixtures::now()).await;
     let channel_b = fixtures::channel::create(&app, &fixtures::now()).await;
     let resume_point = fixtures::boot::resume_point(&app).await;
diff --git a/src/event/routes/test/setup.rs b/src/event/routes/test/setup.rs
index 345018e..1170fe4 100644
--- a/src/event/routes/test/setup.rs
+++ b/src/event/routes/test/setup.rs
@@ -19,7 +19,7 @@ async fn previously_completed() {
 
     // Complete initial setup
 
-    let (name, password) = fixtures::login::propose();
+    let (name, password) = fixtures::user::propose();
     let (owner, _) = app
         .setup()
         .initial(&name, &password, &fixtures::now())
@@ -41,8 +41,8 @@ async fn previously_completed() {
     // Expect a login created event
 
     let _ = events
-        .filter_map(fixtures::event::login)
-        .filter_map(fixtures::event::login::created)
+        .filter_map(fixtures::event::user)
+        .filter_map(fixtures::event::user::created)
         .filter(|event| future::ready(event.user == owner))
         .next()
         .expect_some("a login created event is sent")
diff --git a/src/event/routes/test/token.rs b/src/event/routes/test/token.rs
index d2232a4..a467de5 100644
--- a/src/event/routes/test/token.rs
+++ b/src/event/routes/test/token.rs
@@ -13,12 +13,12 @@ async fn terminates_on_token_expiry() {
 
     let app = fixtures::scratch_app().await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let resume_point = fixtures::boot::resume_point(&app).await;
 
     // Subscribe via the endpoint
 
-    let subscriber_creds = fixtures::login::create_with_password(&app, &fixtures::now()).await;
+    let subscriber_creds = fixtures::user::create_with_password(&app, &fixtures::now()).await;
     let subscriber =
         fixtures::identity::logged_in(&app, &subscriber_creds, &fixtures::ancient()).await;
 
@@ -60,7 +60,7 @@ async fn terminates_on_logout() {
 
     let app = fixtures::scratch_app().await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let resume_point = fixtures::boot::resume_point(&app).await;
 
     // Subscribe via the endpoint
@@ -106,12 +106,12 @@ async fn terminates_on_password_change() {
 
     let app = fixtures::scratch_app().await;
     let channel = fixtures::channel::create(&app, &fixtures::now()).await;
-    let sender = fixtures::login::create(&app, &fixtures::now()).await;
+    let sender = fixtures::user::create(&app, &fixtures::now()).await;
     let resume_point = fixtures::boot::resume_point(&app).await;
 
     // Subscribe via the endpoint
 
-    let creds = fixtures::login::create_with_password(&app, &fixtures::now()).await;
+    let creds = fixtures::user::create_with_password(&app, &fixtures::now()).await;
     let cookie = fixtures::cookie::logged_in(&app, &creds, &fixtures::now()).await;
     let subscriber = fixtures::identity::from_cookie(&app, &cookie, &fixtures::now()).await;
 
@@ -127,7 +127,7 @@ async fn terminates_on_password_change() {
     // Verify the resulting stream's behaviour
 
     let (_, password) = creds;
-    let to = fixtures::login::propose_password();
+    let to = fixtures::user::propose_password();
     app.tokens()
         .change_password(&subscriber.user, &password, &to, &fixtures::now())
         .await