First pass on reorganizing the backend.

This is primarily renames and repackagings.

1 files changed, 7 insertions, 10 deletions

diff --git a/src/login/app.rs b/src/login/app.rs
index 8ea0a91..60475af 100644
--- a/src/login/app.rs
+++ b/src/login/app.rs
@@ -6,18 +6,15 @@ use futures::{
 };
 use sqlx::sqlite::SqlitePool;
 
-use super::{
-    broadcaster::Broadcaster, extract::IdentitySecret, repo::auth::Provider as _, token, types,
-};
+use super::{broadcaster::Broadcaster, repo::auth::Provider as _, types, Login};
 use crate::{
     clock::DateTime,
-    password::Password,
+    event::Sequence,
+    login::Password,
     repo::{
-        error::NotFound as _,
-        login::{Login, Provider as _},
-        sequence::{Provider as _, Sequence},
-        token::Provider as _,
+        error::NotFound as _, login::Provider as _, sequence::Provider as _, token::Provider as _,
     },
+    token::{self, Secret},
 };
 
 pub struct Logins<'a> {
@@ -43,7 +40,7 @@ impl<'a> Logins<'a> {
         name: &str,
         password: &Password,
         login_at: &DateTime,
-    ) -> Result<IdentitySecret, LoginError> {
+    ) -> Result<Secret, LoginError> {
         let mut tx = self.db.begin().await?;
 
         let login = if let Some((login, stored_hash)) = tx.auth().for_name(name).await? {
@@ -78,7 +75,7 @@ impl<'a> Logins<'a> {
 
     pub async fn validate(
         &self,
-        secret: &IdentitySecret,
+        secret: &Secret,
         used_at: &DateTime,
     ) -> Result<(token::Id, Login), ValidateError> {
         let mut tx = self.db.begin().await?;