summaryrefslogtreecommitdiff
path: root/src/invite/handlers
diff options
context:
space:
mode:
Diffstat (limited to 'src/invite/handlers')
-rw-r--r--src/invite/handlers/accept/mod.rs8
-rw-r--r--src/invite/handlers/accept/test.rs9
2 files changed, 8 insertions, 9 deletions
diff --git a/src/invite/handlers/accept/mod.rs b/src/invite/handlers/accept/mod.rs
index 9fa4d6a..cdf385f 100644
--- a/src/invite/handlers/accept/mod.rs
+++ b/src/invite/handlers/accept/mod.rs
@@ -7,12 +7,12 @@ use axum::{
use crate::{
app::App,
clock::RequestedAt,
+ empty::Empty,
error::{Internal, NotFound},
invite::{app, handlers::PathInfo},
name::Name,
password::Password,
token::extract::IdentityCookie,
- user::User,
};
#[cfg(test)]
@@ -24,14 +24,14 @@ pub async fn handler(
identity: IdentityCookie,
Path(invite): Path<PathInfo>,
Json(request): Json<Request>,
-) -> Result<(IdentityCookie, Json<User>), Error> {
- let (login, secret) = app
+) -> Result<(IdentityCookie, Empty), Error> {
+ let secret = app
.invites()
.accept(&invite, &request.name, &request.password, &accepted_at)
.await
.map_err(Error)?;
let identity = identity.set(secret);
- Ok((identity, Json(login)))
+ Ok((identity, Empty))
}
#[derive(serde::Deserialize)]
diff --git a/src/invite/handlers/accept/test.rs b/src/invite/handlers/accept/test.rs
index 7139985..adc7aa4 100644
--- a/src/invite/handlers/accept/test.rs
+++ b/src/invite/handlers/accept/test.rs
@@ -1,6 +1,6 @@
use axum::extract::{Json, Path, State};
-use crate::{invite::app::AcceptError, name::Name, test::fixtures};
+use crate::{empty::Empty, invite::app::AcceptError, name::Name, test::fixtures};
#[tokio::test]
async fn valid_invite() {
@@ -18,7 +18,7 @@ async fn valid_invite() {
name: name.clone(),
password: password.clone(),
};
- let (identity, Json(response)) = super::handler(
+ let (identity, Empty) = super::handler(
State(app.clone()),
fixtures::now(),
identity,
@@ -31,7 +31,6 @@ async fn valid_invite() {
// Verify the response
assert!(identity.secret().is_some());
- assert_eq!(name, response.name);
// Verify that the issued token is valid
@@ -43,7 +42,7 @@ async fn valid_invite() {
.validate(&secret, &fixtures::now())
.await
.expect("newly-issued identity cookie is valid");
- assert_eq!(response, login);
+ assert_eq!(name, login.name);
// Verify that the given credentials can log in
@@ -57,7 +56,7 @@ async fn valid_invite() {
.validate(&secret, &fixtures::now())
.await
.expect("validating a newly-issued token secret succeeds");
- assert_eq!(response, login);
+ assert_eq!(name, login.name);
}
#[tokio::test]