⚡️⚡️⚡️ 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
harden revenuecat logic throughout the codebase
daniel31x1352f7916bd596
diff --git a/apps/web/lib/api/controllers/users/postUser.ts b/apps/web/lib/api/controllers/users/postUser.tsindex 53d69ae0..4ba10396 100644--- a/apps/web/lib/api/controllers/users/postUser.ts+++ b/apps/web/lib/api/controllers/users/postUser.ts@@ -26,17 +26,6 @@ export default async function postUser(return { response: "Registration is disabled.", status: 400 };}- if (- !parentUser?.subscriptions?.stripeSubscriptionId ||- parentUser.subscriptions.revenueCatOriginalTransactionId- ) {- return {- response:- "Adding seats is only supported if you subscribed on web using Stripe.",- status: 400,- };- }-const dataValidation = PostUserSchema().safeParse(req.body);if (!dataValidation.success) {@@ -56,6 +45,12 @@ export default async function postUser(return { response: "You are not authorized to invite users.", status: 401 };} else if (invite && !parentUser) {return { response: "You must be logged in to invite users.", status: 401 };+ } else if (invite && parentUser?.subscriptions?.provider !== "STRIPE") {+ return {+ response:+ "Adding seats is only supported if you subscribed on web using Stripe.",+ status: 400,+ };}const autoGeneratedUsername = "user" + Math.round(Math.random() * 1000000000);@@ -113,6 +108,7 @@ export default async function postUser(create: {stripeSubscriptionId:"fake_sub_" + Math.round(Math.random() * 10000000000000),+ provider: "STRIPE",active: true,currentPeriodStart: new Date(),currentPeriodEnd: new Date(diff --git a/apps/web/lib/api/controllers/users/userId/deleteUserById.ts b/apps/web/lib/api/controllers/users/userId/deleteUserById.tsindex 973b0558..d2d78433 100644--- a/apps/web/lib/api/controllers/users/userId/deleteUserById.ts+++ b/apps/web/lib/api/controllers/users/userId/deleteUserById.ts@@ -90,7 +90,11 @@ export default async function deleteUserById(},});- if (removeUser.emailVerified && user.subscriptions.stripeSubscriptionId)+ if (+ removeUser.emailVerified &&+ user.subscriptions.provider === "STRIPE" &&+ user.subscriptions.stripeSubscriptionId+ )await updateSeats(user.subscriptions.stripeSubscriptionId,user.subscriptions.quantity - 1@@ -132,7 +136,10 @@ export default async function deleteUserById(await removeFile({ filePath: `uploads/avatar/${queryId}.jpg` });- if (process.env.STRIPE_SECRET_KEY) {+ if (+ process.env.STRIPE_SECRET_KEY &&+ user.subscriptions?.provider === "STRIPE"+ ) {const stripe = stripeSDK();// Send an email about cancellation reason if provideddiff --git a/apps/web/lib/api/stripe/checkRevenuecatSubscription.ts b/apps/web/lib/api/stripe/checkRevenuecatSubscription.tsnew file mode 100644index 00000000..d8f68381--- /dev/null+++ b/apps/web/lib/api/stripe/checkRevenuecatSubscription.ts@@ -0,0 +1,72 @@+type RevenueCatSubscription = {+ id: string;+ product_id: string;+ current_period_starts_at: number | null;+ current_period_ends_at: number | null;+ store_subscription_identifier: string | number | null;+ gives_access: boolean;+ status: string;+ entitlements?: {+ items?: {+ lookup_key?: string;+ state?: string;+ }[];+ };+};++export default async function checkRevenuecatSubscription(appUserId: string) {+ const projectId = process.env.REVENUECAT_PROJECT_ID;+ const apiKey = process.env.REVENUECAT_API_KEY;++ if (!projectId || !apiKey)+ throw new Error(+ `Missing REVENUECAT_PROJECT_ID/REVENUECAT_API_KEY envirnonment variables!`+ );++ const entitlementId = "Linkwarden Cloud";++ const res = await fetch(+ `https://api.revenuecat.com/v2/projects/${projectId}/customers/${encodeURIComponent(+ appUserId+ )}/subscriptions?limit=20`,+ {+ headers: {+ Authorization: `Bearer ${apiKey}`,+ },+ cache: "no-store",+ }+ );++ if (res.status === 404) return null;+ if (!res.ok) throw new Error(`RevenueCat API error: ${res.status}`);++ const data = (await res.json()) as { items?: RevenueCatSubscription[] };++ const sub = data.items+ ?.filter((s) => {+ const hasEntitlement = s.entitlements?.items?.some(+ (e) => e.lookup_key === entitlementId && e.state === "active"+ );++ return s.gives_access && hasEntitlement;+ })+ .sort(+ (a, b) =>+ (b.current_period_ends_at ?? 0) - (a.current_period_ends_at ?? 0)+ )[0];++ if (!sub?.current_period_starts_at || !sub?.current_period_ends_at) {+ return null;+ }++ return {+ active: sub.gives_access,+ revenueCatSubscriptionId: sub.id,+ revenueCatProductId: sub.product_id,+ revenueCatOriginalTransactionId: sub.store_subscription_identifier+ ? String(sub.store_subscription_identifier)+ : null,+ currentPeriodStart: new Date(sub.current_period_starts_at),+ currentPeriodEnd: new Date(sub.current_period_ends_at),+ };+}diff --git a/apps/web/lib/api/stripe/checkSubscriptionByEmail.ts b/apps/web/lib/api/stripe/checkStripeSubscriptionByEmail.tssimilarity index 90%rename from apps/web/lib/api/stripe/checkSubscriptionByEmail.tsrename to apps/web/lib/api/stripe/checkStripeSubscriptionByEmail.tsindex e95c2f4d..f10bdd19 100644--- a/apps/web/lib/api/stripe/checkSubscriptionByEmail.ts+++ b/apps/web/lib/api/stripe/checkStripeSubscriptionByEmail.ts@@ -2,7 +2,7 @@ import stripeSDK from "./stripeSDK";const STRIPE_SECRET_KEY = process.env.STRIPE_SECRET_KEY;-export default async function checkSubscriptionByEmail(email: string) {+export default async function checkStripeSubscriptionByEmail(email: string) {if (!STRIPE_SECRET_KEY) return null;const stripe = stripeSDK();diff --git a/apps/web/lib/api/stripe/handleSubscription.ts b/apps/web/lib/api/stripe/handleSubscription.tsindex 4e6f1f10..376ecec7 100644--- a/apps/web/lib/api/stripe/handleSubscription.ts+++ b/apps/web/lib/api/stripe/handleSubscription.ts@@ -75,6 +75,7 @@ export default async function handleSubscription({},create: {active,+ provider: "STRIPE",stripeSubscriptionId: id,quantity,currentPeriodStart: new Date(periodStart * 1000),diff --git a/apps/web/lib/api/stripe/verifySubscription.ts b/apps/web/lib/api/stripe/verifySubscription.tsindex 4ac385af..edc34036 100644--- a/apps/web/lib/api/stripe/verifySubscription.ts+++ b/apps/web/lib/api/stripe/verifySubscription.ts@@ -1,6 +1,7 @@import { prisma } from "@linkwarden/prisma";import { Subscription, User } from "@linkwarden/prisma/client";-import checkSubscriptionByEmail from "./checkSubscriptionByEmail";+import checkStripeSubscriptionByEmail from "./checkStripeSubscriptionByEmail";+import checkRevenuecatSubscription from "./checkRevenuecatSubscription";interface UserIncludingSubscription extends User {subscriptions: Subscription | null;@@ -38,48 +39,91 @@ export default async function verifySubscription(new Date() > user.subscriptions.currentPeriodEnd) &&(REQUIRE_CC || daysLeft <= 0)) {- const subscription = await checkSubscriptionByEmail(user.email as string);+ if (user.subscriptions?.provider === "STRIPE") {+ const subscription = await checkStripeSubscriptionByEmail(+ user.email as string+ );- if (- !subscription ||- !subscription.stripeSubscriptionId ||- !subscription.currentPeriodEnd ||- !subscription.currentPeriodStart ||- !subscription.quantity- ) {- return null;- }+ if (+ !subscription ||+ !subscription.stripeSubscriptionId ||+ !subscription.currentPeriodEnd ||+ !subscription.currentPeriodStart ||+ !subscription.quantity+ ) {+ return null;+ }++ const {+ active,+ stripeSubscriptionId,+ currentPeriodStart,+ currentPeriodEnd,+ quantity,+ } = subscription;++ await prisma.subscription+ .upsert({+ where: {+ userId: user.id,+ },+ create: {+ active,+ provider: "STRIPE",+ stripeSubscriptionId,+ currentPeriodStart: new Date(currentPeriodStart),+ currentPeriodEnd: new Date(currentPeriodEnd),+ quantity,+ userId: user.id,+ },+ update: {+ active,+ stripeSubscriptionId,+ currentPeriodStart: new Date(currentPeriodStart),+ currentPeriodEnd: new Date(currentPeriodEnd),+ quantity,+ },+ })+ .catch((err) => console.log(err));+ } else {+ // REVENUECAT+ const subscription = await checkRevenuecatSubscription(user.uuid);- const {- active,- stripeSubscriptionId,- currentPeriodStart,- currentPeriodEnd,- quantity,- } = subscription;+ if (+ !subscription ||+ !subscription.currentPeriodEnd ||+ !subscription.revenueCatSubscriptionId ||+ !subscription.currentPeriodStart+ ) {+ return null;+ }- await prisma.subscription- .upsert({- where: {- userId: user.id,- },- create: {- active,- stripeSubscriptionId,- currentPeriodStart: new Date(currentPeriodStart),- currentPeriodEnd: new Date(currentPeriodEnd),- quantity,- userId: user.id,- },- update: {- active,- stripeSubscriptionId,- currentPeriodStart: new Date(currentPeriodStart),- currentPeriodEnd: new Date(currentPeriodEnd),- quantity,- },- })- .catch((err) => console.log(err));+ const { active, currentPeriodStart, currentPeriodEnd } = subscription;++ await prisma.subscription+ .upsert({+ where: {+ userId: user.id,+ },+ create: {+ active,+ provider: "REVENUECAT",+ revenueCatAppUserId: user.uuid,+ currentPeriodStart,+ currentPeriodEnd,+ quantity: 1,+ userId: user.id,+ },+ update: {+ active,+ revenueCatAppUserId: user.uuid,+ currentPeriodStart,+ currentPeriodEnd,+ quantity: 1,+ },+ })+ .catch((err) => console.log(err));+ }}return user;diff --git a/apps/web/pages/api/v1/auth/[...nextauth].ts b/apps/web/pages/api/v1/auth/[...nextauth].tsindex dc887f6a..cfad7c27 100644--- a/apps/web/pages/api/v1/auth/[...nextauth].ts+++ b/apps/web/pages/api/v1/auth/[...nextauth].ts@@ -1339,7 +1339,7 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {},},callbacks: {- async signIn({ user, account, profile, email, credentials }) {+ async signIn({ user, account, email }) {if (!(user as User).emailVerified && !email?.verificationRequest) {const parentSubscriptionId = (user as User).parentSubscriptionId;@@ -1367,6 +1367,7 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {if (STRIPE_SECRET_KEY &&parentSubscription?.quantity &&+ parentSubscription.provider === "STRIPE" &&parentSubscription.stripeSubscriptionId &&verifiedChildUsersCount + 2 > // add current user and the adminparentSubscription.quantitydiff --git a/apps/web/pages/api/v1/webhooks/revenuecat.ts b/apps/web/pages/api/v1/webhooks/revenuecat.tsindex 427c8e7c..3d54391c 100644--- a/apps/web/pages/api/v1/webhooks/revenuecat.ts+++ b/apps/web/pages/api/v1/webhooks/revenuecat.ts@@ -9,8 +9,8 @@ type RevenueCatEvent = {environment?: "PRODUCTION" | "SANDBOX";original_transaction_id?: string;transaction_id?: string;- purchased_at_ms?: number;- expiration_at_ms?: number;+ purchased_at_ms?: number | null;+ expiration_at_ms?: number | null;};const subscriptionEvents = new Set([@@ -24,13 +24,6 @@ const subscriptionEvents = new Set(["TEMPORARY_ENTITLEMENT_GRANT",]);-const isUuid = (value?: string) =>- Boolean(- value?.match(- /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i- )- );-export default async function revenueCatWebhook(req: NextApiRequest,res: NextApiResponse@@ -72,18 +65,8 @@ export default async function revenueCatWebhook(return res.status(200).json({ response: "Sandbox event ignored." });}- const appUserIds = [- event.app_user_id,- event.original_app_user_id,- ...(event.aliases ?? []),- ].filter(isUuid) as string[];-- const originalTransactionId =- event.original_transaction_id ?? event.transaction_id;-if (- appUserIds.length === 0 ||- !originalTransactionId ||+ !event.original_app_user_id ||!event.purchased_at_ms ||!event.expiration_at_ms) {@@ -95,11 +78,9 @@ export default async function revenueCatWebhook(const active = event.type !== "EXPIRATION" && currentPeriodEnd > new Date();try {- const user = await prisma.user.findFirst({+ const user = await prisma.user.findUnique({where: {- uuid: {- in: appUserIds,- },+ uuid: event.original_app_user_id,},});@@ -109,7 +90,7 @@ export default async function revenueCatWebhook(const subscription = await prisma.subscription.findUnique({where: {- revenueCatOriginalTransactionId: originalTransactionId,+ revenueCatAppUserId: event.original_app_user_id,},});@@ -133,7 +114,8 @@ export default async function revenueCatWebhook(},create: {active,- revenueCatOriginalTransactionId: originalTransactionId,+ provider: "REVENUECAT",+ revenueCatAppUserId: event.original_app_user_id,currentPeriodStart,currentPeriodEnd,quantity: 1,@@ -141,7 +123,7 @@ export default async function revenueCatWebhook(},update: {active,- revenueCatOriginalTransactionId: originalTransactionId,+ revenueCatAppUserId: event.original_app_user_id,currentPeriodStart,currentPeriodEnd,quantity: 1,diff --git a/packages/prisma/migrations/20260602170000_add_revenuecat_subscription_id/migration.sql b/packages/prisma/migrations/20260602170000_add_revenuecat_subscription_id/migration.sqldeleted file mode 100644index 07f3455e..00000000--- a/packages/prisma/migrations/20260602170000_add_revenuecat_subscription_id/migration.sql+++ /dev/null@@ -1,8 +0,0 @@--- AlterTable-ALTER TABLE "Subscription" ALTER COLUMN "stripeSubscriptionId" DROP NOT NULL;---- AlterTable-ALTER TABLE "Subscription" ADD COLUMN "revenueCatOriginalTransactionId" TEXT;---- CreateIndex-CREATE UNIQUE INDEX "Subscription_revenueCatOriginalTransactionId_key" ON "Subscription"("revenueCatOriginalTransactionId");diff --git a/packages/prisma/migrations/20260603151955_add_revenuecat_support_for_the_database/migration.sql b/packages/prisma/migrations/20260603151955_add_revenuecat_support_for_the_database/migration.sqlnew file mode 100644index 00000000..f8b44544--- /dev/null+++ b/packages/prisma/migrations/20260603151955_add_revenuecat_support_for_the_database/migration.sql@@ -0,0 +1,23 @@+/*+ Warnings:++ - A unique constraint covering the columns `[revenueCatAppUserId]` on the table `Subscription` will be added. If there are existing duplicate values, this will fail.+ - Added the required column `provider` to the `Subscription` table without a default value. This is not possible if the table is not empty.++*/+-- CreateEnum+CREATE TYPE "SubscriptionProvider" AS ENUM ('STRIPE', 'REVENUECAT');++-- AlterTable: add provider as NULLABLE first so existing rows aren't rejected+ALTER TABLE "Subscription" ADD COLUMN "provider" "SubscriptionProvider",+ADD COLUMN "revenueCatAppUserId" UUID,+ALTER COLUMN "stripeSubscriptionId" DROP NOT NULL;++-- Backfill: every existing row with a Stripe subscription ID is a Stripe subscription+UPDATE "Subscription" SET "provider" = 'STRIPE' WHERE "stripeSubscriptionId" IS NOT NULL;++-- Now enforce NOT NULL to match the schema+ALTER TABLE "Subscription" ALTER COLUMN "provider" SET NOT NULL;++-- CreateIndex+CREATE UNIQUE INDEX "Subscription_revenueCatAppUserId_key" ON "Subscription"("revenueCatAppUserId");\ No newline at end of filediff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prismaindex e659224e..98b5e108 100644--- a/packages/prisma/schema.prisma+++ b/packages/prisma/schema.prisma@@ -219,18 +219,24 @@ model Tag {}model Subscription {- id Int @id @default(autoincrement())- active Boolean- stripeSubscriptionId String? @unique- revenueCatOriginalTransactionId String? @unique- currentPeriodStart DateTime- currentPeriodEnd DateTime- quantity Int @default(1)- user User @relation(fields: [userId], references: [id], onDelete: Cascade)- userId Int @unique- childUsers User[] @relation("ChildUsers")- createdAt DateTime @default(now())- updatedAt DateTime @default(now()) @updatedAt+ id Int @id @default(autoincrement())+ active Boolean+ stripeSubscriptionId String? @unique+ revenueCatAppUserId String? @unique @db.Uuid+ currentPeriodStart DateTime+ currentPeriodEnd DateTime+ quantity Int @default(1)+ provider SubscriptionProvider+ user User @relation(fields: [userId], references: [id], onDelete: Cascade)+ userId Int @unique+ childUsers User[] @relation("ChildUsers")+ createdAt DateTime @default(now())+ updatedAt DateTime @default(now()) @updatedAt+}++enum SubscriptionProvider {+ STRIPE+ REVENUECAT}model AccessToken {