Skip to content
Draft
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
728bcd0
refactor: create explicit type for processor IDs
Genyus Jul 26, 2025
61f5e73
refactor: move revenue calculation to processors
Genyus Jul 26, 2025
d3f3ed6
docs: improve comments
Genyus Jul 26, 2025
51d05ca
fix: update imports after previous refactoring
Genyus Jul 28, 2025
f07fa91
refactor: convert processor IDs to enum values
Genyus Jul 28, 2025
2b42cc6
feat: add validation of server env vars
Genyus Jul 28, 2025
a0276a3
feat: add initial Polar integration
Genyus Jul 28, 2025
0ebd0a3
feat: implement total revenue calculation
Genyus Jul 28, 2025
e84670d
feat: implement customer portal URL retrieval
Genyus Jul 28, 2025
54292a7
feat: implement checkout session creation
Genyus Jul 28, 2025
156823c
feat: implement webhook handling
Genyus Jul 28, 2025
2841121
feat: add dynamic payment processor selection
Genyus Jul 29, 2025
825eb66
fix: implement webhook handling
Genyus Jul 31, 2025
6ad783b
chore: rename file for consistency
Genyus Jul 31, 2025
a97b79f
Merge branch 'main' into polar
Genyus Jul 31, 2025
eb68932
fix: address typing errors
Genyus Aug 6, 2025
fca11f9
fix: resolve type assignment error
Genyus Aug 7, 2025
c71f29a
refactor: streamline payment processor integration
Genyus Aug 17, 2025
732b9ed
style: remove redundant JSDoc comments
Genyus Aug 17, 2025
2410e01
refactor: simplify error handling
Genyus Aug 21, 2025
f65cc67
refactor: fix customer portal implementation
Genyus Aug 21, 2025
df213c9
chore: update webhook response status codes
Genyus Aug 21, 2025
5f71cac
refactor: remove iteration for single customer lookup
Genyus Aug 21, 2025
882df67
refactor: simplify webhook error handling
Genyus Aug 21, 2025
7d0eb4e
refactor: rename polar client
Genyus Aug 21, 2025
3639c0d
refactor: refactor client configuration
Genyus Aug 21, 2025
2f5748c
refactor: remove standalone client config file
Genyus Aug 21, 2025
e5a63de
style: remove extraneous JSDoc comments
Genyus Aug 21, 2025
fda6a57
refactor: remove standalone type declarations file
Genyus Aug 21, 2025
add2038
docs: remove unnecessary README
Genyus Aug 21, 2025
254aae4
refactor: remodel webhook to align with current integrations
Genyus Aug 21, 2025
780d24c
fix: resolves issues found in testing
Genyus Aug 22, 2025
568c38b
chore: mention Polar as an available payment platform
Genyus Aug 22, 2025
721fd6f
chore: remove env validation
Genyus Aug 22, 2025
31ad46c
chore: remove redundant guard
Genyus Aug 22, 2025
f5892aa
chore: remove unsupported event type
Genyus Aug 22, 2025
32c8934
fix: update order completion handler
Genyus Aug 22, 2025
2b3195c
fix: throw error when credits can't be parsed from order
Genyus Aug 22, 2025
2a64914
revert: revert deletion of validation.ts
Genyus Aug 22, 2025
9658034
Merge pull request #1 from wasp-lang/main
Genyus Aug 22, 2025
033bdfe
chore: rename file for consistency
Genyus Aug 22, 2025
dbcfa08
style: reorder imports
Genyus Aug 22, 2025
e81b2db
fix: correct webhook event support
Genyus Aug 23, 2025
20e95f8
refactor: simplify webhook handlers
Genyus Aug 23, 2025
f31f176
style: restore missing line break
Genyus Aug 23, 2025
3003595
chore: add gitignore rules
Genyus Aug 26, 2025
6cce3fe
refactor: restore centralised payment stats
Genyus Aug 27, 2025
ce97f73
revert: restore original payment processor files
Genyus Aug 27, 2025
27b8ea7
revert: restore paymentProcessor comments
Genyus Aug 27, 2025
6471324
refactor: improve switch condition checking
Genyus Aug 27, 2025
1b72606
refactor: remove unused code
Genyus Aug 28, 2025
b0eaf88
refactor: rename function
Genyus Aug 28, 2025
3defeb9
refactor: simplify user updating
Genyus Aug 28, 2025
2741ea2
refactor: simplify webhook handling
Genyus Aug 28, 2025
543fa92
fix: remove default portal URL
Genyus Aug 28, 2025
ee65871
fix: improve type-safety
Genyus Aug 28, 2025
31a3b0b
fix: restore available processors
Genyus Aug 28, 2025
42cbf32
docs: remove JSDoc comment
Genyus Aug 28, 2025
adde113
refactor: remove redundant file
Genyus Aug 28, 2025
29ec825
refactor: streamline session management
Genyus Aug 29, 2025
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
14 changes: 14 additions & 0 deletions template/app/.env.server.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# If you use `wasp start db` then you DO NOT need to add a DATABASE_URL env variable here.
# DATABASE_URL=

