From 01f9f3549c76702fd56e58d44c5180fecddb4bfa Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Tue, 22 Oct 2024 23:25:24 -0400
Subject: Sort out the naming of the various parts of an identity.

* A `cookie::Identity` (`IdentityCookie`) is a specialized CookieJar for working with identities.
* An `Identity` is a token/login pair.

I hope for this to be a bit more legible.

In service of this, `Login` is no longer extractable. You have to get an identity.
---
 src/boot/routes/get.rs  | 9 ++++++---
 src/boot/routes/test.rs | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/boot/routes')

diff --git a/src/boot/routes/get.rs b/src/boot/routes/get.rs
index 737b479..563fbf1 100644
--- a/src/boot/routes/get.rs
+++ b/src/boot/routes/get.rs
@@ -3,11 +3,14 @@ use axum::{
     response::{self, IntoResponse},
 };
 
-use crate::{app::App, boot::Snapshot, error::Internal, login::Login};
+use crate::{app::App, boot::Snapshot, error::Internal, login::Login, token::extract::Identity};
 
-pub async fn handler(State(app): State<App>, login: Login) -> Result<Response, Internal> {
+pub async fn handler(State(app): State<App>, identity: Identity) -> Result<Response, Internal> {
     let snapshot = app.boot().snapshot().await?;
-    Ok(Response { login, snapshot })
+    Ok(Response {
+        login: identity.login,
+        snapshot,
+    })
 }
 
 #[derive(serde::Serialize)]
diff --git a/src/boot/routes/test.rs b/src/boot/routes/test.rs
index 4023753..0430854 100644
--- a/src/boot/routes/test.rs
+++ b/src/boot/routes/test.rs
@@ -6,10 +6,10 @@ use crate::test::fixtures;
 #[tokio::test]
 async fn returns_identity() {
     let app = fixtures::scratch_app().await;
-    let login = fixtures::login::fictitious();
-    let response = get::handler(State(app), login.clone())
+    let identity = fixtures::identity::fictitious();
+    let response = get::handler(State(app), identity.clone())
         .await
         .expect("boot always succeeds");
 
-    assert_eq!(login, response.login);
+    assert_eq!(identity.login, response.login);
 }
-- 
cgit v1.2.3