Visitar URL original
fix(billing): serialize Gmail inbox allowance decisions so racing alias signups can't both keep it by waleedlatif1 · Pull Request #9431 · simstudioai/sim · GitHub
Skip to content

fix(billing): serialize Gmail inbox allowance decisions so racing alias signups can't both keep it #9431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waleedlatif1 merged 2 commits into from
Oct 29, 2026
Merged

fix(billing): serialize Gmail inbox allowance decisions so racing alias signups can't both keep it #9431

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc956c1
fix(billing): serialize Gmail inbox allowance decisions so racing ali…
waleedlatif1 Oct 29, 2026
14b5fb2
fix(billing): restore lock_timeout after taking the Gmail inbox lock
waleedlatif1 Oct 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix(billing): restore lock_timeout after taking the Gmail inbox lock
  • Loading branch information
@waleedlatif1
waleedlatif1 committed Oct 29, 2026
commit 14b5fb2c73c21abe709e5bac15d20c8c6850fc30
4 changes: 2 additions & 2 deletions apps/sim/lib/users/free-allowance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { userHasGmailAliasAccount } from '@/lib/users/gmail-alias'
/**
* Whether a new user's identity already had the free allowance: its email or a
* linked sign-in (with `includeSignIns`) belonged to a recently deleted account,
* or an earlier account holds its Gmail inbox. Every path that creates a user's
* stats row decides its allowance with this.
* or an earlier account holds its Gmail inbox. Signup, the stats-row fallback,
* and the admin balance grant decide a new row's allowance with this.
*/
export async function identityHadFreeAllowance(
userId: string,
Expand Down
13 changes: 6 additions & 7 deletions apps/sim/lib/users/gmail-alias.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { createLogger } from '@sim/logger'
import { and, eq, gt, lt, or, sql } from 'drizzle-orm'
import { alias } from 'drizzle-orm/pg-core'
import { isBillingEnabled } from '@/lib/core/config/env-flags'
import { acquireAdvisoryXactLock } from '@/lib/db/advisory-locks'
import { acquireAdvisoryXactLock, withLockTimeout } from '@/lib/db/advisory-locks'
import type { DbOrTx, DbTransaction } from '@/lib/db/types'

/**
Expand Down Expand Up @@ -45,9 +45,8 @@ function createdRelativeToSubject(compare: typeof lt | typeof gt) {

/**
* Serializes free-allowance decisions for the Gmail inbox this user's address
* delivers to, until `tx` ends. Takes no lock for any other address. Bounds
* `lock_timeout` for the rest of `tx`, so take it in a short transaction of
* its own.
* delivers to, until `tx` ends. Takes no lock for any other address. The wait
* is bounded by its own `lock_timeout`, restored once the lock is held.
*/
export async function acquireGmailInboxLock(tx: DbTransaction, userId: string): Promise<void> {
if (!isBillingEnabled) return
Expand All @@ -57,10 +56,10 @@ export async function acquireGmailInboxLock(tx: DbTransaction, userId: string):
.where(eq(user.id, userId))
.limit(1)
if (!row?.mailbox) return
await tx.execute(
sql`select set_config('lock_timeout', ${`${GMAIL_INBOX_LOCK_TIMEOUT_MS}ms`}, true)`
const mailbox = row.mailbox
await withLockTimeout(tx, GMAIL_INBOX_LOCK_TIMEOUT_MS, () =>
acquireAdvisoryXactLock(tx, 'gmail_inbox', `gmail-inbox:${mailbox}`)
)
await acquireAdvisoryXactLock(tx, 'gmail_inbox', `gmail-inbox:${row.mailbox}`)
}

/**
Expand Down
Loading