# Supports Stripe, LemonSqueezy, Polar
PAYMENT_PROCESSOR_ID=Stripe
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, it's great to see that you're trying to improve open-saas further above the Polar integration, but I wouldn't do this as part of this PR.

Paddle integration PR had the same problem here:
https://github.com/wasp-lang/open-saas/pull/486/files#r2266908329

Doing in this PR will distract us from the main point (Polar), and will prolong the process to get the feature we want.

I've explained in the Paddle PR (linked above) why we don't believe this approach is right for us.
I would kindly ask you to remove non-Polar parts of the PR.
Thanks for the effort.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FranjoMindek Thanks for the feedback. Happy to proceed, but one of the main reasons I adopted this approach was because I wanted to add e2e tests for Polar and the current architecture makes it impossible to run tests for more than one provider without modifying the source. Do you have any suggestions for how that limitation could be addressed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @Genyus.

Truthfully, e2e-tests are in a bad state and outdated.
We will want to improve them but that is a separate issue.
However we did start opening up issues about them:
#469

I wouldn't be concerned with improving them in this PR.

I think it's okay for now to require people to change the app to test different payment providers in e2e-tests.
What we want of e2e-tests is that we have separate package.json scripts to run for different providers.
So if we have the correct payment provider in app and run the correct script, it works.

So I would rename the current scripts to be more explicit about stripe and then add scripts for Polar.
This is kinda harder to do fully correct because we would have to change a lot of script names.
I would most likely suggest to do minimal changes for now, and we will refactor all of the names then in a separate PR dedicated to e2e-tests.

So just change the script name for running Stripe e2e tests, and add yours to be similarly named.

    "local:e2e:stripe:start": "npm run local:e2e:cleanup-stripe && npm run local:e2e:start-stripe && npm run local:e2e:playwright:ui && npm run local:e2e:cleanup-stripe",
	"local:e2e:polar:start": "...",
},

Copy link
Contributor

@FranjoMindek FranjoMindek Aug 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One thing in code part of e2e-tests you would need to change is to make all "Stripe specific" functions be changed with "payment provider abstract" ones.

Now to know which one to run, you could do the environment variable trick in e2e-tests, but we would set them through npm scripts instead.

e.g. "local:e2e:polar:start": "PAYMENT_PROVIDER=polar ..."

Then those abstract functions would use PAYMENT_PROVIDER to know what to do under the hood.

Copy link
Contributor

@FranjoMindek FranjoMindek Aug 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is probably a better way to do this (but it would require too much changes).
This will allows us to do this PR reasonably fast and without larger changes, and later on we can improve it.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, understood. So I had already created a separate e2e-tests branch to work on these specifically and I use a PAYMENT_PROVIDER_ID env var to handle provider-specific scripts, as you suggested. But I'll leave this alone until I've completed the requested changes to the application code.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, btw ping me here and/or on discord when you are ready for re-review.


