⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
better stripe logic
Daniel09ea45eec001
diff --git a/lib/api/checkSubscription.ts b/lib/api/checkSubscription.tsindex 6537c221..b459fb36 100644--- a/lib/api/checkSubscription.ts+++ b/lib/api/checkSubscription.ts@@ -2,8 +2,7 @@ import Stripe from "stripe";export default async function checkSubscription(stripeSecretKey: string,- email: string,- priceId: string+ email: string) {const stripe = new Stripe(stripeSecretKey, {apiVersion: "2022-11-15",@@ -33,11 +32,7 @@ export default async function checkSubscription(new Date((subscription.canceled_at + secondsInTwoWeeks) * 1000));- return (- subscription?.items?.data?.some(- (subscriptionItem) => subscriptionItem?.plan?.id === priceId- ) && isNotCanceledOrHasTime- );+ return subscription?.items?.data[0].plan && isNotCanceledOrHasTime;});diff --git a/lib/api/controllers/users/updateUser.ts b/lib/api/controllers/users/updateUser.tsindex f9535577..5e1d0da5 100644--- a/lib/api/controllers/users/updateUser.ts+++ b/lib/api/controllers/users/updateUser.ts@@ -160,12 +160,10 @@ export default async function updateUser(}const STRIPE_SECRET_KEY = process.env.STRIPE_SECRET_KEY;- const PRICE_ID = process.env.PRICE_ID;- if (STRIPE_SECRET_KEY && PRICE_ID && emailEnabled)+ if (STRIPE_SECRET_KEY && emailEnabled)await updateCustomerEmail(STRIPE_SECRET_KEY,- PRICE_ID,sessionUser.email,user.email as string);diff --git a/lib/api/paymentCheckout.ts b/lib/api/paymentCheckout.tsindex 06dd7e3c..49bf0275 100644--- a/lib/api/paymentCheckout.ts+++ b/lib/api/paymentCheckout.ts@@ -1,5 +1,4 @@import Stripe from "stripe";-import checkSubscription from "./checkSubscription";export default async function paymentCheckout(stripeSecretKey: string,diff --git a/lib/api/updateCustomerEmail.ts b/lib/api/updateCustomerEmail.tsindex 95ebc60d..87e52421 100644--- a/lib/api/updateCustomerEmail.ts+++ b/lib/api/updateCustomerEmail.ts@@ -2,7 +2,6 @@ import Stripe from "stripe";export default async function updateCustomerEmail(stripeSecretKey: string,- priceId: string,email: string,newEmail: string) {@@ -30,11 +29,7 @@ export default async function updateCustomerEmail(new Date((subscription.canceled_at + secondsInTwoWeeks) * 1000));- return (- subscription?.items?.data?.some(- (subscriptionItem) => subscriptionItem?.plan?.id === priceId- ) && isNotCanceledOrHasTime- );+ return subscription?.items?.data[0].plan && isNotCanceledOrHasTime;});diff --git a/pages/api/auth/[...nextauth].ts b/pages/api/auth/[...nextauth].tsindex bdf85c5e..42f9b859 100644--- a/pages/api/auth/[...nextauth].ts+++ b/pages/api/auth/[...nextauth].ts@@ -91,7 +91,6 @@ export const authOptions: AuthOptions = {// Using the `...rest` parameter to be able to narrow down the type based on `trigger`async jwt({ token, trigger, session, user }) {const STRIPE_SECRET_KEY = process.env.STRIPE_SECRET_KEY;- const PRICE_ID = process.env.PRICE_ID;const NEXT_PUBLIC_TRIAL_PERIOD_DAYS =process.env.NEXT_PUBLIC_TRIAL_PERIOD_DAYS;@@ -108,13 +107,11 @@ export const authOptions: AuthOptions = {if (STRIPE_SECRET_KEY &&- PRICE_ID &&(trigger || subscriptionIsTimesUp || !token.isSubscriber)) {const subscription = await checkSubscription(STRIPE_SECRET_KEY,- token.email as string,- PRICE_ID+ token.email as string);if (subscription.subscriptionCanceledAt) {