feat: record a complete roundtrip stripe purchase #156

joelhooks · 2024-04-19T15:52:26Z

migrated the pricing widget and styles - build is still broken, but getting close just needed to git this stuff committed adds local mysql support via docker compose

added adapter pieces to load the required data

also casually update to latest next canary

vercel · 2024-04-19T15:52:33Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
course-builder-docs	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Apr 24, 2024 4:00pm
course-builder-poc	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Apr 24, 2024 4:00pm
pro-aws	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Apr 24, 2024 4:00pm

…ro-aws # Conflicts: # apps/course-builder-web/src/app/api/coursebuilder/[...nextCourseBuilder]/route.ts # apps/course-builder-web/src/coursebuilder/course-builder-config.ts # apps/course-builder-web/src/coursebuilder/stripe-payment-adapter.ts # apps/course-builder-web/src/db/index.ts # apps/course-builder-web/src/env.mjs # packages/adapter-drizzle/src/lib/mysql/index.ts # packages/core/src/lib/actions/index.ts # packages/core/src/lib/index.ts # packages/core/src/providers/index.ts # packages/core/src/providers/stripe.ts # packages/core/src/types.ts # pnpm-lock.yaml

joelhooks · 2024-04-19T16:02:32Z

apps/course-builder-web/src/app/api/auth/[...nextauth]/route.ts

@@ -3,5 +3,3 @@ import { withSkill } from '@/server/with-skill'

 export const GET = withSkill(authGet)
 export const POST = withSkill(authPost)
-
-export const runtime = 'edge' // optional


joelhooks · 2024-04-19T16:03:11Z

apps/course-builder-web/src/coursebuilder/email-provider.ts

+export const emailProvider = EmailProvider({
+	server: {
+		host: env.EMAIL_SERVER_HOST,
+		port: env.EMAIL_SERVER_PORT,
+		auth: {
+			user: env.POSTMARK_KEY,
+			pass: env.POSTMARK_KEY,
+		},
+	},
+})


haven't used this yet, but that's the next step to process post-purchase

joelhooks · 2024-04-19T16:04:17Z

apps/course-builder-web/src/coursebuilder/stripe-payment-adapter.ts

