From 357116366c1307bedaac6a3dfe9c5ed8e0e0c210 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Wed, 2 Oct 2024 00:41:25 -0400
Subject: First pass on reorganizing the backend.

This is primarily renames and repackagings.
---
 src/repo/token.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/repo/token.rs')

diff --git a/src/repo/token.rs b/src/repo/token.rs
index 79e5c54..5f64dac 100644
--- a/src/repo/token.rs
+++ b/src/repo/token.rs
@@ -1,10 +1,10 @@
 use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
 use uuid::Uuid;
 
-use super::login::Login;
 use crate::{
     clock::DateTime,
-    login::{self, extract::IdentitySecret, token::Id},
+    login::{self, Login},
+    token::{Id, Secret},
 };
 
 pub trait Provider {
@@ -26,7 +26,7 @@ impl<'c> Tokens<'c> {
         &mut self,
         login: &Login,
         issued_at: &DateTime,
-    ) -> Result<IdentitySecret, sqlx::Error> {
+    ) -> Result<Secret, sqlx::Error> {
         let id = Id::generate();
         let secret = Uuid::new_v4().to_string();
 
@@ -35,7 +35,7 @@ impl<'c> Tokens<'c> {
                 insert
                 into token (id, secret, login, issued_at, last_used_at)
                 values ($1, $2, $3, $4, $4)
-                returning secret as "secret!: IdentitySecret"
+                returning secret as "secret!: Secret"
             "#,
             id,
             secret,
@@ -103,7 +103,7 @@ impl<'c> Tokens<'c> {
     // timestamp will be set to `used_at`.
     pub async fn validate(
         &mut self,
-        secret: &IdentitySecret,
+        secret: &Secret,
         used_at: &DateTime,
     ) -> Result<(Id, Login), sqlx::Error> {
         // I would use `update … returning` to do this in one query, but
-- 
cgit v1.2.3