Provide a view of logins to clients.

2 files changed, 25 insertions, 12 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)
diff --git a/src/token/repo/token.rs b/src/token/repo/token.rs
index 5f64dac..c592dcd 100644
--- a/src/token/repo/token.rs
+++ b/src/token/repo/token.rs
@@ -3,7 +3,7 @@ use uuid::Uuid;
 
 use crate::{
     clock::DateTime,
-    login::{self, Login},
+    login::{self, History, Login},
     token::{Id, Secret},
 };
 
@@ -24,11 +24,12 @@ impl<'c> Tokens<'c> {
     // be used to control expiry, until the token is actually used.
     pub async fn issue(
         &mut self,
-        login: &Login,
+        login: &History,
         issued_at: &DateTime,
     ) -> Result<Secret, sqlx::Error> {
         let id = Id::generate();
         let secret = Uuid::new_v4().to_string();
+        let login = login.id();
 
         let secret = sqlx::query_scalar!(
             r#"
@@ -39,7 +40,7 @@ impl<'c> Tokens<'c> {
             "#,
             id,
             secret,
-            login.id,
+            login,
             issued_at,
         )
         .fetch_one(&mut *self.0)
@@ -127,7 +128,7 @@ impl<'c> Tokens<'c> {
                 select
                     token.id as "token_id: Id",
                     login.id as "login_id: login::Id",
-                    name as "login_name"
+                    login.name as "login_name"
                 from login
                 join token on login.id = token.login
                 where token.secret = $1