Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #701 from Dokploy/fix/stripe-payments

Browse Source 
fix(stripe): attempt to fix the servers assignation when the user pay
This commit is contained in:
Mauricio Siu
2024-11-13 23:39:49 -06:00
committed by GitHub
parent d081d477ef b6ab653ef3
commit 82fc9897d2
2 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dokploy/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "dokploy", "name": "dokploy",
"version": "v0.11.1", "version": "v0.11.2",
"private": true, "private": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"type": "module", "type": "module",

66
apps/dokploy/pages/api/stripe/webhook.ts
View File

@@ -88,7 +88,6 @@ export default async function handler(
.update(admins) .update(admins)
.set({ .set({
stripeSubscriptionId: newSubscription.id, stripeSubscriptionId: newSubscription.id,
serversQuantity: 0,
stripeCustomerId: newSubscription.customer as string, stripeCustomerId: newSubscription.customer as string,
}) })
.where(eq(admins.stripeCustomerId, newSubscription.customer as string)) .where(eq(admins.stripeCustomerId, newSubscription.customer as string))
@@ -121,12 +120,6 @@ export default async function handler(
} }
case "customer.subscription.updated": { case "customer.subscription.updated": {
const newSubscription = event.data.object as Stripe.Subscription; const newSubscription = event.data.object as Stripe.Subscription;
await db
.update(admins)
.set({
serversQuantity: newSubscription?.items?.data?.[0]?.quantity ?? 0,
})
.where(eq(admins.stripeCustomerId, newSubscription.customer as string));
const admin = await findAdminByStripeCustomerId( const admin = await findAdminByStripeCustomerId(
newSubscription.customer as string, newSubscription.customer as string,
@@ -136,8 +129,27 @@ export default async function handler(
return res.status(400).send("Webhook Error: Admin not found"); return res.status(400).send("Webhook Error: Admin not found");
} }
const newServersQuantity = admin.serversQuantity; if (newSubscription.status === "active") {
await updateServersBasedOnQuantity(admin.adminId, newServersQuantity); await db
.update(admins)
.set({
serversQuantity: newSubscription?.items?.data?.[0]?.quantity ?? 0,
})
.where(
eq(admins.stripeCustomerId, newSubscription.customer as string),
);
const newServersQuantity = admin.serversQuantity;
await updateServersBasedOnQuantity(admin.adminId, newServersQuantity);
} else {
await disableServers(admin.adminId);
await db
.update(admins)
.set({ serversQuantity: 0 })
.where(
eq(admins.stripeCustomerId, newSubscription.customer as string),
);
}
break; break;
} }
@@ -148,6 +160,13 @@ export default async function handler(
newInvoice.subscription as string, newInvoice.subscription as string,
); );
if (suscription.status !== "active") {
console.log(
`Skipping invoice.payment_succeeded for subscription ${suscription.id} with status ${suscription.status}`,
);
break;
}
await db await db
.update(admins) .update(admins)
.set({ .set({
@@ -168,22 +187,29 @@ export default async function handler(
} }
case "invoice.payment_failed": { case "invoice.payment_failed": {
const newInvoice = event.data.object as Stripe.Invoice; const newInvoice = event.data.object as Stripe.Invoice;
await db
.update(admins)
.set({
serversQuantity: 0,
})
.where(eq(admins.stripeCustomerId, newInvoice.customer as string));
const admin = await findAdminByStripeCustomerId( const subscription = await stripe.subscriptions.retrieve(
newInvoice.customer as string, newInvoice.subscription as string,
); );
if (!admin) { if (subscription.status !== "active") {
return res.status(400).send("Webhook Error: Admin not found"); const admin = await findAdminByStripeCustomerId(
newInvoice.customer as string,
);
if (!admin) {
return res.status(400).send("Webhook Error: Admin not found");
}
await db
.update(admins)
.set({
serversQuantity: 0,
})
.where(eq(admins.stripeCustomerId, newInvoice.customer as string));
await disableServers(admin.adminId);
} }
await disableServers(admin.adminId);
break; break;
} }