fix(billing): withhold the free allowance from Gmail aliases of an existing account by waleedlatif1 · Pull Request #9418 · simstudioai/sim

waleedlatif1 · 2026-10-28T19:30:49Z

Summary

Gmail delivers every dot and +tag variant of an address (and its googlemail.com twin) to one inbox, so a single person could register a.b@gmail.com, ab+1@gmail.com, … and get a fresh free allowance on each
A new account whose Gmail inbox another account (banned or not) already holds is now created with no free allowance — same "one free trial per identity" treatment returning deleted-account identities already get; signup itself is never refused, and paid plans and prepaid credit are untouched
Applied on both allowance paths: handleNewUser and the createUserStatsIfMissing fallback, via one identityHadFreeAllowance check
New gmailMailbox() SQL expression in the schema (built on foldedEmail) plus partial index user_gmail_mailbox_idx, so the lookup is an index probe instead of a scan of user; migration builds it CONCURRENTLY
Non-Gmail domains are never folded; fails open (logs, grants the allowance) on lookup error

Type of Change

Bug fix

Testing

lib/users/gmail-alias.integration.ts against real Postgres with INTEGRATION_DB_PROVISION=migrate (exercises migration 0439): 5/5 pass. Disabling the check turns the 3 withholding tests red; one test asserts the plan uses user_gmail_mailbox_idx
lib/billing/core/usage.test.ts: 25/25 pass
check:migrations, check:file-names, check:test-patterns, check:comment-hygiene, biome on touched files; drizzle-kit generate reports no drift
Full type-check / audits / suite left to CI

Checklist

Code follows project style guidelines
Self-reviewed my changes
Tests added/updated and passing (new tests pass the test-audit authoring gate)
No new warnings introduced
I confirm that I have read and agree to the terms outlined in the Contributor License Agreement (CLA)

…isting account

vercel · 2026-10-28T19:30:53Z

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment

Project	Deployment	Actions	Updated
docs	Skipped		Oct 28, 2026 7:58pm UTC

cubic-dev-ai

No issues found across 8 files

Confidence score: 5/5

Automated review surfaced no issues in the provided summaries.
No files require special attention.

_{This PR changes payment, billing, or quota logic. Ultrareviews find 2.4x more serious bugs than standard reviews. Comment @cubic-dev-ai ultrareview to run one.

Turn on auto-fix | Re-trigger cubic}

greptile-apps · 2026-10-28T19:35:20Z

Confidence Score: 5/5

[Medium impact] The PR appears safe to merge with the stated allowance trade-off.

Summary

This PR limits the free allowance to the first account on a Gmail inbox.

Later accounts using an existing Gmail inbox start without the free allowance.

_{Reviews (4) · Last reviewed commit: "fix(billing): count any earlier account ..." · Reviewed by Greptile}

waleedlatif1 · 2026-10-28T19:41:13Z

@greptile

waleedlatif1 · 2026-10-28T19:41:14Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-28T19:41:22Z

@cubic-dev-ai review this PR

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

All reported issues were addressed across 8 files

_{Reply with feedback, questions, or to request a fix.

Turn on auto-fix | Re-trigger cubic}

…x holder

waleedlatif1 · 2026-10-28T19:50:03Z

@greptile

waleedlatif1 · 2026-10-28T19:50:04Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-28T19:50:11Z

@cubic-dev-ai review this PR

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

All reported issues were addressed across 8 files

_{Reply with feedback, questions, or to request a fix.

Turn on auto-fix | Re-trigger cubic}

…rified or not

waleedlatif1 · 2026-10-28T19:58:48Z

@greptile

waleedlatif1 · 2026-10-28T19:58:49Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-28T19:58:55Z

@cubic-dev-ai review this PR

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

No issues found across 8 files

Confidence score: 5/5

Automated review surfaced no issues in the provided summaries.
No files require special attention.

_{Turn on auto-fix | Re-trigger cubic}

fix(billing): withhold the free allowance from Gmail aliases of an ex…

f1a9d8c

…isting account

cubic-dev-ai Bot reviewed Oct 28, 2026

View reviewed changes

greptile-apps Bot reviewed Oct 28, 2026

View reviewed changes

Comment thread apps/sim/lib/users/gmail-alias.ts Outdated

vercel Bot deployed to Preview October 28, 2026 19:40

View deployment

fix(billing): count only an earlier account as the Gmail inbox holder

aaca509

vercel Bot temporarily deployed to Preview October 28, 2026 19:41 Inactive

cubic-dev-ai Bot reviewed Oct 28, 2026

View reviewed changes

Comment thread apps/sim/lib/users/gmail-alias.ts

Comment thread apps/sim/lib/users/gmail-alias.ts

fix(billing): count only a verified earlier account as the Gmail inbo…

47e8605

…x holder

greptile-apps Bot reviewed Oct 28, 2026

View reviewed changes

Comment thread apps/sim/lib/users/gmail-alias.ts Outdated

cubic-dev-ai Bot reviewed Oct 28, 2026

View reviewed changes

Comment thread apps/sim/lib/users/gmail-alias.ts Outdated

fix(billing): count any earlier account as the Gmail inbox holder, ve…

6c64da6

…rified or not

vercel Bot temporarily deployed to Preview October 28, 2026 19:58 Inactive

cubic-dev-ai Bot reviewed Oct 28, 2026

View reviewed changes

waleedlatif1 merged commit fb74b4b into staging Oct 28, 2026
57 checks passed

waleedlatif1 deleted the fix/gmail-alias-free-credit branch October 28, 2026 20:06

This was referenced Oct 29, 2026

v0.9.37: dependency bumps, db improvements, ci fixes #9426

Open

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

Merged

Conversation

waleedlatif1 commented Oct 28, 2026

Summary

Type of Change

Testing

Checklist

Uh oh!

vercel Bot commented Oct 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

greptile-apps Bot commented Oct 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Confidence Score: 5/5

Summary

Uh oh!

Uh oh!

waleedlatif1 commented Oct 28, 2026

Uh oh!

waleedlatif1 commented Oct 28, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 28, 2026

Uh oh!

cubic-dev-ai Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

waleedlatif1 commented Oct 28, 2026

Uh oh!

waleedlatif1 commented Oct 28, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 28, 2026

Uh oh!

Uh oh!

cubic-dev-ai Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

waleedlatif1 commented Oct 28, 2026

Uh oh!

waleedlatif1 commented Oct 28, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 28, 2026

Uh oh!

cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This branch was previously deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

vercel Bot commented Oct 28, 2026 •

edited

Loading

greptile-apps Bot commented Oct 28, 2026 •

edited

Loading

cubic-dev-ai Bot left a comment •

edited

Loading

cubic-dev-ai Bot left a comment •

edited

Loading