Split `user` into a chat-facing entity and an authentication-facing entity.

The taxonomy is now as follows:

* A _login_ is someone's identity for the purposes of authenticating to the service. Logins are not synchronized, and in fact are not published anywhere in the current API. They have a login ID, a name and a password.

* A _user_ is someone's identity for the purpose of participating in conversations. Users _are_ synchronized, as before. They have a user ID, a name, and a creation instant for the purposes of synchronization.

In practice, a user exists for every login - in fact, users' names are stored in the login table and are joined in, rather than being stored redundantly in the user table. A login ID and its corresponding user ID are always equal, and the user and login ID types support conversion and comparison to facilitate their use in this context.

Tokens are now associated with logins, not users. The currently-acting identity is passed down into app types as a login, not a user, and then resolved to a user where appropriate within the app methods.

As a side effect, the `GET /api/boot` method now returns a `login` key instead of a `user` key. The structure of the nested value is unchanged.

1 files changed, 16 insertions, 27 deletions

diff --git a/src/token/repo/token.rs b/src/token/repo/token.rs
index afcde53..52a3987 100644
--- a/src/token/repo/token.rs
+++ b/src/token/repo/token.rs
@@ -3,10 +3,9 @@ use sqlx::{SqliteConnection, Transaction, sqlite::Sqlite};
 use crate::{
     clock::DateTime,
     db::NotFound,
-    event::{Instant, Sequence},
+    login::{self, Login},
     name::{self, Name},
     token::{Id, Secret, Token},
-    user::{self, History, User},
 };
 
 pub trait Provider {
@@ -31,11 +30,11 @@ impl Tokens<'_> {
             "#,
             token.id,
             secret,
-            token.user,
+            token.login,
             token.issued_at,
             token.last_used_at,
         )
-        .fetch_one(&mut *self.0)
+        .execute(&mut *self.0)
         .await?;
 
         Ok(())
@@ -71,8 +70,7 @@ impl Tokens<'_> {
     }
 
     // Revoke tokens for a login
-    pub async fn revoke_all(&mut self, user: &user::History) -> Result<Vec<Id>, sqlx::Error> {
-        let user = user.id();
+    pub async fn revoke_all(&mut self, login: &Login) -> Result<Vec<Id>, sqlx::Error> {
         let tokens = sqlx::query_scalar!(
             r#"
                 delete
@@ -80,7 +78,7 @@ impl Tokens<'_> {
                 where login = $1
                 returning id as "id: Id"
             "#,
-            user,
+            login.id,
         )
         .fetch_all(&mut *self.0)
         .await?;
@@ -106,14 +104,11 @@ impl Tokens<'_> {
         Ok(tokens)
     }
 
-    // Validate a token by its secret, retrieving the associated Login record.
-    // Will return an error if the token is not valid. If successful, the
-    // retrieved token's last-used timestamp will be set to `used_at`.
     pub async fn validate(
         &mut self,
         secret: &Secret,
         used_at: &DateTime,
-    ) -> Result<(Token, History), LoadError> {
+    ) -> Result<(Token, Login), LoadError> {
         // I would use `update … returning` to do this in one query, but
         // sqlite3, as of this writing, does not allow an update's `returning`
         // clause to reference columns from tables joined into the update. Two
@@ -125,7 +120,7 @@ impl Tokens<'_> {
                 where secret = $2
                 returning
                     id as "id: Id",
-                    login as "login: user::Id",
+                    login as "login: login::Id",
                     issued_at as "issued_at: DateTime",
                     last_used_at as "last_used_at: DateTime"
             "#,
@@ -134,7 +129,7 @@ impl Tokens<'_> {
         )
         .map(|row| Token {
             id: row.id,
-            user: row.login,
+            login: row.login,
             issued_at: row.issued_at,
             last_used_at: row.last_used_at,
         })
@@ -144,24 +139,18 @@ impl Tokens<'_> {
         let user = sqlx::query!(
             r#"
                 select
-                    id as "id: user::Id",
-                    login.display_name as "display_name: String",
-                    login.canonical_name as "canonical_name: String",
-                    user.created_sequence as "created_sequence: Sequence",
-                    user.created_at as "created_at: DateTime"
-                from user
-                join login using (id)
+                    id as "id: login::Id",
+                    display_name,
+                    canonical_name
+                from login
                 where id = $1
             "#,
-            token.user,
+            token.login,
         )
         .map(|row| {
-            Ok::<_, name::Error>(History {
-                user: User {
-                    id: row.id,
-                    name: Name::new(row.display_name, row.canonical_name)?,
-                },
-                created: Instant::new(row.created_at, row.created_sequence),
+            Ok::<_, name::Error>(Login {
+                id: row.id,
+                name: Name::new(row.display_name, row.canonical_name)?,
             })
         })
         .fetch_one(&mut *self.0)