Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

use new api

daniel31x13c08da0f990ba
diff --git a/apps/web/lib/api/controllers/users/userId/deleteUserById.ts b/apps/web/lib/api/controllers/users/userId/deleteUserById.ts
index ebe9525e..b7f183b6 100644
--- a/apps/web/lib/api/controllers/users/userId/deleteUserById.ts
+++ b/apps/web/lib/api/controllers/users/userId/deleteUserById.ts
@@ -1,10 +1,10 @@
import { prisma } from "@linkwarden/prisma";
import bcrypt from "bcrypt";
import { removeFolder, removeFile } from "@linkwarden/filesystem";
-import Stripe from "stripe";
import { DeleteUserBody } from "@linkwarden/types";
import updateSeats from "@/lib/api/stripe/updateSeats";
import { meiliClient } from "@linkwarden/lib";
+import stripeSDK from "@/lib/api/stripe/stripeSDK";
export default async function deleteUserById(
userId: number,
@@ -132,9 +132,7 @@ export default async function deleteUserById(
await removeFile({ filePath: `uploads/avatar/${queryId}.jpg` });
if (process.env.STRIPE_SECRET_KEY) {
- const stripe = new Stripe(process.env.STRIPE_SECRET_KEY, {
- apiVersion: "2022-11-15",
- });
+ const stripe = stripeSDK();
try {
if (user.subscriptions?.id && queryId !== userId) {
diff --git a/apps/web/lib/api/paymentCheckout.ts b/apps/web/lib/api/paymentCheckout.ts
index ba933e39..414f88f2 100644
--- a/apps/web/lib/api/paymentCheckout.ts
+++ b/apps/web/lib/api/paymentCheckout.ts
@@ -1,15 +1,9 @@
-import Stripe from "stripe";
import verifySubscription from "./stripe/verifySubscription";
import { prisma } from "@linkwarden/prisma";
+import stripeSDK from "./stripe/stripeSDK";
-export default async function paymentCheckout(
- stripeSecretKey: string,
- email: string,
- priceId: string
-) {
- const stripe = new Stripe(stripeSecretKey, {
- apiVersion: "2022-11-15",
- });
+export default async function paymentCheckout(email: string, priceId: string) {
+ const stripe = stripeSDK();
const user = await prisma.user.findUnique({
where: {
diff --git a/apps/web/lib/api/stripe/checkSubscriptionByEmail.ts b/apps/web/lib/api/stripe/checkSubscriptionByEmail.ts
index 1df51a7c..e95c2f4d 100644
--- a/apps/web/lib/api/stripe/checkSubscriptionByEmail.ts
+++ b/apps/web/lib/api/stripe/checkSubscriptionByEmail.ts
@@ -1,31 +1,29 @@
-import Stripe from "stripe";
+import stripeSDK from "./stripeSDK";
const STRIPE_SECRET_KEY = process.env.STRIPE_SECRET_KEY;
export default async function checkSubscriptionByEmail(email: string) {
if (!STRIPE_SECRET_KEY) return null;
- const stripe = new Stripe(STRIPE_SECRET_KEY, {
- apiVersion: "2022-11-15",
- });
+ const stripe = stripeSDK();
console.log("Request made to Stripe by:", email);
- const listByEmail = await stripe.customers.list({
+ const customers = await stripe.customers.list({
email: email.toLowerCase(),
- expand: ["data.subscriptions"],
+ expand: ["data.subscriptions.data.items"],
});
- if (listByEmail?.data[0]?.subscriptions?.data[0]) {
- return {
- active: (listByEmail.data[0].subscriptions?.data[0] as any).plan.active,
- stripeSubscriptionId: listByEmail.data[0].subscriptions?.data[0].id,
- currentPeriodStart:
- listByEmail.data[0].subscriptions?.data[0].current_period_start * 1000,
- currentPeriodEnd:
- listByEmail.data[0].subscriptions?.data[0].current_period_end * 1000,
- quantity: (listByEmail?.data[0]?.subscriptions?.data[0] as any).quantity,
- };
- } else {
- return null;
- }
+ const sub = customers.data[0]?.subscriptions?.data?.[0];
+ if (!sub) return null;
+
+ const item = sub.items.data[0];
+ if (!item) return null;
+
+ return {
+ active: sub.status === "active" || sub.status === "trialing",
+ stripeSubscriptionId: sub.id,
+ currentPeriodStart: item.current_period_start * 1000,
+ currentPeriodEnd: item.current_period_end * 1000,
+ quantity: item.quantity ?? 1,
+ };
}
diff --git a/apps/web/lib/api/stripe/handleSubscription.ts b/apps/web/lib/api/stripe/handleSubscription.ts
index 3ff8be74..c62dc08f 100644
--- a/apps/web/lib/api/stripe/handleSubscription.ts
+++ b/apps/web/lib/api/stripe/handleSubscription.ts
@@ -1,5 +1,6 @@
import Stripe from "stripe";
import { prisma } from "@linkwarden/prisma";
+import stripeSDK from "./stripeSDK";
type Data = {
id: string;
@@ -41,12 +42,7 @@ export default async function handleSubscription({
});
return;
} else {
- if (!process.env.STRIPE_SECRET_KEY)
- throw new Error("Missing Stripe secret key");
-
- const stripe = new Stripe(process.env.STRIPE_SECRET_KEY, {
- apiVersion: "2022-11-15",
- });
+ const stripe = stripeSDK();
const subscription = await stripe.subscriptions.retrieve(id);
const customerId = subscription.customer;
diff --git a/apps/web/lib/api/stripe/stripeSDK.ts b/apps/web/lib/api/stripe/stripeSDK.ts
new file mode 100644
index 00000000..05f2a4bc
--- /dev/null
+++ b/apps/web/lib/api/stripe/stripeSDK.ts
@@ -0,0 +1,15 @@
+import Stripe from "stripe";
+
+export default function stripeSDK() {
+ const secretKey = process.env.STRIPE_SECRET_KEY;
+
+ if (!secretKey) {
+ throw new Error("Stripe secret key is not defined");
+ }
+
+ const stripe = new Stripe(secretKey, {
+ apiVersion: "2025-07-30.basil",
+ });
+
+ return stripe;
+}
diff --git a/apps/web/lib/api/stripe/updateCustomerEmail.ts b/apps/web/lib/api/stripe/updateCustomerEmail.ts
index 87e52421..df2eebe5 100644
--- a/apps/web/lib/api/stripe/updateCustomerEmail.ts
+++ b/apps/web/lib/api/stripe/updateCustomerEmail.ts
@@ -1,13 +1,10 @@
-import Stripe from "stripe";
+import stripeSDK from "./stripeSDK";
export default async function updateCustomerEmail(
- stripeSecretKey: string,
email: string,
newEmail: string
) {
- const stripe = new Stripe(stripeSecretKey, {
- apiVersion: "2022-11-15",
- });
+ const stripe = stripeSDK();
const listByEmail = await stripe.customers.list({
email: email.toLowerCase(),
diff --git a/apps/web/lib/api/stripe/updateSeats.ts b/apps/web/lib/api/stripe/updateSeats.ts
index bf061fca..7ed46b68 100644
--- a/apps/web/lib/api/stripe/updateSeats.ts
+++ b/apps/web/lib/api/stripe/updateSeats.ts
@@ -1,4 +1,5 @@
import Stripe from "stripe";
+import stripeSDK from "./stripeSDK";
const STRIPE_SECRET_KEY = process.env.STRIPE_SECRET_KEY;
@@ -7,9 +8,7 @@ const updateSeats = async (subscriptionId: string, seats: number) => {
return;
}
- const stripe = new Stripe(STRIPE_SECRET_KEY, {
- apiVersion: "2022-11-15",
- });
+ const stripe = stripeSDK();
const subscription = await stripe.subscriptions.retrieve(subscriptionId);
diff --git a/apps/web/package.json b/apps/web/package.json
index c385ebd8..f0ccdd0f 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -31,7 +31,7 @@
"@radix-ui/react-slot": "^1.2.3",
"@radix-ui/react-tabs": "^1.1.12",
"@radix-ui/react-tooltip": "^1.2.7",
- "@stripe/stripe-js": "^1.54.1",
+ "@stripe/stripe-js": "^7.8.0",
"@tanstack/react-query": "^5.51.15",
"@tanstack/react-query-devtools": "^5.51.15",
"@types/crypto-js": "^4.1.1",
@@ -84,7 +84,7 @@
"rss": "^1.2.2",
"rss-parser": "^3.13.0",
"socks-proxy-agent": "^8.0.2",
- "stripe": "^12.13.0",
+ "stripe": "^18.4.0",
"tailwind-merge": "^3.3.0",
"tailwindcss": "^3.4.17",
"tailwindcss-animate": "^1.0.7",
diff --git a/apps/web/pages/api/v1/auth/[...nextauth].ts b/apps/web/pages/api/v1/auth/[...nextauth].ts
index 50fbb10d..0afa80c8 100644
--- a/apps/web/pages/api/v1/auth/[...nextauth].ts
+++ b/apps/web/pages/api/v1/auth/[...nextauth].ts
@@ -1258,7 +1258,7 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
// Count child users with verified email under a specific subscription, excluding the current user
const verifiedChildUsersCount = await prisma.user.count({
where: {
- parentSubscriptionId: parentSubscriptionId,
+ parentSubscriptionId,
id: {
not: user.id as number,
},
diff --git a/apps/web/pages/api/v1/auth/verify-email.ts b/apps/web/pages/api/v1/auth/verify-email.ts
index f32908bc..d1fb0a67 100644
--- a/apps/web/pages/api/v1/auth/verify-email.ts
+++ b/apps/web/pages/api/v1/auth/verify-email.ts
@@ -102,8 +102,7 @@ export default async function verifyEmail(
// Apply to Stripe
const STRIPE_SECRET_KEY = process.env.STRIPE_SECRET_KEY;
- if (STRIPE_SECRET_KEY)
- await updateCustomerEmail(STRIPE_SECRET_KEY, oldEmail, newEmail);
+ if (STRIPE_SECRET_KEY) await updateCustomerEmail(oldEmail, newEmail);
// Clean up existing tokens
await prisma.verificationToken.delete({
diff --git a/apps/web/pages/api/v1/payment/index.ts b/apps/web/pages/api/v1/payment/index.ts
index 8e176aa2..2c1f7320 100644
--- a/apps/web/pages/api/v1/payment/index.ts
+++ b/apps/web/pages/api/v1/payment/index.ts
@@ -31,11 +31,7 @@ export default async function users(req: NextApiRequest, res: NextApiResponse) {
PRICE_ID = YEARLY_PRICE_ID;
if (req.method === "GET") {
- const users = await paymentCheckout(
- STRIPE_SECRET_KEY,
- email as string,
- PRICE_ID
- );
+ const users = await paymentCheckout(email as string, PRICE_ID);
return res.status(users.status).json({ response: users.response });
}
}
diff --git a/apps/web/pages/api/v1/webhook/index.ts b/apps/web/pages/api/v1/webhook/index.ts
index 706894db..3147c878 100644
--- a/apps/web/pages/api/v1/webhook/index.ts
+++ b/apps/web/pages/api/v1/webhook/index.ts
@@ -1,6 +1,6 @@
import type { NextApiRequest, NextApiResponse } from "next";
-import Stripe from "stripe";
import handleSubscription from "@/lib/api/stripe/handleSubscription";
+import stripeSDK from "@/lib/api/stripe/stripeSDK";
export const config = {
api: {
@@ -45,9 +45,7 @@ export default async function webhook(
const endpointSecret = process.env.STRIPE_WEBHOOK_SECRET;
- const stripe = new Stripe(process.env.STRIPE_SECRET_KEY, {
- apiVersion: "2022-11-15",
- });
+ const stripe = stripeSDK();
const signature = req.headers["stripe-signature"] as any;
@@ -59,19 +57,23 @@ export default async function webhook(
return res.status(400).send("Webhook signature verification failed.");
}
- // Handle the event based on its type
const eventType = event.type;
const data = event.data.object;
+ const item = data?.items?.data?.[0];
+ const periodStart = item?.current_period_start ?? null;
+ const periodEnd = item?.current_period_end ?? null;
+ const quantity = item?.quantity ?? 1;
+
try {
switch (eventType) {
case "customer.subscription.created":
await handleSubscription({
id: data.id,
active: data.status === "active" || data.status === "trialing",
- quantity: data?.quantity ?? 1,
- periodStart: data.current_period_start,
- periodEnd: data.current_period_end,
+ quantity,
+ periodStart,
+ periodEnd,
action: "customer.subscription.created",
});
break;
@@ -80,9 +82,9 @@ export default async function webhook(
await handleSubscription({
id: data.id,
active: data.status === "active" || data.status === "trialing",
- quantity: data?.quantity ?? 1,
- periodStart: data.current_period_start,
- periodEnd: data.current_period_end,
+ quantity,
+ periodStart,
+ periodEnd,
action: "customer.subscription.updated",
});
break;
@@ -91,9 +93,9 @@ export default async function webhook(
await handleSubscription({
id: data.id,
active: false,
- quantity: data?.lines?.data[0]?.quantity ?? 1,
- periodStart: data.current_period_start,
- periodEnd: data.current_period_end,
+ quantity,
+ periodStart,
+ periodEnd,
action: "customer.subscription.deleted",
});
break;
diff --git a/apps/worker/lib/getLinkBatchFairly.ts b/apps/worker/lib/getLinkBatchFairly.ts
index 8c0e3153..7cd35e0b 100644
--- a/apps/worker/lib/getLinkBatchFairly.ts
+++ b/apps/worker/lib/getLinkBatchFairly.ts
@@ -32,7 +32,10 @@ export default async function getLinkBatchFairly({
while (candidateUserIds.length < maxBatchLinks) {
const baseUserWhere: Prisma.UserWhereInput = {
- subscriptions: { is: { active: true } },
+ OR: [
+ { subscriptions: { is: { active: true } } },
+ { parentSubscription: { is: { active: true } } },
+ ],
};
const userWhere: Prisma.UserWhereInput =
lastPickedAtCursor && lastIdCursor
diff --git a/packages/lib/verifyCapacity.ts b/packages/lib/verifyCapacity.ts
index e33034c7..27eaf97a 100644
--- a/packages/lib/verifyCapacity.ts
+++ b/packages/lib/verifyCapacity.ts
@@ -1,7 +1,7 @@
import { prisma } from "@linkwarden/prisma";
const MAX_LINKS_PER_USER = Number(process.env.MAX_LINKS_PER_USER) || 30000;
-const stripeEnabled = process.env.NEXT_PUBLIC_STRIPE === "true";
+const stripeEnabled = process.env.STRIPE_SECRET_KEY;
export const hasPassedLimit = async (
userId: number,
@@ -10,9 +10,7 @@ export const hasPassedLimit = async (
if (!stripeEnabled) {
const totalLinks = await prisma.link.count({
where: {
- createdBy: {
- id: userId,
- },
+ createdById: userId,
},
});
@@ -21,9 +19,9 @@ export const hasPassedLimit = async (
const user = await prisma.user.findUnique({
where: { id: userId },
- include: {
- parentSubscription: true,
- subscriptions: true,
+ select: {
+ parentSubscriptionId: true,
+ subscriptions: { select: { id: true, quantity: true } },
},
});
@@ -31,29 +29,47 @@ export const hasPassedLimit = async (
return true;
}
- if (
- user.parentSubscription ||
- (user.subscriptions && user.subscriptions?.quantity > 1)
- ) {
- const subscription = user.parentSubscription || user.subscriptions;
+ const subscriptionId = user?.parentSubscriptionId ?? user?.subscriptions?.id;
+ let quantity = user?.subscriptions?.quantity;
+
+ if (!quantity) {
+ quantity = (
+ await prisma.subscription.findUnique({
+ where: { id: subscriptionId },
+ select: { quantity: true },
+ })
+ )?.quantity;
+ }
+
+ if (!subscriptionId || !quantity) return true;
- if (!subscription) {
+ if (user.parentSubscriptionId) {
+ const childCount = await prisma.user.count({
+ where: { parentSubscriptionId: subscriptionId },
+ });
+
+ if (!childCount || childCount + 1 > quantity) {
return true;
}
+ }
+ if (
+ user.parentSubscriptionId ||
+ (user.subscriptions && user.subscriptions?.quantity > 1)
+ ) {
// Calculate the total allowed links for the organization
- const totalCapacity = subscription.quantity * MAX_LINKS_PER_USER;
+ const totalCapacity = quantity * MAX_LINKS_PER_USER;
const totalLinks = await prisma.link.count({
where: {
createdBy: {
OR: [
{
- parentSubscriptionId: subscription.id || undefined,
+ parentSubscriptionId: subscriptionId || undefined,
},
{
subscriptions: {
- id: subscription.id || undefined,
+ id: subscriptionId || undefined,
},
},
],
@@ -65,9 +81,7 @@ export const hasPassedLimit = async (
} else {
const totalLinks = await prisma.link.count({
where: {
- createdBy: {
- id: userId,
- },
+ createdById: userId,
},
});
diff --git a/packages/types/package.json b/packages/types/package.json
index c67ffd3b..2920ce55 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -5,6 +5,6 @@
"main": "index.ts",
"dependencies": {
"@linkwarden/prisma": "*",
- "stripe": "^12.13.0"
+ "stripe": "^18.4.0"
}
}
diff --git a/yarn.lock b/yarn.lock
index 59271655..25a15dd5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4375,10 +4375,10 @@
"@smithy/types" "^2.0.2"
tslib "^2.5.0"
-"@stripe/stripe-js@^1.54.1":
- version "1.54.1"
- resolved "https://registry.yarnpkg.com/@stripe/stripe-js/-/stripe-js-1.54.1.tgz#e298b80c2963d9e622ea355db6c35df48e08cd89"
- integrity sha512-smEXPu1GKMcAj9g2luT16+oXfg2jAwyc68t2Dm5wdtYl3p8PqQaZEiI8tQmboaQAjgF8pIGma6byz1T1vgmpbA==
+"@stripe/stripe-js@^7.8.0":
+ version "7.8.0"
+ resolved "https://registry.yarnpkg.com/@stripe/stripe-js/-/stripe-js-7.8.0.tgz#01390d31030f04b64a7ff13adcccbafd615c7b77"
+ integrity sha512-DNXRfYUgkZlrniQORbA/wH8CdFRhiBSE0R56gYU0V5vvpJ9WZwvGrz9tBAZmfq2aTgw6SK7mNpmTizGzLWVezw==
version "0.5.1"
@@ -4617,13 +4617,6 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708"
integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==
-"@types/node@>=8.1.0", "@types/node@^22.14.0", "@types/node@^22.14.1":
- version "22.14.1"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-22.14.1.tgz#53b54585cec81c21eee3697521e31312d6ca1e6f"
- integrity sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==
- dependencies:
- undici-types "~6.21.0"
-
"@types/node@^20.10.4":
version "20.10.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.4.tgz#b246fd84d55d5b1b71bf51f964bd514409347198"
@@ -4631,6 +4624,13 @@
dependencies:
undici-types "~5.26.4"
+"@types/node@^22.14.0", "@types/node@^22.14.1":
+ version "22.14.1"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-22.14.1.tgz#53b54585cec81c21eee3697521e31312d6ca1e6f"
+ integrity sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==
+ dependencies:
+ undici-types "~6.21.0"
+
"@types/nodemailer@^6.4.8":
version "6.4.8"
resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.8.tgz#f06c661e9b201fc2acc3a00a0fded42ba7eaca9d"
@@ -12513,12 +12513,11 @@ strip-json-comments@~2.0.1:
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
-stripe@^12.13.0:
- version "12.18.0"
- resolved "https://registry.yarnpkg.com/stripe/-/stripe-12.18.0.tgz#1190aec3cf075d0611287046386bf0c0d165db69"
- integrity sha512-cYjgBM2SY/dTm8Lr6eMyyONaHTZHA/QjHxFUIW5WH8FevSRIGAVtXEmBkUXF1fsqe7QvvRgQSGSJZmjDacegGg==
+stripe@^18.4.0:
+ version "18.4.0"
+ resolved "https://registry.yarnpkg.com/stripe/-/stripe-18.4.0.tgz#1c0d5a7ed168f1ecd0f4a80d1e947e615d3eb841"
+ integrity sha512-LKFeDnDYo4U/YzNgx2Lc9PT9XgKN0JNF1iQwZxgkS4lOw5NunWCnzyH5RhTlD3clIZnf54h7nyMWkS8VXPmtTQ==
dependencies:
- "@types/node" ">=8.1.0"
qs "^6.11.0"
strnum@^1.0.5: