1 files changed, 8 insertions, 19 deletions
diff --git a/src/invite/app.rs b/src/invite/app.rs
index 6800d72..64ba753 100644
--- a/src/invite/app.rs
+++ b/src/invite/app.rs
@@ -7,6 +7,7 @@ use crate::{
     db::{Duplicate as _, NotFound as _},
     event::repo::Provider as _,
     login::{repo::Provider as _, Login, Password},
+    name::Name,
     token::{repo::Provider as _, Secret},
 };
 
@@ -31,13 +32,9 @@ impl<'a> Invites<'a> {
         Ok(invite)
     }
 
-    pub async fn get(&self, invite: &Id) -> Result<Summary, Error> {
+    pub async fn get(&self, invite: &Id) -> Result<Option<Summary>, sqlx::Error> {
         let mut tx = self.db.begin().await?;
-        let invite = tx
-            .invites()
-            .summary(invite)
-            .await
-            .not_found(|| Error::NotFound(invite.clone()))?;
+        let invite = tx.invites().summary(invite).await.optional()?;
         tx.commit().await?;
 
         Ok(invite)
@@ -46,10 +43,10 @@ impl<'a> Invites<'a> {
     pub async fn accept(
         &self,
         invite: &Id,
-        name: &str,
+        name: &Name,
         password: &Password,
         accepted_at: &DateTime,
-    ) -> Result<Secret, AcceptError> {
+    ) -> Result<(Login, Secret), AcceptError> {
         let mut tx = self.db.begin().await?;
         let invite = tx
             .invites()
@@ -72,11 +69,11 @@ impl<'a> Invites<'a> {
             .logins()
             .create(name, &password_hash, &created)
             .await
-            .duplicate(|| AcceptError::DuplicateLogin(name.into()))?;
+            .duplicate(|| AcceptError::DuplicateLogin(name.clone()))?;
         let secret = tx.tokens().issue(&login, accepted_at).await?;
         tx.commit().await?;
 
-        Ok(secret)
+        Ok((login.as_created(), secret))
     }
 
     pub async fn expire(&self, relative_to: &DateTime) -> Result<(), sqlx::Error> {
@@ -92,19 +89,11 @@ impl<'a> Invites<'a> {
 }
 
 #[derive(Debug, thiserror::Error)]
-pub enum Error {
-    #[error("invite not found: {0}")]
-    NotFound(Id),
-    #[error(transparent)]
-    Database(#[from] sqlx::Error),
-}
-
-#[derive(Debug, thiserror::Error)]
 pub enum AcceptError {
     #[error("invite not found: {0}")]
     NotFound(Id),
     #[error("name in use: {0}")]
-    DuplicateLogin(String),
+    DuplicateLogin(Name),
     #[error(transparent)]
     Database(#[from] sqlx::Error),
     #[error(transparent)]