Merge branch 'main' into feature-frontend

1 files changed, 8 insertions, 5 deletions

diff --git a/src/test/fixtures/identity.rs b/src/test/fixtures/identity.rs
index 633fb8a..56b4ffa 100644
--- a/src/test/fixtures/identity.rs
+++ b/src/test/fixtures/identity.rs
@@ -3,8 +3,11 @@ use uuid::Uuid;
 use crate::{
     app::App,
     clock::RequestedAt,
-    login::extract::{Identity, IdentitySecret, IdentityToken},
-    password::Password,
+    login::Password,
+    token::{
+        extract::{Identity, IdentityToken},
+        Secret,
+    },
 };
 
 pub fn not_logged_in() -> IdentityToken {
@@ -14,7 +17,7 @@ pub fn not_logged_in() -> IdentityToken {
 pub async fn logged_in(app: &App, login: &(String, Password), now: &RequestedAt) -> IdentityToken {
     let (name, password) = login;
     let token = app
-        .logins()
+        .tokens()
         .login(name, password, now)
         .await
         .expect("should succeed given known-valid credentials");
@@ -25,7 +28,7 @@ pub async fn logged_in(app: &App, login: &(String, Password), now: &RequestedAt)
 pub async fn from_token(app: &App, token: &IdentityToken, issued_at: &RequestedAt) -> Identity {
     let secret = token.secret().expect("identity token has a secret");
     let (token, login) = app
-        .logins()
+        .tokens()
         .validate(&secret, issued_at)
         .await
         .expect("always validates newly-issued secret");
@@ -38,7 +41,7 @@ pub async fn identity(app: &App, login: &(String, Password), issued_at: &Request
     from_token(app, &secret, issued_at).await
 }
 
-pub fn secret(identity: &IdentityToken) -> IdentitySecret {
+pub fn secret(identity: &IdentityToken) -> Secret {
     identity.secret().expect("identity contained a secret")
 }