Skip to content

fix(authorization): paid plan entitlement assigned by email instead of stable user ID #18

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

Open
rixel-code wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(authorization): paid plan entitlement assigned by email instead of stable user ID #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions lib/billing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ export async function applyOrderPaidEntitlement(
}

const order = parsed.data;
const normalizedEmail = order.customer.email.toLowerCase();
const planSlug = order.productId ? planByProductId.get(order.productId) : null;
const planSlug = order.productId
? planByProductId.get(order.productId)
: null;

if (!planSlug) {
console.warn("[Polar] Unmapped product in order.paid", {
Expand All @@ -43,17 +44,29 @@ export async function applyOrderPaidEntitlement(
return;
}

const user = await prisma.user.findUnique({ where: { email: normalizedEmail } })
let user = order.customer.externalId
? await prisma.user.findUnique({ where: { id: order.customer.externalId } })
: null;

if (!user) {
const normalizedEmail = order.customer.email.toLowerCase();
user = await prisma.user.findUnique({ where: { email: normalizedEmail } });
}

if (!user) {
console.error("[Polar] No matching user for paid order", {
orderId: order.id,
email: normalizedEmail,
externalId: order.customer.externalId,
email: order.customer.email.toLowerCase(),
});
return;
}

// Idempotent: skip if this order was already applied
if (user.polarLastOrderId === order.id) {
return;
}

await prisma.user.update({
where: { id: user.id },
data: {
Expand Down
Loading