1 files changed, 17 insertions, 11 deletions
diff --git a/src/login/routes.rs b/src/login/routes.rs
index 8d9e938..0874cc3 100644
--- a/src/login/routes.rs
+++ b/src/login/routes.rs
@@ -7,11 +7,13 @@ use axum::{
 };
 
 use crate::{
-    app::App, clock::RequestedAt, error::Internal, password::Password, repo::login::Login,
+    app::App,
+    clock::RequestedAt,
+    error::{Internal, Unauthorized},
+    login::{Login, Password},
+    token::{app, extract::IdentityToken},
 };
 
-use super::{app, extract::IdentityToken};
-
 #[cfg(test)]
 mod test;
 
@@ -22,13 +24,18 @@ pub fn router() -> Router<App> {
         .route("/api/auth/logout", post(on_logout))
 }
 
-async fn boot(login: Login) -> Boot {
-    Boot { login }
+async fn boot(State(app): State<App>, login: Login) -> Result<Boot, Internal> {
+    let resume_point = app.logins().boot_point().await?;
+    Ok(Boot {
+        login,
+        resume_point: resume_point.to_string(),
+    })
 }
 
 #[derive(serde::Serialize)]
 struct Boot {
     login: Login,
+    resume_point: String,
 }
 
 impl IntoResponse for Boot {
@@ -50,7 +57,7 @@ async fn on_login(
     Json(request): Json<LoginRequest>,
 ) -> Result<(IdentityToken, StatusCode), LoginError> {
     let token = app
-        .logins()
+        .tokens()
         .login(&request.name, &request.password, &now)
         .await
         .map_err(LoginError)?;
@@ -66,6 +73,7 @@ impl IntoResponse for LoginError {
         let Self(error) = self;
         match error {
             app::LoginError::Rejected => {
+                // not error::Unauthorized due to differing messaging
                 (StatusCode::UNAUTHORIZED, "invalid name or password").into_response()
             }
             other => Internal::from(other).into_response(),
@@ -85,8 +93,8 @@ async fn on_logout(
     Json(LogoutRequest {}): Json<LogoutRequest>,
 ) -> 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();
@@ -103,9 +111,7 @@ enum LogoutError {
 impl IntoResponse for LogoutError {
     fn into_response(self) -> Response {
         match self {
-            error @ Self::ValidateError(app::ValidateError::InvalidToken) => {
-                (StatusCode::UNAUTHORIZED, error.to_string()).into_response()
-            }
+            Self::ValidateError(app::ValidateError::InvalidToken) => Unauthorized.into_response(),
             other => Internal::from(other).into_response(),
         }
     }