1 files changed, 18 insertions, 10 deletions
diff --git a/src/user/create.rs b/src/user/create.rs
index 5d7bf65..5c060c9 100644
--- a/src/user/create.rs
+++ b/src/user/create.rs
@@ -4,6 +4,7 @@ use super::{History, repo::Provider as _, validate};
 use crate::{
     clock::DateTime,
     event::{Broadcaster, Event, repo::Provider as _},
+    login::{self, Login, repo::Provider as _},
     name::Name,
     password::{Password, StoredHash},
 };
@@ -39,7 +40,7 @@ impl<'a> Create<'a> {
 
         Ok(Validated {
             name,
-            password_hash,
+            password: password_hash,
             created_at,
         })
     }
@@ -48,7 +49,7 @@ impl<'a> Create<'a> {
 #[must_use = "dropping a user creation attempt is likely a mistake"]
 pub struct Validated<'a> {
     name: &'a Name,
-    password_hash: StoredHash,
+    password: StoredHash,
     created_at: &'a DateTime,
 }
 
@@ -56,31 +57,38 @@ impl Validated<'_> {
     pub async fn store(self, tx: &mut Transaction<'_, Sqlite>) -> Result<Stored, sqlx::Error> {
         let Self {
             name,
-            password_hash,
+            password,
             created_at,
         } = self;
 
+        let login = Login {
+            id: login::Id::generate(),
+            name: name.to_owned(),
+        };
+
         let created = tx.sequence().next(created_at).await?;
-        let user = tx.users().create(name, &password_hash, &created).await?;
+        tx.logins().create(&login, &password).await?;
+        let user = tx.users().create(&login, &created).await?;
 
-        Ok(Stored { user })
+        Ok(Stored { user, login })
     }
 }
 
 #[must_use = "dropping a user creation attempt is likely a mistake"]
 pub struct Stored {
     user: History,
+    login: Login,
 }
 
 impl Stored {
-    pub fn publish(self, events: &Broadcaster) {
-        let Self { user } = self;
+    pub fn publish(self, broadcaster: &Broadcaster) {
+        let Self { user, login: _ } = self;
 
-        events.broadcast(user.events().map(Event::from).collect::<Vec<_>>());
+        broadcaster.broadcast(user.events().map(Event::from).collect::<Vec<_>>());
     }
 
-    pub fn user(&self) -> &History {
-        &self.user
+    pub fn login(&self) -> &Login {
+        &self.login
     }
 }