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 11:51:47 -06:00
parent b3038c2de9
commit 37fcfeab8d
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,6 +74,7 @@ async fn get_users(Extension(app): Extension<Arc<AppState>>) -> Result<Json<Vec<
#[derive(Deserialize)] #[derive(Deserialize)]
struct CreateUserParams { struct CreateUserParams {
github_login: String, github_login: String,
invite_code: Option<String>,
admin: bool, admin: bool,
} }
@ -81,16 +82,23 @@ 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_id = app let user = if let Some(invite_code) = params.invite_code {
.db let user_id = app
.create_user(&params.github_login, params.admin) .db
.await?; .redeem_invite_code(&invite_code, &params.github_login)
.await?
} else {
let user_id = app
.db
.create_user(&params.github_login, params.admin)
.await?;
let user = app let user = app
.db .db
.get_user_by_id(user_id) .get_user_by_id(user_id)
.await? .await?
.ok_or_else(|| anyhow!("couldn't find the user we just created"))?; .ok_or_else(|| anyhow!("couldn't find the user we just created"))?
};
Ok(Json(user)) Ok(Json(user))
} }