Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Merge branch 'main' into staging-sandbox

Kiran K4e53d00762e0
diff --cc apps/web/app/(ee)/api/cron/program-application-reminder/route.ts
index 4da2ac5f18,b98fa183c3..0a22daa27b
--- a/apps/web/app/(ee)/api/cron/program-application-reminder/route.ts
+++ b/apps/web/app/(ee)/api/cron/program-application-reminder/route.ts
@@@ -5,10 -5,9 +5,10 @@@ import { prisma } from "@/lib/prisma"
import { sendEmail } from "@dub/email";
import ProgramApplicationReminder from "@dub/email/templates/program-application-reminder";
import { APP_DOMAIN_WITH_NGROK } from "@dub/utils/src/constants";
+import { WorkspaceEnvironment } from "@prisma/client";
// POST - /api/cron/program-application-reminder
- // Sends an email if a program application hasn't received an associated partner
+ // Sends an email to a program application email if they haven't verified their account on Dub yet
export async function POST(req: Request) {
try {
const rawBody = await req.text();
diff --cc apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
index a0f8ccf609,cc430e2f23..7217a13fc9
--- a/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
@@@ -135,15 -158,5 +161,15 @@@ export const POST = withSession(async (
step: "completed",
});
+ waitUntil(
+ addMemberToStaging({
+ workspace,
+ user: {
- id: workspaceUser.userId,
- role: workspaceUser.role,
++ id: session.user.id,
++ role: invite.role,
+ },
+ }),
+ );
+
return NextResponse.json({ message: "Invite accepted." });
});
diff --cc apps/web/lib/plan-capabilities.ts
index fb47b16738,7ce50df77b..632b5403cd
--- a/apps/web/lib/plan-capabilities.ts
+++ b/apps/web/lib/plan-capabilities.ts
@@@ -24,10 -24,8 +24,9 @@@ export const getPlanCapabilities =
!!plan && ["enterprise", "advanced"].includes(plan),
canInstallAdvancedIntegrations:
!!plan && ["enterprise", "advanced"].includes(plan),
- canRequestSlackSupportInvite:
- !!plan && ["enterprise", "advanced"].includes(plan),
+ canRequestSlackSupportInvite: !!plan && ["enterprise"].includes(plan),
canCreateReferralReward:
!!plan && ["enterprise", "advanced"].includes(plan),
+ canUseStagingWorkspace: !!plan && !["free", "pro"].includes(plan),
};
};