mirror of
https://github.com/zed-industries/zed.git
synced 2024-10-27 00:41:37 +00:00
Return an optional response when creating users via invites
If the user already exists, we return none. This will allow the web frontend to avoid reporting a "join alpha" user event but also not error. Co-Authored-By: Max Brunsfeld <max@zed.dev> Co-Authored-By: Joseph Lyons <joseph@zed.dev>
This commit is contained in:
parent
c2b9b08944
commit
9858906463
3 changed files with 35 additions and 26 deletions
|
@ -156,7 +156,7 @@ async fn create_user(
|
||||||
Json(params): Json<CreateUserParams>,
|
Json(params): Json<CreateUserParams>,
|
||||||
Extension(app): Extension<Arc<AppState>>,
|
Extension(app): Extension<Arc<AppState>>,
|
||||||
Extension(rpc_server): Extension<Arc<rpc::Server>>,
|
Extension(rpc_server): Extension<Arc<rpc::Server>>,
|
||||||
) -> Result<Json<CreateUserResponse>> {
|
) -> Result<Json<Option<CreateUserResponse>>> {
|
||||||
let user = NewUserParams {
|
let user = NewUserParams {
|
||||||
github_login: params.github_login,
|
github_login: params.github_login,
|
||||||
github_user_id: params.github_user_id,
|
github_user_id: params.github_user_id,
|
||||||
|
@ -165,7 +165,8 @@ async fn create_user(
|
||||||
|
|
||||||
// Creating a user via the normal signup process
|
// Creating a user via the normal signup process
|
||||||
let result = if let Some(email_confirmation_code) = params.email_confirmation_code {
|
let result = if let Some(email_confirmation_code) = params.email_confirmation_code {
|
||||||
app.db
|
if let Some(result) = app
|
||||||
|
.db
|
||||||
.create_user_from_invite(
|
.create_user_from_invite(
|
||||||
&Invite {
|
&Invite {
|
||||||
email_address: params.email_address,
|
email_address: params.email_address,
|
||||||
|
@ -174,6 +175,11 @@ async fn create_user(
|
||||||
user,
|
user,
|
||||||
)
|
)
|
||||||
.await?
|
.await?
|
||||||
|
{
|
||||||
|
result
|
||||||
|
} else {
|
||||||
|
return Ok(Json(None));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// Creating a user as an admin
|
// Creating a user as an admin
|
||||||
else if params.admin {
|
else if params.admin {
|
||||||
|
@ -200,11 +206,11 @@ async fn create_user(
|
||||||
.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(CreateUserResponse {
|
Ok(Json(Some(CreateUserResponse {
|
||||||
user,
|
user,
|
||||||
metrics_id: result.metrics_id,
|
metrics_id: result.metrics_id,
|
||||||
signup_device_id: result.signup_device_id,
|
signup_device_id: result.signup_device_id,
|
||||||
}))
|
})))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
|
|
|
@ -51,7 +51,7 @@ pub trait Db: Send + Sync {
|
||||||
&self,
|
&self,
|
||||||
invite: &Invite,
|
invite: &Invite,
|
||||||
user: NewUserParams,
|
user: NewUserParams,
|
||||||
) -> Result<NewUserResult>;
|
) -> Result<Option<NewUserResult>>;
|
||||||
|
|
||||||
/// Registers a new project for the given user.
|
/// Registers a new project for the given user.
|
||||||
async fn register_project(&self, host_user_id: UserId) -> Result<ProjectId>;
|
async fn register_project(&self, host_user_id: UserId) -> Result<ProjectId>;
|
||||||
|
@ -482,7 +482,7 @@ impl Db for PostgresDb {
|
||||||
&self,
|
&self,
|
||||||
invite: &Invite,
|
invite: &Invite,
|
||||||
user: NewUserParams,
|
user: NewUserParams,
|
||||||
) -> Result<NewUserResult> {
|
) -> Result<Option<NewUserResult>> {
|
||||||
let mut tx = self.pool.begin().await?;
|
let mut tx = self.pool.begin().await?;
|
||||||
|
|
||||||
let (signup_id, existing_user_id, inviting_user_id, signup_device_id): (
|
let (signup_id, existing_user_id, inviting_user_id, signup_device_id): (
|
||||||
|
@ -506,10 +506,7 @@ impl Db for PostgresDb {
|
||||||
.ok_or_else(|| Error::Http(StatusCode::NOT_FOUND, "no such invite".to_string()))?;
|
.ok_or_else(|| Error::Http(StatusCode::NOT_FOUND, "no such invite".to_string()))?;
|
||||||
|
|
||||||
if existing_user_id.is_some() {
|
if existing_user_id.is_some() {
|
||||||
Err(Error::Http(
|
return Ok(None);
|
||||||
StatusCode::UNPROCESSABLE_ENTITY,
|
|
||||||
"invitation already redeemed".to_string(),
|
|
||||||
))?;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let (user_id, metrics_id): (UserId, String) = sqlx::query_as(
|
let (user_id, metrics_id): (UserId, String) = sqlx::query_as(
|
||||||
|
@ -576,12 +573,12 @@ impl Db for PostgresDb {
|
||||||
}
|
}
|
||||||
|
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
Ok(NewUserResult {
|
Ok(Some(NewUserResult {
|
||||||
user_id,
|
user_id,
|
||||||
metrics_id,
|
metrics_id,
|
||||||
inviting_user_id,
|
inviting_user_id,
|
||||||
signup_device_id,
|
signup_device_id,
|
||||||
})
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
// invite codes
|
// invite codes
|
||||||
|
@ -1958,7 +1955,7 @@ mod test {
|
||||||
&self,
|
&self,
|
||||||
_invite: &Invite,
|
_invite: &Invite,
|
||||||
_user: NewUserParams,
|
_user: NewUserParams,
|
||||||
) -> Result<NewUserResult> {
|
) -> Result<Option<NewUserResult>> {
|
||||||
unimplemented!()
|
unimplemented!()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -852,6 +852,7 @@ async fn test_invite_codes() {
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
.unwrap()
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let (_, invite_count) = db.get_invite_code_for_user(user1).await.unwrap().unwrap();
|
let (_, invite_count) = db.get_invite_code_for_user(user1).await.unwrap().unwrap();
|
||||||
assert_eq!(invite_count, 1);
|
assert_eq!(invite_count, 1);
|
||||||
|
@ -897,6 +898,7 @@ async fn test_invite_codes() {
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
.unwrap()
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let (_, invite_count) = db.get_invite_code_for_user(user1).await.unwrap().unwrap();
|
let (_, invite_count) = db.get_invite_code_for_user(user1).await.unwrap().unwrap();
|
||||||
assert_eq!(invite_count, 0);
|
assert_eq!(invite_count, 0);
|
||||||
|
@ -954,6 +956,7 @@ async fn test_invite_codes() {
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
.unwrap()
|
.unwrap()
|
||||||
|
.unwrap()
|
||||||
.user_id;
|
.user_id;
|
||||||
|
|
||||||
let (_, invite_count) = db.get_invite_code_for_user(user1).await.unwrap().unwrap();
|
let (_, invite_count) = db.get_invite_code_for_user(user1).await.unwrap().unwrap();
|
||||||
|
@ -1099,6 +1102,7 @@ async fn test_signups() {
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
.unwrap()
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let user = db.get_user_by_id(user_id).await.unwrap().unwrap();
|
let user = db.get_user_by_id(user_id).await.unwrap().unwrap();
|
||||||
assert!(inviting_user_id.is_none());
|
assert!(inviting_user_id.is_none());
|
||||||
|
@ -1108,7 +1112,8 @@ async fn test_signups() {
|
||||||
assert_eq!(signup_device_id.unwrap(), "device_id_0");
|
assert_eq!(signup_device_id.unwrap(), "device_id_0");
|
||||||
|
|
||||||
// cannot redeem the same signup again.
|
// cannot redeem the same signup again.
|
||||||
db.create_user_from_invite(
|
assert!(db
|
||||||
|
.create_user_from_invite(
|
||||||
&Invite {
|
&Invite {
|
||||||
email_address: signups_batch1[0].email_address.clone(),
|
email_address: signups_batch1[0].email_address.clone(),
|
||||||
email_confirmation_code: signups_batch1[0].email_confirmation_code.clone(),
|
email_confirmation_code: signups_batch1[0].email_confirmation_code.clone(),
|
||||||
|
@ -1120,7 +1125,8 @@ async fn test_signups() {
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
.unwrap_err();
|
.unwrap()
|
||||||
|
.is_none());
|
||||||
|
|
||||||
// cannot redeem a signup with the wrong confirmation code.
|
// cannot redeem a signup with the wrong confirmation code.
|
||||||
db.create_user_from_invite(
|
db.create_user_from_invite(
|
||||||
|
|
Loading…
Reference in a new issue