Improve Stripe payment provider logic #505
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
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 |
|---|---|---|
| @@ -1,15 +1,20 @@ | ||
| --- template/app/src/payment/stripe/paymentDetails.ts | ||
| +++ opensaas-sh/app/src/payment/stripe/paymentDetails.ts | ||
| @@ -19,7 +19,7 @@ | ||
| ) { | ||
| return userDelegate.update({ | ||
| where: { | ||
| - paymentProcessorUserId: customerId, | ||
| + stripeId: customerId, | ||
| }, | ||
| data: { | ||
| datePaid, | ||
| @@ -46,7 +46,7 @@ | ||
| ) { | ||
| return userDelegate.update({ | ||
| where: { | ||
| - paymentProcessorUserId: customerId, | ||
| + stripeId: customerId, | ||
| }, | ||
| data: { | ||
| subscriptionPlan: paymentPlanId, |
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 |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| --- template/app/src/payment/stripe/paymentProcessor.ts | ||
| +++ opensaas-sh/app/src/payment/stripe/paymentProcessor.ts | ||
| @@ -29,7 +29,7 @@ | ||
| id: userId, | ||
| }, | ||
| data: { | ||
| - paymentProcessorUserId: customer.id, | ||
| + stripeId: customer.id, | ||
| }, | ||
| }); | ||
|
|
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
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 |
|---|---|---|
| @@ -1,64 +1,67 @@ | ||
| import Stripe from "stripe"; | ||
| import { stripeClient } from "./stripeClient"; | ||
|
|
||
| /** | ||
| * Returns a Stripe customer for the given User email, creating a customer if none exist. | ||
| * Implements email uniqueness logic since Stripe doesn't enforce unique emails. | ||
| */ | ||
| export async function ensureStripeCustomer( | ||
| userEmail: string, | ||
| ): Promise<Stripe.Customer> { | ||
| const stripeCustomers = await stripeClient.customers.list({ | ||
| email: userEmail, | ||
| }); | ||
|
|
||
| if (stripeCustomers.data.length === 0) { | ||
| console.log("Creating a new Stripe customer"); | ||
| return stripeClient.customers.create({ | ||
| email: userEmail, | ||
| }); | ||
| } else { | ||
| console.log("Using an existing Stripe customer"); | ||
| return stripeCustomers.data[0]; | ||
| } | ||
| } | ||
|
|
||
| interface CreateStripeCheckoutSessionParams { | ||
| priceId: Stripe.Price["id"]; | ||
| customerId: Stripe.Customer["id"]; | ||
| mode: Stripe.Checkout.Session.Mode; | ||
| } | ||
|
|
||
| export async function createStripeCheckoutSession({ | ||
| priceId, | ||
| customerId, | ||
| mode, | ||
| }: CreateStripeCheckoutSessionParams): Promise<Stripe.Checkout.Session> { | ||
| // WASP_WEB_CLIENT_URL will be set up by Wasp when deploying to production: https://wasp.sh/docs/deploying | ||
|
There was a problem hiding this comment. Reminder to create a issue about solving the env vars situation on There was a problem hiding this comment. this one already exists here #483 |
||
| const CLIENT_BASE_URL = | ||
| process.env.WASP_WEB_CLIENT_URL || "http://localhost:3000"; | ||
|
|
||
| return await stripeClient.checkout.sessions.create({ | ||
| customer: customerId, | ||
| line_items: [ | ||
| { | ||
| price: priceId, | ||
| quantity: 1, | ||
| }, | ||
| ], | ||
| mode, | ||
| success_url: `${CLIENT_BASE_URL}/checkout?status=success`, | ||
| cancel_url: `${CLIENT_BASE_URL}/checkout?status=canceled`, | ||
| automatic_tax: { enabled: true }, | ||
| allow_promotion_codes: true, | ||
| customer_update: { | ||
| address: "auto", | ||
| }, | ||
| // Stripe automatically creates invoices for subscriptions. | ||
| // For one-time payments, we must enable them manually. | ||
| // However, enabling invoices for subscriptions will throw an error. | ||
| invoice_creation: | ||
| mode === "payment" | ||
| ? { | ||
| enabled: true, | ||
| } | ||
| : undefined, | ||
| }); | ||
| } | ||
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 |
|---|---|---|
| @@ -1,36 +1,57 @@ | ||
| import { PrismaClient } from "@prisma/client"; | ||
| import Stripe from "stripe"; | ||
| import type { SubscriptionStatus } from "../plans"; | ||
| import { PaymentPlanId } from "../plans"; | ||
|
|
||
| interface UpdateUserStripeOneTimePaymentDetails { | ||
| customerId: Stripe.Customer["id"]; | ||
| datePaid: Date; | ||
| numOfCreditsPurchased: number; | ||
| } | ||
|
|
||
| export function updateUserStripeOneTimePaymentDetails( | ||
| { | ||
| customerId, | ||
| datePaid, | ||
| numOfCreditsPurchased, | ||
| }: UpdateUserStripeOneTimePaymentDetails, | ||
| userDelegate: PrismaClient["user"], | ||
| ) { | ||
| return userDelegate.update({ | ||
| where: { | ||
| paymentProcessorUserId: customerId, | ||
| }, | ||
| data: { | ||
| datePaid, | ||
| credits: { increment: numOfCreditsPurchased }, | ||
| }, | ||
| }); | ||
| } | ||
|
|
||
| interface UpdateUserStripeSubscriptionDetails { | ||
| customerId: Stripe.Customer["id"]; | ||
| datePaid?: Date; | ||
| subscriptionStatus: SubscriptionStatus; | ||
| paymentPlanId?: PaymentPlanId; | ||
| } | ||
|
|
||
| export function updateUserStripeSubscriptionDetails( | ||
| { | ||
| customerId, | ||
| paymentPlanId, | ||
| subscriptionStatus, | ||
| datePaid, | ||
| }: UpdateUserStripeSubscriptionDetails, | ||
| userDelegate: PrismaClient["user"], | ||
| ) { | ||
| return userDelegate.update({ | ||
| where: { | ||
| paymentProcessorUserId: customerId, | ||
| }, | ||
| data: { | ||
| subscriptionPlan: paymentPlanId, | ||
| subscriptionStatus, | ||
| datePaid, | ||
| }, | ||
| }); | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
Allows us to do e.g.
paymentPlans.credits10.effect.amountwhich would throw before.