# For testing, go to https://dashboard.stripe.com/test/apikeys and get a test stripe key that starts with "sk_test_..."
STRIPE_API_KEY=sk_test_...
# After downloading starting the stripe cli (https://stripe.com/docs/stripe-cli) with `stripe listen --forward-to localhost:3001/payments-webhook` it will output your signing secret
Expand All @@ -17,6 +20,17 @@ LEMONSQUEEZY_STORE_ID=012345
# define your own webhook secret when creating a new webhook on https://app.lemonsqueezy.com/settings/webhooks
LEMONSQUEEZY_WEBHOOK_SECRET=my-webhook-secret

# After creating an organization, you can find your organization id in the organization settings https://sandbox.polar.sh/dashboard/[your org slug]/settings
POLAR_ORGANIZATION_ID=00000000-0000-0000-0000-000000000000
# Generate a token at https://sandbox.polar.sh/dashboard/[your org slug]/settings
POLAR_ACCESS_TOKEN=polar_oat_...
# Define your own webhook secret when creating a new webhook at https://sandbox.polar.sh/dashboard/[your org slug]/settings/webhooks
POLAR_WEBHOOK_SECRET=polar_whs_...
# The unauthenticated URL is at https://sandbox.polar.sh/[your org slug]/portal
POLAR_CUSTOMER_PORTAL_URL=https://sandbox.polar.sh/.../portal
# For production, set this to false, then generate a new organization and products from the live dashboard
POLAR_SANDBOX_MODE=true

# If using Stripe, go to https://dashboard.stripe.com/test/products and click on + Add Product
# If using Lemon Squeezy, go to https://app.lemonsqueezy.com/products and create new products and variants
PAYMENTS_HOBBY_SUBSCRIPTION_PLAN_ID=012345
Expand Down
4 changes: 4 additions & 0 deletions template/app/main.wasp
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ app OpenSaaS {
]
},

server: {
envValidationSchema: import { envValidationSchema } from "@src/server/validation",
},

client: {
rootComponent: import App from "@src/client/App",
},
Expand Down
2 changes: 2 additions & 0 deletions template/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"@headlessui/react": "1.7.13",
"@hookform/resolvers": "^5.1.1",
"@lemonsqueezy/lemonsqueezy.js": "^3.2.0",
"@polar-sh/express": "^0.3.2",
"@polar-sh/sdk": "^0.34.3",
"@radix-ui/react-accordion": "^1.2.11",
"@radix-ui/react-avatar": "^1.1.10",
"@radix-ui/react-checkbox": "^1.3.2",
Expand Down
84 changes: 1 addition & 83 deletions template/app/src/analytics/stats.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { type DailyStats } from 'wasp/entities';
import { type DailyStatsJob } from 'wasp/server/jobs';
import Stripe from 'stripe';
import { stripe } from '../payment/stripe/stripeClient';
import { listOrders } from '@lemonsqueezy/lemonsqueezy.js';
import { getDailyPageViews, getSources } from './providers/plausibleAnalyticsUtils';
// import { getDailyPageViews, getSources } from './providers/googleAnalyticsUtils';
import { paymentProcessor } from '../payment/paymentProcessor';
Expand Down Expand Up @@ -42,18 +39,7 @@ export const calculateDailyStats: DailyStatsJob<never, void> = async (_args, con
paidUserDelta -= yesterdaysStats.paidUserCount;
}

let totalRevenue;
switch (paymentProcessor.id) {
case 'stripe':
totalRevenue = await fetchTotalStripeRevenue();
break;
case 'lemonsqueezy':
totalRevenue = await fetchTotalLemonSqueezyRevenue();
break;
default:
throw new Error(`Unsupported payment processor: ${paymentProcessor.id}`);
}

const totalRevenue = await paymentProcessor.getTotalRevenue();
const { totalViews, prevDayViewsChangePercent } = await getDailyPageViews();

let dailyStats = await context.entities.DailyStats.findUnique({
Expand Down Expand Up @@ -130,71 +116,3 @@ export const calculateDailyStats: DailyStatsJob<never, void> = async (_args, con
});
}
};

