fix: do not use user_link for deleted accounts

Emyrk · Emyrk · commit 16a74b05870c · 2024-02-12T15:52:39.000-06:00
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -3762,6 +3762,10 @@ func (q *FakeQuerier) GetUserLinkByLinkedID(_ context.Context, id string) (datab
 	defer q.mutex.RUnlock()
 
 	for _, link := range q.userLinks {
+		user, err := q.getUserByIDNoLock(link.UserID)
+		if err == nil && user.Deleted {
+			continue
+		}
 		if link.LinkedID == id {
 			return link, nil
 		}
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/user_links.sql b/coderd/database/queries/user_links.sql
@@ -1,10 +1,14 @@
 -- name: GetUserLinkByLinkedID :one
 SELECT
-	*
+	user_links.*
 FROM
 	user_links
+INNER JOIN
+	users ON user_links.user_id = users.id
 WHERE
-	linked_id = $1;
+	linked_id = $1
+	AND
+	deleted = false;
 
 -- name: GetUserLinkByUserIDLoginType :one
 SELECT
diff --git a/coderd/userauth_test.go b/coderd/userauth_test.go
@@ -661,6 +661,8 @@ func TestUserOAuth2Github(t *testing.T) {
 
 		client, _ = fake.Login(t, client, jwt.MapClaims{})
 		deleted, err := client.User(ctx, "me")
+		require.NoError(t, err)
+
 		err = owner.DeleteUser(ctx, deleted.ID)
 		require.NoError(t, err)
 