@@ -5,6 +5,7 @@ import { type PaymentsAdapter } from '@coursebuilder/core/types'

 export class StripePaymentAdapter implements PaymentsAdapter {


this payment adapter is pretty nice in practice! will be interesting to see how it holds up with additional service providers, but i think it should do well

apps/course-builder-web/src/db/index.ts

joelhooks · 2024-04-19T16:05:57Z

packages/adapter-drizzle/src/lib/mysql/index.ts

@@ -222,7 +221,7 @@ export function mySqlDrizzleAdapter(
 		client,
 		createMerchantCustomer: async (options) => {
 			await client.insert(merchantCustomer).values({
-				id: v4(),
+				id: `mc_${v4()}`,


having the prefix is super handy

joelhooks · 2024-04-19T16:07:47Z

packages/core/src/inngest/stripe/event-checkout-session-completed.ts

+		const stripeEvent = event.data.stripeEvent
+		const paymentsAdapter = paymentProvider.options.paymentsAdapter
+		const stripeCheckoutSession = stripeEvent.data.object
+
+		const merchantAccount = await step.run(
+			'load the merchant account',
+			async () => {
+				return await db.getMerchantAccount({
+					provider: 'stripe',
+				})
+			},
+		)
+
+		if (!merchantAccount) {
+			throw new Error('Merchant account not found')
+		}
+
+		const checkoutSession = await step.run(
+			'get stripe checkout session',
+			async () => {
+				return await paymentsAdapter.getCheckoutSession(
+					stripeCheckoutSession.id,
+				)
+			},
+		)
+
+		const purchaseInfo = await step.run('parse checkout session', async () => {
+			return await parseCheckoutSession(checkoutSession, db)
+		})
+
+		const { user, isNewUser } = await step.run('load the user', async () => {
+			if (!purchaseInfo.email) {
+				throw new Error('purchaseInfo.email is null')
+			}
+			return await db.findOrCreateUser(purchaseInfo.email)
+		})
+
+		const merchantProduct = await step.run(
+			'load the merchant product',
+			async () => {
+				return await db.getMerchantProduct(purchaseInfo.productIdentifier)
+			},
+		)
+
+		const merchantCustomer = await step.run(
+			'load the merchant customer',
+			async () => {
+				return await db.findOrCreateMerchantCustomer({
+					user: user as User,
+					identifier: purchaseInfo.customerIdentifier,
+					merchantAccountId: merchantAccount.id,
+				})
+			},
+		)
+
+		return await step.run('create a merchant charge and purchase', async () => {
+			if (!merchantProduct) {
+				throw new Error('merchantProduct is null')
+			}
+			if (!merchantCustomer) {
+				throw new Error('merchantCustomer is null')
+			}
+			return await db.createMerchantChargeAndPurchase({
+				userId: user.id,
+				productId: merchantProduct.productId,
+				stripeChargeId: purchaseInfo.chargeIdentifier,
+				stripeCouponId: purchaseInfo.couponIdentifier,
+				merchantAccountId: merchantAccount.id,
+				merchantProductId: merchantProduct.id,
+				merchantCustomerId: merchantCustomer.id,
+				stripeChargeAmount: purchaseInfo.chargeAmount,
+				quantity: purchaseInfo.quantity,
+				checkoutSessionId: stripeCheckoutSession.id,
+				country: purchaseInfo.metadata?.country,
+				appliedPPPStripeCouponId:
+					purchaseInfo.metadata?.appliedPPPStripeCouponId,
+				upgradedFromPurchaseId: purchaseInfo.metadata?.upgradedFromPurchaseId,
+				usedCouponId: purchaseInfo.metadata?.usedCouponId,
+			})
+		})
+	}


this turned out very nice/clean via the adapters

joelhooks · 2024-04-19T16:08:18Z

packages/core/src/lib/pricing/process-stripe-webhook.ts

+	created: 1713381550,
+	data: {
+		object: {
+			id: 'cs_test_a1HUHxQCrAdyfBpHFGeL6Rg5gmTWK7f4hN09zB9Bk8cJBtWDLTYZeMCyqP',
+			object: 'checkout.session',
+			after_expiration: null,
+			allow_promotion_codes: null,
+			amount_subtotal: 1000,
+			amount_total: 1000,
+			automatic_tax: { enabled: false, liability: null, status: null },
+			billing_address_collection: null,
+			cancel_url:
+				'https://neatly-diverse-goldfish.ngrok-free.app/checkout-cancel',
+			client_reference_id: null,
+			client_secret: null,
+			consent: null,
+			consent_collection: null,
+			created: 1713381530,
+			currency: 'usd',
+			currency_conversion: null,
+			custom_fields: [],
+			custom_text: {
+				after_submit: null,
+				shipping_address: null,
+				submit: null,
+				terms_of_service_acceptance: null,
+			},
+			customer: 'cus_Pvsd48NJAKWjQ4',
+			customer_creation: null,
+			customer_details: {
+				address: {
+					city: null,
+					country: 'US',
+					line1: null,
+					line2: null,
+					postal_code: '42424',
+					state: null,
+				},
+				email: 'joelhooks@gmail.com',
+				name: '42424',
+				phone: null,
+				tax_exempt: 'none',
+				tax_ids: [],
+			},
+			customer_email: null,
+			expires_at: 1713424729,
+			invoice: null,
+			invoice_creation: {
+				enabled: false,
+				invoice_data: {
+					account_tax_ids: null,
+					custom_fields: null,
+					description: null,
+					footer: null,
+					issuer: null,
+					metadata: {},
+					rendering_options: null,
+				},
+			},
+			livemode: false,
+			locale: null,
+			metadata: {
+				siteName: 'inngest-gpt',
+				userId: '57b0d091-9dfa-4f03-8774-e43f1ec5f3b8',
+				country: 'US',
+				productId: 'product_cluq5r0jl000008jp20fbfsgs',
+				bulk: 'true',
+				product: 'Test Event Product',
+				ip_address: '',
+			},
+			mode: 'payment',
+			payment_intent: 'pi_3P6e0MAclagrtXef0vs1HBZt',
+			payment_link: null,
+			payment_method_collection: 'always',
+			payment_method_configuration_details: null,
+			payment_method_options: { card: { request_three_d_secure: 'automatic' } },
+			payment_method_types: ['card'],
+			payment_status: 'paid',
+			phone_number_collection: { enabled: false },
+			recovered_from: null,
+			setup_intent: null,
+			shipping: null,
+			shipping_address_collection: null,
+			shipping_options: [],
+			shipping_rate: null,
+			status: 'complete',
+			submit_type: null,
+			subscription: null,
+			success_url:
+				'https://neatly-diverse-goldfish.ngrok-free.app/checkout-success/thanks/purchase?session_id={CHECKOUT_SESSION_ID}&provider=stripe',
+			total_details: { amount_discount: 0, amount_shipping: 0, amount_tax: 0 },
+			ui_mode: 'hosted',
+			url: null,
+		},
+	},
+	livemode: false,
+	pending_webhooks: 2,
+	request: { id: null, idempotency_key: null },
+	type: 'checkout.session.completed',
+}


for reference and probably mocks in the future

joelhooks · 2024-04-19T16:09:29Z

packages/core/src/lib/utils/providers.ts

+		// having the adapter class here made it go into a tailspin
+
+		const { paymentsAdapter, ...userOptionsWithPaymentsAdapter } = userOptions
+
+		console.log({ userOptionsWithPaymentsAdapter, defaults })
+
+		return {
+			...merge(defaults, userOptionsWithPaymentsAdapter),
+			...(paymentsAdapter ? { options: paymentsAdapter } : {}),
+		}


this was annoying so i punted otherwise merge hits the call stack limit via recursion

joelhooks · 2024-04-19T16:10:40Z

packages/core/src/lib/utils/web.ts

+async function getBody(
+	req: Request,
+	config: CourseBuilderConfig,
+): Promise<Record<string, any> | undefined> {
+	const headers = Object.fromEntries(req.headers)
+	const isStripeWebhook = ['stripe-signature'].every((prop: string) => {
+		return prop in headers
+	})
+
+	if (isStripeWebhook) {
+		let parsedBody
+		const stripeProvider = config.providers.find((p: any) => p.id === 'stripe')
+		parsedBody = await req.text()
+		stripeProvider?.options?.paymentsAdapter.verifyWebhookSignature(
+			parsedBody,
+			headers['stripe-signature'],
+		)
+		parsedBody = JSON.parse(parsedBody)
+		return parsedBody
+	}
+


this took forever to figure out because you can't call await response.[text|json]() more than once and for stripe to verify you need the raw body 💀

joelhooks · 2024-04-19T16:11:19Z

packages/next/src/index.tsx

+	const httpHandler = async (req: NextRequest) => {
+		const stripeHeader = headers().get('stripe-signature')
+		const isWebhook = ['stripe-signature'].every((prop: string) => {
+			console.log('prop', prop)
+			return prop in req.headers
+		})
+
+		// const body = await req.text()
+
+		const newReq = reqWithEnvURL(req)
+
+		console.log('hah', { isWebhook, stripeHeader, config })
+		const handler = CourseBuilder(newReq, config)
+
+		// const body = await newReq.text()
+		// console.log('body', body)
+
+		return handler
+	}


the one where joel tries to figure out body parsing errors

…ro-aws # Conflicts: # pnpm-lock.yaml

joelhooks and others added 21 commits April 10, 2024 15:39

chipping away at the errors for the pricing widget

34a5d35

massive changeset 🤡

fad904e

migrated the pricing widget and styles - build is still broken, but getting close just needed to git this stuff committed adds local mysql support via docker compose

revert to serverless driver

07da3c2

style(proaws): markdown

7d37c89

style(proaws): opengraph image

be79fe3

style(proaws): bring back opengraph images

8210e79

Update .env.example

c22d6e2

stripe checkout builds without error

0b7bfbd

added adapter pieces to load the required data

stripe checkout redirects to stripe

3582de3

use a stripe adapter to wrap the client

f156dfa

fix some build related stuff

97c72f7

also casually update to latest next canary

Merge branch 'main' into joel/pricing-widget-pro-aws

6d35fe1

fix some build related stuff

1ddfd3d

rename from Stripe to Payments provider

7891f20

clean logs

e5a250c

small bit of code tidying

1d869d1

small bit of code tidying

221c393

stripe webhook handler handles

1b4eb0f

stripe webhooks sends inngest event

d24c04f

chore: use standard mysql driver

1353f5c

feat: complete purchase gets recorded

b5de092

vercel bot deployed to Preview – course-builder-docs April 19, 2024 15:52 View deployment

vercel bot had a problem deploying to Preview – pro-aws April 19, 2024 15:54 Failure

vercel bot had a problem deploying to Preview – course-builder-poc April 19, 2024 15:55 Failure

vercel bot deployed to Preview – course-builder-docs April 19, 2024 16:02 View deployment

vercel bot had a problem deploying to Preview – pro-aws April 19, 2024 16:05 Failure

vercel bot had a problem deploying to Preview – course-builder-poc April 19, 2024 16:05 Failure

joelhooks commented Apr 19, 2024

View reviewed changes

Merge branch 'main' into joel/pricing-widget-pro-aws

4b238ce

vercel bot deployed to Preview – course-builder-docs April 23, 2024 21:56 View deployment

vercel bot deployed to Preview – course-builder-poc April 23, 2024 21:59 View deployment

vercel bot had a problem deploying to Preview – pro-aws April 23, 2024 22:00 Failure

fix: pro-aws needed update for trpc

83facd7

vercel bot deployed to Preview – course-builder-docs April 24, 2024 15:01 View deployment

vercel bot deployed to Preview – course-builder-poc April 24, 2024 15:01 View deployment

vercel bot deployed to Preview – pro-aws April 24, 2024 15:04 View deployment

joelhooks added 3 commits April 24, 2024 08:23

chore: update some libraries

f7e59cb

Merge remote-tracking branch 'origin/main' into joel/pricing-widget-p…

fd2d835

…ro-aws # Conflicts: # pnpm-lock.yaml

chore: lock file conflicts

8c898b5

vercel bot deployed to Preview – course-builder-docs April 24, 2024 15:24 View deployment

vercel bot deployed to Preview – pro-aws April 24, 2024 15:27 View deployment

vercel bot deployed to Preview – course-builder-poc April 24, 2024 15:27 View deployment

joelhooks added 2 commits April 24, 2024 08:50

misc 🤡

4aa6186

Merge branch 'main' into joel/pricing-widget-pro-aws

cad6aad

vercel bot deployed to Preview – course-builder-docs April 24, 2024 15:51 View deployment

vercel bot deployed to Preview – course-builder-poc April 24, 2024 15:54 View deployment

vercel bot deployed to Preview – pro-aws April 24, 2024 15:54 View deployment

gotta have the stub

2d2d3c6

vercel bot deployed to Preview – course-builder-docs April 24, 2024 15:55 View deployment

vercel bot deployed to Preview – pro-aws April 24, 2024 15:56 View deployment

vercel bot deployed to Preview – course-builder-poc April 24, 2024 15:57 View deployment

add changeset

108bffc

vercel bot deployed to Preview – course-builder-docs April 24, 2024 15:59 View deployment

vercel bot deployed to Preview – pro-aws April 24, 2024 16:00 View deployment

vercel bot deployed to Preview – course-builder-poc April 24, 2024 16:00 View deployment

joelhooks merged commit 18169be into main Apr 24, 2024
15 checks passed

joelhooks deleted the joel/pricing-widget-pro-aws branch April 24, 2024 16:08

joelhooks mentioned this pull request Apr 24, 2024

chore(release): 📦 version packages #159

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: record a complete roundtrip stripe purchase #156

feat: record a complete roundtrip stripe purchase #156

joelhooks commented Apr 19, 2024

vercel bot commented Apr 19, 2024 •

edited

Loading

joelhooks Apr 19, 2024

joelhooks Apr 19, 2024

joelhooks Apr 19, 2024

joelhooks Apr 19, 2024

joelhooks Apr 19, 2024

joelhooks Apr 19, 2024

joelhooks Apr 19, 2024

joelhooks Apr 19, 2024

joelhooks Apr 19, 2024

		@@ -5,6 +5,7 @@ import { type PaymentsAdapter } from '@coursebuilder/core/types'

		export class StripePaymentAdapter implements PaymentsAdapter {

feat: record a complete roundtrip stripe purchase #156

feat: record a complete roundtrip stripe purchase #156

Conversation

joelhooks commented Apr 19, 2024

vercel bot commented Apr 19, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vercel bot commented Apr 19, 2024 •

edited

Loading