Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
Nathan Sobo 2022-05-18 16:14:58 -06:00
parent 37fcfeab8d
commit 51f9b915a0
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/collab/src/api.rs
View file

@ -82,24 +82,22 @@ async fn create_user(
Json(params): Json<CreateUserParams>, Json(params): Json<CreateUserParams>,
Extension(app): Extension<Arc<AppState>>, Extension(app): Extension<Arc<AppState>>,
) -> Result<Json<User>> { ) -> Result<Json<User>> {
let user = if let Some(invite_code) = params.invite_code { let user_id = if let Some(invite_code) = params.invite_code {
let user_id = app app.db
.db
.redeem_invite_code(&invite_code, &params.github_login) .redeem_invite_code(&invite_code, &params.github_login)
.await? .await?
} else { } else {
let user_id = app app.db
.db
.create_user(&params.github_login, params.admin) .create_user(&params.github_login, params.admin)
.await?;
let user = app
.db
.get_user_by_id(user_id)
.await? .await?
.ok_or_else(|| anyhow!("couldn't find the user we just created"))?
}; };
let user = app
.db
.get_user_by_id(user_id)
.await?
.ok_or_else(|| anyhow!("couldn't find the user we just created"))?;
Ok(Json(user)) Ok(Json(user))
} }