From fdf758e05075e15325a798107dced49063dfa423 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 15 Nov 2022 15:36:59 -0700
Subject: [PATCH] Once we email someone an invite, honor the invitation

Previously, we were waiting to decrement the invite_count until a user
confirmed their email address, which created weird situations where we would
email people only to have them get a 500 when trying to sign up. Now, we
decrement the invite_count upon sending the email and always honor the
invitation.

Co-Authored-By: Joseph Lyons <joseph@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
---
 crates/collab/src/db.rs | 46 +++++++++--------------------------------
 1 file changed, 10 insertions(+), 36 deletions(-)

diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index 10da609d57..281c176360 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -350,25 +350,6 @@ impl Db<sqlx::Postgres> {
             .await?;
 
             if let Some(inviting_user_id) = inviting_user_id {
-                let id: Option<UserId> = sqlx::query_scalar(
-                    "
-                    UPDATE users
-                    SET invite_count = invite_count - 1
-                    WHERE id = $1 AND invite_count > 0
-                    RETURNING id
-                    ",
-                )
-                .bind(&inviting_user_id)
-                .fetch_optional(&mut tx)
-                .await?;
-
-                if id.is_none() {
-                    Err(Error::Http(
-                        StatusCode::UNAUTHORIZED,
-                        "no invites remaining".to_string(),
-                    ))?;
-                }
-
                 sqlx::query(
                     "
                     INSERT INTO contacts
@@ -453,31 +434,24 @@ impl Db<sqlx::Postgres> {
                 Err(anyhow!("email address is already in use"))?;
             }
 
-            let row: Option<(UserId, i32)> = sqlx::query_as(
+            let inviting_user_id_with_invites: Option<UserId> = sqlx::query_scalar(
                 "
-                SELECT id, invite_count
-                FROM users
-                WHERE invite_code = $1
+                UPDATE users
+                SET invite_count = invite_count - 1
+                WHERE invite_code = $1 AND invite_count > 0
+                RETURNING id
                 ",
             )
             .bind(code)
             .fetch_optional(&mut tx)
             .await?;
 
-            let (inviter_id, invite_count) = match row {
-                Some(row) => row,
-                None => Err(Error::Http(
-                    StatusCode::NOT_FOUND,
-                    "invite code not found".to_string(),
-                ))?,
-            };
-
-            if invite_count == 0 {
-                Err(Error::Http(
+            let Some(inviter_id) = inviting_user_id_with_invites else {
+                return Err(Error::Http(
                     StatusCode::UNAUTHORIZED,
-                    "no invites remaining".to_string(),
-                ))?;
-            }
+                    "unable to find an invite code with invites remaining".to_string(),
+                ));
+            };
 
             let email_confirmation_code: String = sqlx::query_scalar(
                 "