Merge branch 'main' into wip/path-routing-for-channels

1 files changed, 20 insertions, 8 deletions

diff --git a/src/token/repo/auth.rs b/src/token/repo/auth.rs
index b299697..ddb5136 100644
--- a/src/token/repo/auth.rs
+++ b/src/token/repo/auth.rs
@@ -1,6 +1,10 @@
 use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
 
-use crate::login::{self, password::StoredHash, Login};
+use crate::{
+    clock::DateTime,
+    event::{Instant, Sequence},
+    login::{self, password::StoredHash, History, Login},
+};
 
 pub trait Provider {
     fn auth(&mut self) -> Auth;
@@ -21,25 +25,33 @@ impl<'t> Auth<'t> {
     pub async fn for_name(
         &mut self,
         name: &str,
-    ) -> Result<Option<(Login, StoredHash)>, sqlx::Error> {
+    ) -> Result<Option<(History, StoredHash)>, sqlx::Error> {
         let found = sqlx::query!(
             r#"
 				select
 					id as "id: login::Id",
 					name,
-					password_hash as "password_hash: StoredHash"
+					password_hash as "password_hash: StoredHash",
+                    created_sequence as "created_sequence: Sequence",
+                    created_at as "created_at: DateTime"
 				from login
 				where name = $1
 			"#,
             name,
         )
-        .map(|rec| {
+        .map(|row| {
             (
-                Login {
-                    id: rec.id,
-                    name: rec.name,
+                History {
+                    login: Login {
+                        id: row.id,
+                        name: row.name,
+                    },
+                    created: Instant {
+                        at: row.created_at,
+                        sequence: row.created_sequence,
+                    },
                 },
-                rec.password_hash,
+                row.password_hash,
             )
         })
         .fetch_optional(&mut *self.0)