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

Author: waleedlatif1

apps/sim/lib/users/gmail-alias.integration.ts

@@ -24,23 +24,26 @@ const userIds: string[] = []
 
 async function insertUser(
   email: string,
-  { banned = false, createdAt = new Date() } = {}
+  { banned = false, emailVerified = true, createdAt = new Date() } = {}
 ): Promise<string> {
   const id = generateId()
   userIds.push(id)
   await db.insert(user).values({
     id,
     name: 'Gmail alias fixture',
     email,
-    emailVerified: true,
+    emailVerified,
     banned,
     createdAt,
     updatedAt: createdAt,
   })
   return id
 }
 
-async function signUp(email: string, options?: { banned?: boolean }): Promise<string> {
+async function signUp(
+  email: string,
+  options?: { banned?: boolean; emailVerified?: boolean }
+): Promise<string> {
   const id = await insertUser(email, options)
   await handleNewUser(id, {})
   return id
@@ -90,6 +93,15 @@ describe('Gmail inboxes and the free allowance', () => {
     expect(await statsOf(returning)).toEqual({ freeTierEligible: false, limit: 0 })
   })
 
+  it('grants it when the earlier account never verified the inbox', async () => {
+    const local = uniqueLocalPart()
+    await signUp(`${local}@gmail.com`, { emailVerified: false })
+
+    const owner = await signUp(`${local.slice(0, 5)}.${local.slice(5)}@gmail.com`)
+
+    expect(await statsOf(owner)).toEqual({ freeTierEligible: true, limit: getFreeTierLimit() })
+  })
+
   it('grants it to a different Gmail inbox and never folds addresses outside Gmail', async () => {
     const local = uniqueLocalPart()
     await signUp(`${local}@gmail.com`)

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

@@ -21,11 +21,13 @@ const logger = createLogger('GmailAlias')
  * Whether an earlier account, banned or not, already holds the Gmail inbox this
  * user's address delivers to. Only an account created before this one counts
  * (the id breaks a creation-time tie), so the inbox's first account keeps the
- * allowance however late its own stats row is created. Pass the caller's
- * transaction as `executor` to read on it; the read then runs in a savepoint,
- * so a failed lookup never aborts that transaction. Fails open: a lookup error
- * returns `false` and is logged, because refusing a legitimate person's
- * allowance is worse than one missed match.
+ * allowance however late its own stats row is created. It must have verified
+ * the address, so an account that merely claimed someone else's inbox never
+ * withholds that person's allowance. Pass the caller's transaction as
+ * `executor` to read on it; the read then runs in a savepoint, so a failed
+ * lookup never aborts that transaction. Fails open: a lookup error returns
+ * `false` and is logged, because refusing a legitimate person's allowance is
+ * worse than one missed match.
  */
 export async function userHasGmailAliasAccount(
   userId: string,
@@ -45,6 +47,7 @@ export async function userHasGmailAliasAccount(
       .where(
         and(
           sql`${gmailMailbox(user.email)} = ${self.mailbox}`,
+          eq(user.emailVerified, true),
           or(
             lt(user.createdAt, self.createdAt),
             and(eq(user.createdAt, self.createdAt), lt(user.id, userId))