-
Notifications
You must be signed in to change notification settings - Fork 9
feat(credits): enterprise-domain accounts get pro credits; PRO_CREDITS → 9,999 #747
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import { describe, expect, it } from "vitest"; | ||
|
|
||
| import { DEFAULT_CREDITS, PRO_CREDITS } from "@/lib/credits/const"; | ||
|
|
||
| describe("credit plan constants", () => { | ||
| it("keeps the free-tier allotment at 333 (matches chat/lib/consts.ts)", () => { | ||
| expect(DEFAULT_CREDITS).toBe(333); | ||
| }); | ||
|
|
||
| it("gives pro accounts 9999 credits per month (matches chat/lib/consts.ts)", () => { | ||
| expect(PRO_CREDITS).toBe(9999); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| import { beforeEach, describe, expect, it, vi } from "vitest"; | ||
|
|
||
| import { isEnterpriseAccount } from "@/lib/enterprise/isEnterpriseAccount"; | ||
| import selectAccountEmails from "@/lib/supabase/account_emails/selectAccountEmails"; | ||
|
|
||
| vi.mock("@/lib/supabase/account_emails/selectAccountEmails", () => ({ | ||
| default: vi.fn(), | ||
| })); | ||
|
|
||
| const ACCOUNT = "123e4567-e89b-12d3-a456-426614174000"; | ||
|
|
||
| function emailRow(email: string | null) { | ||
| return { account_id: ACCOUNT, email, id: "row-1" } as never; | ||
| } | ||
|
|
||
| describe("isEnterpriseAccount", () => { | ||
| beforeEach(() => { | ||
| vi.clearAllMocks(); | ||
| }); | ||
|
|
||
| it("returns true when an account email's domain is in ENTERPRISE_DOMAINS", async () => { | ||
| vi.mocked(selectAccountEmails).mockResolvedValue([emailRow("artist@seekermusic.com")]); | ||
|
|
||
| await expect(isEnterpriseAccount(ACCOUNT)).resolves.toBe(true); | ||
| expect(selectAccountEmails).toHaveBeenCalledWith({ accountIds: ACCOUNT }); | ||
| }); | ||
|
|
||
| it("matches domains case-insensitively", async () => { | ||
| vi.mocked(selectAccountEmails).mockResolvedValue([emailRow("Artist@SeekerMusic.com")]); | ||
|
|
||
| await expect(isEnterpriseAccount(ACCOUNT)).resolves.toBe(true); | ||
| }); | ||
|
|
||
| it("returns true when any of multiple emails matches", async () => { | ||
| vi.mocked(selectAccountEmails).mockResolvedValue([ | ||
| emailRow("personal@gmail.com"), | ||
| emailRow("work@rostrumrecords.com"), | ||
| ]); | ||
|
|
||
| await expect(isEnterpriseAccount(ACCOUNT)).resolves.toBe(true); | ||
| }); | ||
|
|
||
| it("returns false when no email domain is enterprise", async () => { | ||
| vi.mocked(selectAccountEmails).mockResolvedValue([emailRow("someone@gmail.com")]); | ||
|
|
||
| await expect(isEnterpriseAccount(ACCOUNT)).resolves.toBe(false); | ||
| }); | ||
|
|
||
| it("returns false when the account has no emails", async () => { | ||
| vi.mocked(selectAccountEmails).mockResolvedValue([]); | ||
|
|
||
| await expect(isEnterpriseAccount(ACCOUNT)).resolves.toBe(false); | ||
| }); | ||
|
|
||
| it("returns false for rows with null or malformed emails", async () => { | ||
| vi.mocked(selectAccountEmails).mockResolvedValue([emailRow(null), emailRow("not-an-email")]); | ||
|
|
||
| await expect(isEnterpriseAccount(ACCOUNT)).resolves.toBe(false); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| import { ENTERPRISE_DOMAINS } from "@/lib/enterprise/consts"; | ||
| import { extractDomain } from "@/lib/email/extractDomain"; | ||
| import selectAccountEmails from "@/lib/supabase/account_emails/selectAccountEmails"; | ||
|
|
||
| /** | ||
| * Resolves whether an account belongs to an enterprise customer: true when any | ||
| * of the account's emails has a domain in ENTERPRISE_DOMAINS. Used by the | ||
| * credits system to grant pro status without a Stripe subscription. | ||
| */ | ||
| export async function isEnterpriseAccount(accountId: string): Promise<boolean> { | ||
| const rows = await selectAccountEmails({ accountIds: accountId }); | ||
| return rows.some(row => { | ||
| const domain = row.email ? extractDomain(row.email) : null; | ||
| return domain !== null && ENTERPRISE_DOMAINS.has(domain); | ||
| }); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P2: Credits reads now add an unconditional enterprise-domain DB lookup, even when Stripe already proves the account is pro. This increases per-request load/latency on the hot path; consider running
isEnterpriseAccountonly when both Stripe checks are inactive.Prompt for AI agents