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/ui/routes/ch/channel.rs | 6 +++---
 src/ui/routes/get.rs        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/ui/routes')

diff --git a/src/ui/routes/ch/channel.rs b/src/ui/routes/ch/channel.rs
index 353d000..a338f1f 100644
--- a/src/ui/routes/ch/channel.rs
+++ b/src/ui/routes/ch/channel.rs
@@ -8,7 +8,7 @@ pub mod get {
         app::App,
         channel,
         error::Internal,
-        login::Login,
+        token::extract::Identity,
         ui::{
             assets::{Asset, Assets},
             error::NotFound,
@@ -17,10 +17,10 @@ pub mod get {
 
     pub async fn handler(
         State(app): State<App>,
-        login: Option<Login>,
+        identity: Option<Identity>,
         Path(channel): Path<channel::Id>,
     ) -> Result<Asset, Error> {
-        login.ok_or(Error::NotLoggedIn)?;
+        let _ = identity.ok_or(Error::NotLoggedIn)?;
         app.channels()
             .get(&channel)
             .await
diff --git a/src/ui/routes/get.rs b/src/ui/routes/get.rs
index 97737e1..2fcb51c 100644
--- a/src/ui/routes/get.rs
+++ b/src/ui/routes/get.rs
@@ -2,12 +2,12 @@ use axum::response::{self, IntoResponse, Redirect};
 
 use crate::{
     error::Internal,
-    login::Login,
+    token::extract::Identity,
     ui::assets::{Asset, Assets},
 };
 
-pub async fn handler(login: Option<Login>) -> Result<Asset, Error> {
-    login.ok_or(Error::NotLoggedIn)?;
+pub async fn handler(identity: Option<Identity>) -> Result<Asset, Error> {
+    let _ = identity.ok_or(Error::NotLoggedIn)?;
 
     Assets::index().map_err(Error::Internal)
 }
-- 
cgit v1.2.3