Rename the `login` module to `user`.

2 files changed, 11 insertions, 11 deletions

diff --git a/src/token/repo/auth.rs b/src/token/repo/auth.rs
index 8900704..a1f4aad 100644
--- a/src/token/repo/auth.rs
+++ b/src/token/repo/auth.rs
@@ -4,8 +4,8 @@ use crate::{
     clock::DateTime,
     db::NotFound,
     event::{Instant, Sequence},
-    login::{self, History, Login, password::StoredHash},
     name::{self, Name},
+    user::{self, History, User, password::StoredHash},
 };
 
 pub trait Provider {
@@ -26,7 +26,7 @@ impl Auth<'_> {
         let row = sqlx::query!(
             r#"
                 select
-                    id as "id: login::Id",
+                    id as "id: user::Id",
                     display_name as "display_name: String",
                     canonical_name as "canonical_name: String",
                     created_sequence as "created_sequence: Sequence",
@@ -41,7 +41,7 @@ impl Auth<'_> {
         .await?;
 
         let login = History {
-            login: Login {
+            user: User {
                 id: row.id,
                 name: Name::new(row.display_name, row.canonical_name)?,
             },
@@ -51,11 +51,11 @@ impl Auth<'_> {
         Ok((login, row.password_hash))
     }
 
-    pub async fn for_login(&mut self, login: &Login) -> Result<(History, StoredHash), LoadError> {
+    pub async fn for_login(&mut self, login: &User) -> Result<(History, StoredHash), LoadError> {
         let row = sqlx::query!(
             r#"
                 select
-                    id as "id: login::Id",
+                    id as "id: user::Id",
                     display_name as "display_name: String",
                     canonical_name as "canonical_name: String",
                     created_sequence as "created_sequence: Sequence",
@@ -70,7 +70,7 @@ impl Auth<'_> {
         .await?;
 
         let login = History {
-            login: Login {
+            user: User {
                 id: row.id,
                 name: Name::new(row.display_name, row.canonical_name)?,
             },
diff --git a/src/token/repo/token.rs b/src/token/repo/token.rs
index 3428030..145ba2d 100644
--- a/src/token/repo/token.rs
+++ b/src/token/repo/token.rs
@@ -5,9 +5,9 @@ use crate::{
     clock::DateTime,
     db::NotFound,
     event::{Instant, Sequence},
-    login::{self, History, Login},
     name::{self, Name},
     token::{Id, Secret},
+    user::{self, History, User},
 };
 
 pub trait Provider {
@@ -85,7 +85,7 @@ impl Tokens<'_> {
     }
 
     // Revoke tokens for a login
-    pub async fn revoke_all(&mut self, login: &login::History) -> Result<Vec<Id>, sqlx::Error> {
+    pub async fn revoke_all(&mut self, login: &user::History) -> Result<Vec<Id>, sqlx::Error> {
         let login = login.id();
         let tokens = sqlx::query_scalar!(
             r#"
@@ -139,7 +139,7 @@ impl Tokens<'_> {
                 where secret = $2
                 returning
                     id as "token: Id",
-                    user as "user: login::Id"
+                    user as "user: user::Id"
             "#,
             used_at,
             secret,
@@ -151,7 +151,7 @@ impl Tokens<'_> {
         let login = sqlx::query!(
             r#"
                 select
-                    id as "id: login::Id",
+                    id as "id: user::Id",
                     display_name as "display_name: String",
                     canonical_name as "canonical_name: String",
                     created_sequence as "created_sequence: Sequence",
@@ -163,7 +163,7 @@ impl Tokens<'_> {
         )
         .map(|row| {
             Ok::<_, name::Error>(History {
-                login: Login {
+                user: User {
                     id: row.id,
                     name: Name::new(row.display_name, row.canonical_name)?,
                 },