Return an identity, rather than the parts of an identity, when validating an identity token.

This is a small refactoring that's been possible for a while, and we only just noticed.

3 files changed, 9 insertions, 10 deletions

diff --git a/src/user/handlers/login/test.rs b/src/user/handlers/login/test.rs
index bdd1957..cb387ad 100644
--- a/src/user/handlers/login/test.rs
+++ b/src/user/handlers/login/test.rs
@@ -30,14 +30,13 @@ async fn correct_credentials() {
 
     // Verify the semantics
 
-    let validated_at = fixtures::now();
-    let (_, validated_login) = app
+    let validated = app
         .tokens()
-        .validate(&secret, &validated_at)
+        .validate(&secret, &fixtures::now())
         .await
         .expect("identity secret is valid");
 
-    assert_eq!(name, validated_login.name);
+    assert_eq!(name, validated.user.name);
 }
 
 #[tokio::test]
diff --git a/src/user/handlers/logout/mod.rs b/src/user/handlers/logout/mod.rs
index 4450e4c..f759451 100644
--- a/src/user/handlers/logout/mod.rs
+++ b/src/user/handlers/logout/mod.rs
@@ -21,8 +21,8 @@ pub async fn handler(
     Json(_): Json<Request>,
 ) -> Result<(IdentityCookie, Empty), Error> {
     if let Some(secret) = identity.secret() {
-        let (token, _) = app.tokens().validate(&secret, &now).await?;
-        app.tokens().logout(&token).await?;
+        let validated_ident = app.tokens().validate(&secret, &now).await?;
+        app.tokens().logout(&validated_ident.token).await?;
     }
 
     let identity = identity.clear();
diff --git a/src/user/handlers/password/test.rs b/src/user/handlers/password/test.rs
index ffa12f3..c0f789b 100644
--- a/src/user/handlers/password/test.rs
+++ b/src/user/handlers/password/test.rs
@@ -38,12 +38,12 @@ async fn password_change() {
     let new_secret = new_cookie
         .secret()
         .expect("we should have a secret after changing our password");
-    let (_, login) = app
+    let new_identity = app
         .tokens()
         .validate(&new_secret, &fixtures::now())
         .await
         .expect("the newly-issued secret should be valid");
-    assert_eq!(identity.user, login);
+    assert_eq!(identity.user, new_identity.user);
 
     // Verify that our original token is no longer valid
     let validate_err = app
@@ -72,10 +72,10 @@ async fn password_change() {
         .login(&name, &to, &fixtures::now())
         .await
         .expect("logging in with the new password should succeed");
-    let (_, login) = app
+    let identity = app
         .tokens()
         .validate(&secret, &fixtures::now())
         .await
         .expect("validating a newly-issued token secret succeeds");
-    assert_eq!(identity.user, login);
+    assert_eq!(name, identity.user.name);
 }