async function fetchTotalStripeRevenue() {
let totalRevenue = 0;
let params: Stripe.BalanceTransactionListParams = {
limit: 100,
// created: {
// gte: startTimestamp,
// lt: endTimestamp
// },
type: 'charge',
};

let hasMore = true;
while (hasMore) {
const balanceTransactions = await stripe.balanceTransactions.list(params);

for (const transaction of balanceTransactions.data) {
if (transaction.type === 'charge') {
totalRevenue += transaction.amount;
}
}

if (balanceTransactions.has_more) {
// Set the starting point for the next iteration to the last object fetched
params.starting_after = balanceTransactions.data[balanceTransactions.data.length - 1].id;
} else {
hasMore = false;
}
}

// Revenue is in cents so we convert to dollars (or your main currency unit)
return totalRevenue / 100;
}

async function fetchTotalLemonSqueezyRevenue() {
try {
let totalRevenue = 0;
let hasNextPage = true;
let currentPage = 1;

while (hasNextPage) {
const { data: response } = await listOrders({
filter: {
storeId: process.env.LEMONSQUEEZY_STORE_ID,
},
page: {
number: currentPage,
size: 100,
},
});

if (response?.data) {
for (const order of response.data) {
totalRevenue += order.attributes.total;
}
}

hasNextPage = !response?.meta?.page.lastPage;
currentPage++;
}

// Revenue is in cents so we convert to dollars (or your main currency unit)
return totalRevenue / 100;
} catch (error) {
console.error('Error fetching Lemon Squeezy revenue:', error);
throw error;
}
}
45 changes: 43 additions & 2 deletions template/app/src/payment/lemonSqueezy/paymentProcessor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,54 @@ import type { CreateCheckoutSessionArgs, FetchCustomerPortalUrlArgs, PaymentProc
import { requireNodeEnvVar } from '../../server/utils';
import { createLemonSqueezyCheckoutSession } from './checkoutUtils';
import { lemonSqueezyWebhook, lemonSqueezyMiddlewareConfigFn } from './webhook';
import { lemonSqueezySetup } from '@lemonsqueezy/lemonsqueezy.js';
import { lemonSqueezySetup, listOrders } from '@lemonsqueezy/lemonsqueezy.js';
import { PaymentProcessors } from '../types';

lemonSqueezySetup({
apiKey: requireNodeEnvVar('LEMONSQUEEZY_API_KEY'),
});

/**
* Calculates total revenue from LemonSqueezy orders
* @returns Promise resolving to total revenue in dollars
*/
async function fetchTotalLemonSqueezyRevenue(): Promise<number> {
try {
let totalRevenue = 0;
let hasNextPage = true;
let currentPage = 1;

while (hasNextPage) {
const { data: response } = await listOrders({
filter: {
storeId: process.env.LEMONSQUEEZY_STORE_ID,
},
page: {
number: currentPage,
size: 100,
},
});

if (response?.data) {
for (const order of response.data) {
totalRevenue += order.attributes.total;
}
}

hasNextPage = !response?.meta?.page.lastPage;
currentPage++;
}

// Revenue is in cents so we convert to dollars (or your main currency unit)
return totalRevenue / 100;
} catch (error) {
console.error('Error fetching Lemon Squeezy revenue:', error);
throw error;
}
}

export const lemonSqueezyPaymentProcessor: PaymentProcessor = {
id: 'lemonsqueezy',
id: PaymentProcessors.LemonSqueezy,
createCheckoutSession: async ({ userId, userEmail, paymentPlan }: CreateCheckoutSessionArgs) => {
if (!userId) throw new Error('User ID needed to create Lemon Squeezy Checkout Session');
const session = await createLemonSqueezyCheckoutSession({
Expand All @@ -33,6 +73,7 @@ export const lemonSqueezyPaymentProcessor: PaymentProcessor = {
// This is handled in the Lemon Squeezy webhook.
return user.lemonSqueezyCustomerPortalUrl;
},
getTotalRevenue: fetchTotalLemonSqueezyRevenue,
webhook: lemonSqueezyWebhook,
webhookMiddlewareConfigFn: lemonSqueezyMiddlewareConfigFn,
};
87 changes: 82 additions & 5 deletions template/app/src/payment/paymentProcessor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import type { MiddlewareConfigFn } from 'wasp/server';
import { PrismaClient } from '@prisma/client';
import { stripePaymentProcessor } from './stripe/paymentProcessor';
import { lemonSqueezyPaymentProcessor } from './lemonSqueezy/paymentProcessor';
import { polarPaymentProcessor } from './polar/paymentProcessor';
import { PaymentProcessorId, PaymentProcessors } from './types';
import { getActivePaymentProcessor } from './validation';

export interface CreateCheckoutSessionArgs {
userId: string;
Expand All @@ -16,17 +19,91 @@ export interface FetchCustomerPortalUrlArgs {
prismaUserDelegate: PrismaClient['user'];
};

/**
* Standard interface for all payment processors
* Provides a consistent API for payment operations across different providers
*/
export interface PaymentProcessor {
id: 'stripe' | 'lemonsqueezy';
id: PaymentProcessorId;
/**
* Creates a checkout session for payment processing
* Handles both subscription and one-time payment flows based on the payment plan configuration
* @param args Checkout session creation arguments
* @param args.userId Internal user ID for tracking and database updates
* @param args.userEmail Customer email address for payment processor customer creation/lookup
* @param args.paymentPlan Payment plan configuration containing pricing and payment type information
* @param args.prismaUserDelegate Prisma user delegate for database operations
* @returns Promise resolving to checkout session with session ID and redirect URL
* @throws {Error} When payment processor API calls fail or required configuration is missing
* @example
* ```typescript
* const { session } = await paymentProcessor.createCheckoutSession({
* userId: 'user_123',
* userEmail: '[email protected]',
* paymentPlan: hobbyPlan,
* prismaUserDelegate: context.entities.User
* });
* // Redirect user to session.url for payment
* ```
*/
createCheckoutSession: (args: CreateCheckoutSessionArgs) => Promise<{ session: { id: string; url: string }; }>;
/**
* Retrieves the customer portal URL for subscription and billing management
* Allows customers to view billing history, update payment methods, and manage subscriptions
* @param args Customer portal URL retrieval arguments
* @param args.userId Internal user ID to lookup customer information
* @param args.prismaUserDelegate Prisma user delegate for database operations
* @returns Promise resolving to customer portal URL or null if not available
* @throws {Error} When user lookup fails or payment processor API calls fail
* @example
* ```typescript
* const portalUrl = await paymentProcessor.fetchCustomerPortalUrl({
* userId: 'user_123',
* prismaUserDelegate: context.entities.User
* });
* if (portalUrl) {
* // Redirect user to portal for billing management
* return { redirectUrl: portalUrl };
* }
* ```
*/
fetchCustomerPortalUrl: (args: FetchCustomerPortalUrlArgs) => Promise<string | null>;
/**
* Calculates the total revenue from this payment processor
* @returns Promise resolving to total revenue in dollars
*/
getTotalRevenue: () => Promise<number>;
webhook: PaymentsWebhook;
webhookMiddlewareConfigFn: MiddlewareConfigFn;
}

/**
* Choose which payment processor you'd like to use, then delete the
* other payment processor code that you're not using from `/src/payment`
* All available payment processors
*/
const paymentProcessorMap: Record<PaymentProcessors, PaymentProcessor> = {
[PaymentProcessors.Stripe]: stripePaymentProcessor,
[PaymentProcessors.LemonSqueezy]: lemonSqueezyPaymentProcessor,
[PaymentProcessors.Polar]: polarPaymentProcessor,
};

/**
* Get the payment processor instance based on environment configuration or override
* @param override Optional processor override for testing scenarios
* @returns The configured payment processor instance
* @throws {Error} When the specified processor is not found in the processor map
*/
export function getPaymentProcessor(override?: PaymentProcessorId): PaymentProcessor {
const processorId = getActivePaymentProcessor(override);
const processor = paymentProcessorMap[processorId];

if (!processor) {
throw new Error(`Payment processor '${processorId}' not found. Available processors: ${Object.keys(paymentProcessorMap).join(', ')}`);
}

return processor;
}

/**
* The currently configured payment processor.
*/
// export const paymentProcessor: PaymentProcessor = lemonSqueezyPaymentProcessor;
export const paymentProcessor: PaymentProcessor = stripePaymentProcessor;
export const paymentProcessor: PaymentProcessor = getPaymentProcessor();
Loading