mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-25 19:29:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Proceed gracefully when someone signs up repeatedly

Browse source
This commit is contained in:
Max Brunsfeld 2022-09-20 16:23:02 -07:00
parent 758875305b
commit 20ec933e23
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/collab/src/db.rs
View file

@ -458,21 +458,29 @@ impl Db for PostgresDb {
) -> Result<(UserId, Option<UserId>)> {
let mut tx = self.pool.begin().await?;
let (signup_id, metrics_id, inviting_user_id): (i32, i32, Option<UserId>) = sqlx::query_as(
let (signup_id, metrics_id, existing_user_id, inviting_user_id): (
i32,
i32,
Option<UserId>,
Option<UserId>,
) = sqlx::query_as(
"
SELECT id, metrics_id, inviting_user_id
SELECT id, metrics_id, user_id, inviting_user_id
FROM signups
WHERE
email_address = $1 AND
email_confirmation_code = $2 AND
user_id is NULL
email_confirmation_code = $2
",
)
.bind(&invite.email_address)
.bind(&invite.email_confirmation_code)
.fetch_optional(&mut tx)
.await?
.ok_or_else(|| anyhow!("no such invite"))?;
.ok_or_else(|| Error::Http(StatusCode::NOT_FOUND, "no such invite".to_string()))?;
if existing_user_id.is_some() {
Err(Error::Http(StatusCode::UNPROCESSABLE_ENTITY, "invitation already redeemed".to_string()))?;
}
let user_id: UserId = sqlx::query_scalar(
"