Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: extend trial option 8581
Marc Seitzbf2ac83a907d
diff --git a/.gitignore b/.gitignoreindex 7bd8587c..e70a0b49 100644--- a/.gitignore+++ b/.gitignore@@ -52,6 +52,7 @@ scripts/*!scripts/generate-openapi.ts!scripts/mcp-smoke.mjs!scripts/check-tool-contracts.sh+!scripts/extend-trial.ts!.github/scripts/# marketing emailsdiff --git a/components/layouts/trial-banner.tsx b/components/layouts/trial-banner.tsxindex 34bef890..eeb9729c 100644--- a/components/layouts/trial-banner.tsx+++ b/components/layouts/trial-banner.tsx@@ -18,7 +18,7 @@ import {} from "@/components/ui/alert";export default function TrialBanner() {- const { trial } = usePlan();+ const { trial, trialEndsAt } = usePlan();const isTrial = !!trial;const [showTrialBanner, setShowTrialBanner] = useState<boolean | null>(null);@@ -31,7 +31,12 @@ export default function TrialBanner() {}, [isTrial]);if (isTrial && showTrialBanner) {- return <TrialBannerComponent setShowTrialBanner={setShowTrialBanner} />;+ return (+ <TrialBannerComponent+ setShowTrialBanner={setShowTrialBanner}+ trialEndsAt={trialEndsAt}+ />+ );}return null;@@ -39,8 +44,10 @@ export default function TrialBanner() {function TrialBannerComponent({setShowTrialBanner,+ trialEndsAt,}: {setShowTrialBanner: Dispatch<SetStateAction<boolean | null>>;+ trialEndsAt: Date | null | undefined;}) {const teamInfo = useTeam();@@ -53,16 +60,22 @@ function TrialBannerComponent({const { datarooms } = useDataroomsSimple();- const trialDaysLeft = datarooms- ? daysLeft(- new Date(- datarooms[0]?.createdAt ??- teamInfo?.currentTeam?.createdAt ??- new Date(),- ),- 7,- )- : 0;+ // Prefer the explicit trialEndsAt override when set (e.g. after a manual+ // trial extension); otherwise fall back to the legacy "7d from first+ // dataroom or team creation" computation.+ let trialDaysLeft = 0;+ if (trialEndsAt) {+ trialDaysLeft = daysLeft(new Date(trialEndsAt), 0);+ } else if (datarooms) {+ trialDaysLeft = daysLeft(+ new Date(+ datarooms[0]?.createdAt ??+ teamInfo?.currentTeam?.createdAt ??+ new Date(),+ ),+ 7,+ );+ }const isExpired = trialDaysLeft <= 0;diff --git a/lib/swr/use-billing.ts b/lib/swr/use-billing.tsindex 4c43265d..27ffd133 100644--- a/lib/swr/use-billing.ts+++ b/lib/swr/use-billing.ts@@ -59,6 +59,7 @@ type PlanResponse = {pauseEndsAt: Date | null;isPaused: boolean;cancelledAt: Date | null;+ trialEndsAt: Date | null;isCustomer: boolean;subscriptionCycle: "monthly" | "yearly";discount: SubscriptionDiscount | null;@@ -126,6 +127,7 @@ export function usePlan({startsAt: plan?.startsAt,endsAt: plan?.endsAt,cancelledAt: plan?.cancelledAt,+ trialEndsAt: plan?.trialEndsAt ?? null,pausedAt: plan?.pausedAt,isPaused: plan?.isPaused ?? false,isCancelled: !!plan?.cancelledAt,diff --git a/lib/trigger/send-scheduled-email.ts b/lib/trigger/send-scheduled-email.tsdeleted file mode 100644index 01cf41c6..00000000--- a/lib/trigger/send-scheduled-email.ts+++ /dev/null@@ -1,174 +0,0 @@-import { logger, task } from "@trigger.dev/sdk";--import { sendDataroomInfoEmail } from "@/lib/emails/send-dataroom-info";-import { sendDataroomTrial24hReminderEmail } from "@/lib/emails/send-dataroom-trial-24h";-import { sendDataroomTrialEndEmail } from "@/lib/emails/send-dataroom-trial-end";-import { sendUpgradeOneMonthCheckinEmail } from "@/lib/emails/send-upgrade-month-checkin";-import prisma from "@/lib/prisma";--export const sendDataroomTrialInfoEmailTask = task({- id: "send-dataroom-trial-info-email",- retry: { maxAttempts: 3 },- run: async (payload: { to: string; useCase: string }) => {- await sendDataroomInfoEmail(- {- user: { email: payload.to, name: "Marc" },- },- payload.useCase,- );- logger.info("Email sent", { to: payload.to });- },-});--export const sendDataroomTrial24hReminderEmailTask = task({- id: "send-dataroom-trial-24h-reminder-email",- retry: { maxAttempts: 3 },- run: async (payload: { to: string; name: string; teamId: string }) => {- const team = await prisma.team.findUnique({- where: {- id: payload.teamId,- },- select: {- plan: true,- },- });-- if (!team) {- logger.error("Team not found", { teamId: payload.teamId });- return;- }-- // Only send reminder email if team still has trial plan- if (team.plan.includes("drtrial")) {- await sendDataroomTrial24hReminderEmail({- email: payload.to,- name: payload.name,- });- logger.info("Email sent", { to: payload.to, teamId: payload.teamId });- } else {- logger.info("Team upgraded - no trial reminder needed", {- teamId: payload.teamId,- plan: team.plan,- });- }- },-});--export const sendDataroomTrialExpiredEmailTask = task({- id: "send-dataroom-trial-expired-email",- retry: { maxAttempts: 3 },- run: async (payload: { to: string; name: string; teamId: string }) => {- const team = await prisma.team.findUnique({- where: {- id: payload.teamId,- },- select: {- plan: true,- },- });-- if (!team) {- logger.error("Team not found", { teamId: payload.teamId });- return;- }-- if (team.plan.includes("drtrial")) {- // send email to the user- await sendDataroomTrialEndEmail({- email: payload.to,- name: payload.name,- });- logger.info("Email sent", { to: payload.to, teamId: payload.teamId });-- // remove trial on the plan- const updatedTeam = await prisma.team.update({- where: { id: payload.teamId },- data: { plan: team.plan.replace("+drtrial", "") },- });-- const isPaid = [- "pro",- "business",- "datarooms",- "datarooms-plus",- "datarooms-premium",- "datarooms-unlimited",- ].includes(updatedTeam.plan);-- if (!isPaid) {- // remove branding- await prisma.brand.deleteMany({- where: {- teamId: payload.teamId,- },- });- logger.info("Branding removed after trial expired", {- teamId: payload.teamId,- });-- // block all non-admin users- const blockedUsers = await prisma.userTeam.updateMany({- where: {- teamId: payload.teamId,- role: { not: "ADMIN" },- },- data: {- status: "BLOCKED_TRIAL_EXPIRED",- blockedAt: new Date(),- },- });- logger.info("Team members blocked after trial expired", {- teamId: payload.teamId,- usersCount: blockedUsers.count,- });- }-- logger.info("Trial removed", { teamId: payload.teamId });- return;- }-- logger.info("Team upgraded - no further action", {- teamId: payload.teamId,- plan: team.plan,- });- return;- },-});--export const sendUpgradeOneMonthCheckinEmailTask = task({- id: "send-upgrade-one-month-checkin-email",- retry: { maxAttempts: 3 },- run: async (payload: { to: string; name: string; teamId: string }) => {- try {- const team = await prisma.team.findUnique({- where: { id: payload.teamId },- select: {- plan: true,- },- });-- if (!team) {- logger.error("Team not found", { teamId: payload.teamId });- return;- }-- if (- !["pro", "business", "datarooms", "datarooms-plus", "datarooms-premium", "datarooms-unlimited"].includes(team.plan)- ) {- logger.info("Team not on paid plan - no further action", {- teamId: payload.teamId,- plan: team.plan,- });- return;- }-- await sendUpgradeOneMonthCheckinEmail({- user: { email: payload.to, name: payload.name },- });- logger.info("Email sent", { to: payload.to });- } catch (error) {- logger.error("Error sending upgrade one month checkin email", { error });- return;- }- },-});diff --git a/lib/trigger/send-upgrade-checkin-email.ts b/lib/trigger/send-upgrade-checkin-email.tsnew file mode 100644index 00000000..32a31776--- /dev/null+++ b/lib/trigger/send-upgrade-checkin-email.ts@@ -0,0 +1,57 @@+import { logger, task } from "@trigger.dev/sdk";++import { sendUpgradeOneMonthCheckinEmail } from "@/lib/emails/send-upgrade-month-checkin";+import prisma from "@/lib/prisma";++export const sendUpgradeOneMonthCheckinEmailTask = task({+ id: "send-upgrade-one-month-checkin-email",+ retry: { maxAttempts: 3 },+ run: async (payload: { to: string; name: string; teamId: string }) => {+ try {+ const team = await prisma.team.findUnique({+ where: { id: payload.teamId },+ select: {+ plan: true,+ },+ });++ if (!team) {+ logger.error("Team not found", { teamId: payload.teamId });+ return;+ }++ if (+ ![+ "pro",+ "business",+ "datarooms",+ "datarooms-plus",+ "datarooms-premium",+ "datarooms-unlimited",+ ].includes(team.plan)+ ) {+ logger.info("Team not on paid plan - no further action", {+ teamId: payload.teamId,+ plan: team.plan,+ });+ return;+ }++ await sendUpgradeOneMonthCheckinEmail({+ user: { email: payload.to, name: payload.name },+ });+ const [localPart, domain] = payload.to.split("@");+ const maskedTo =+ localPart && domain+ ? `${localPart[0]}***@${domain}`+ : "***";+ logger.info("Email sent", {+ teamId: payload.teamId,+ to: maskedTo,+ });+ } catch (error) {+ logger.error("Error sending upgrade one month checkin email", { error });+ return;+ }+ },+});diff --git a/pages/api/teams/[teamId]/billing/plan.ts b/pages/api/teams/[teamId]/billing/plan.tsindex 50f217dc..f2643fe2 100644--- a/pages/api/teams/[teamId]/billing/plan.ts+++ b/pages/api/teams/[teamId]/billing/plan.ts@@ -48,6 +48,7 @@ export default async function handle(pauseStartsAt: true,pauseEndsAt: true,cancelledAt: true,+ trialEndsAt: true,},});@@ -103,6 +104,7 @@ export default async function handle(pauseEndsAt: team.pauseEndsAt,isPaused,cancelledAt: team.cancelledAt,+ trialEndsAt: team.trialEndsAt,discount,});} catch (error) {diff --git a/pages/api/teams/[teamId]/datarooms/trial.ts b/pages/api/teams/[teamId]/datarooms/trial.tsindex 676b69bf..fdfb0cfb 100644--- a/pages/api/teams/[teamId]/datarooms/trial.ts+++ b/pages/api/teams/[teamId]/datarooms/trial.ts@@ -11,7 +11,7 @@ import {sendDataroomTrial24hReminderEmailTask,sendDataroomTrialExpiredEmailTask,sendDataroomTrialInfoEmailTask,-} from "@/lib/trigger/send-scheduled-email";+} from "@/ee/features/billing/dataroom-trial/lib/trigger/send-scheduled-email";import { CustomUser } from "@/lib/types";import { log, logStore } from "@/lib/utils";@@ -121,26 +121,53 @@ export default async function handle(** 1. Send welcome email* 2. Send dataroom info email after 1 day- * 3. Send expired trial email after 7 days+ * 3. Send 24h reminder after 6 days+ * 4. Send expired trial email after 7 days+ *+ * Capture the reminder + expiry run ids so the trial can later be+ * extended (see scripts/extend-trial.ts).*/waitUntil(sendDataroomTrialWelcome({ fullName, to: email! }));waitUntil(sendDataroomTrialInfoEmailTask.trigger(- { to: email!, useCase },- { delay: "1d" },+ { to: email!, useCase, name: fullName.split(" ")[0] },+ { delay: "1d", tags: [`team_${teamId}`] },),);waitUntil(- sendDataroomTrial24hReminderEmailTask.trigger(- { to: email!, name: fullName.split(" ")[0], teamId },- { delay: "6d", tags: [`team_${teamId}`] },- ),- );- waitUntil(- sendDataroomTrialExpiredEmailTask.trigger(- { to: email!, name: fullName.split(" ")[0], teamId },- { delay: "7d", tags: [`team_${teamId}`] },- ),+ (async () => {+ try {+ const reminderHandle =+ await sendDataroomTrial24hReminderEmailTask.trigger(+ { to: email!, name: fullName.split(" ")[0], teamId },+ { delay: "6d", tags: [`team_${teamId}`] },+ );+ const expiredHandle =+ await sendDataroomTrialExpiredEmailTask.trigger(+ { to: email!, name: fullName.split(" ")[0], teamId },+ { delay: "7d", tags: [`team_${teamId}`] },+ );+ await prisma.team.update({+ where: { id: teamId },+ data: {+ trialReminderRunId: reminderHandle.id,+ trialExpiredRunId: expiredHandle.id,+ },+ });+ } catch (error) {+ console.error(+ `[dataroom-trial] Failed to schedule trial emails or persist run IDs for team ${teamId}:`,+ error,+ );+ await log({+ message: `:x: Dataroom Trial: failed to schedule trial emails or persist run IDs for team \`${teamId}\`\n\n\`\`\`${+ error instanceof Error ? error.message : String(error)+ }\`\`\``,+ type: "error",+ mention: true,+ });+ }+ })(),);res.status(201).json(dataroomWithCount);diff --git a/pages/datarooms/index.tsx b/pages/datarooms/index.tsxindex 050371eb..77b48c39 100644--- a/pages/datarooms/index.tsx+++ b/pages/datarooms/index.tsx@@ -28,8 +28,15 @@ import { Separator } from "@/components/ui/separator";export default function DataroomsPage() {const teamInfo = useTeam();const { datarooms, totalCount } = useDatarooms();- const { isFree, isPro, isBusiness, isDatarooms, isDataroomsPlus, isTrial } =- usePlan();+ const {+ isFree,+ isPro,+ isBusiness,+ isDatarooms,+ isDataroomsPlus,+ isTrial,+ trialEndsAt,+ } = usePlan();const { limits } = useLimits();const router = useRouter();@@ -122,13 +129,18 @@ export default function DataroomsPage() {<span>Trial: </span><span className="font-medium">{(() => {- const startDate =- datarooms && datarooms.length > 0- ? datarooms[datarooms.length - 1]?.createdAt- : new Date(- teamInfo?.currentTeam?.createdAt ?? Date.now(),- );- const days = daysLeft(new Date(startDate), 7);+ let days: number;+ if (trialEndsAt) {+ days = daysLeft(new Date(trialEndsAt), 0);+ } else {+ const startDate =+ datarooms && datarooms.length > 0+ ? datarooms[datarooms.length - 1]?.createdAt+ : new Date(+ teamInfo?.currentTeam?.createdAt ?? Date.now(),+ );+ days = daysLeft(new Date(startDate), 7);+ }if (days <= 0) return "Expired";const label = days === 1 ? "day" : "days";return `${days} ${label} left`;diff --git a/prisma/migrations/20260505100000_add_trial_overrides_to_team/migration.sql b/prisma/migrations/20260505100000_add_trial_overrides_to_team/migration.sqlnew file mode 100644index 00000000..60c10999--- /dev/null+++ b/prisma/migrations/20260505100000_add_trial_overrides_to_team/migration.sql@@ -0,0 +1,6 @@+-- AlterTable+ALTER TABLE "Team"+ ADD COLUMN "trialStartedAt" TIMESTAMP(3),+ ADD COLUMN "trialEndsAt" TIMESTAMP(3),+ ADD COLUMN "trialReminderRunId" TEXT,+ ADD COLUMN "trialExpiredRunId" TEXT;diff --git a/prisma/schema/team.prisma b/prisma/schema/team.prismaindex 7dbe9be3..fa5e7da2 100644--- a/prisma/schema/team.prisma+++ b/prisma/schema/team.prisma@@ -42,6 +42,14 @@ model Team {pauseEndsAt DateTime? // When the pause period endscancelledAt DateTime? // When the subscription was cancelled+ // Trial overrides — when set, these take precedence over the implicit+ // "+drtrial in plan + 7 days from team/dataroom creation" computation.+ // Populated when a trial is manually extended via the admin script.+ trialStartedAt DateTime? // When the trial actually started+ trialEndsAt DateTime? // Authoritative trial end timestamp (null = use legacy 7d-from-creation)+ trialReminderRunId String? // Trigger.dev run id for the 24h reminder email+ trialExpiredRunId String? // Trigger.dev run id for the trial-expired task+limits Json? // Plan limits // {datarooms: 1, users: 1, domains: 1, customDomainOnPro: boolean, customDomainInDataroom: boolean}// team settings