From 5d3392799f88c5a3d3f9c656c73d6e8ac5c4d793 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Wed, 2 Oct 2024 01:02:58 -0400 Subject: Split login and token handling. --- src/login/routes.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/login/routes.rs') diff --git a/src/login/routes.rs b/src/login/routes.rs index b571bd5..0874cc3 100644 --- a/src/login/routes.rs +++ b/src/login/routes.rs @@ -11,11 +11,9 @@ use crate::{ clock::RequestedAt, error::{Internal, Unauthorized}, login::{Login, Password}, + token::{app, extract::IdentityToken}, }; -use super::app; -use crate::token::extract::IdentityToken; - #[cfg(test)] mod test; @@ -59,7 +57,7 @@ async fn on_login( Json(request): Json, ) -> Result<(IdentityToken, StatusCode), LoginError> { let token = app - .logins() + .tokens() .login(&request.name, &request.password, &now) .await .map_err(LoginError)?; @@ -95,8 +93,8 @@ async fn on_logout( Json(LogoutRequest {}): Json, ) -> Result<(IdentityToken, StatusCode), LogoutError> { if let Some(secret) = identity.secret() { - let (token, _) = app.logins().validate(&secret, &now).await?; - app.logins().logout(&token).await?; + let (token, _) = app.tokens().validate(&secret, &now).await?; + app.tokens().logout(&token).await?; } let identity = identity.clear(); -- cgit v1.2.3