The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
improve generic email check
Steven Tey9747a0a56547
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/saml/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/saml/route.tsindex ae50226f5a..f55bff8632 100644--- a/apps/web/app/api/workspaces/[idOrSlug]/saml/route.ts+++ b/apps/web/app/api/workspaces/[idOrSlug]/saml/route.ts@@ -1,6 +1,6 @@import { DubApiError } from "@/lib/api/errors";import { withWorkspace } from "@/lib/auth";-import { isGenericEmail } from "@/lib/is-generic-email";+import { isGenericEmail } from "@/lib/email/is-generic-email";import { jackson, samlAudience } from "@/lib/jackson";import { prisma } from "@/lib/prisma";import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";diff --git a/apps/web/lib/actions/partners/start-partner-platform-verification.ts b/apps/web/lib/actions/partners/start-partner-platform-verification.tsindex 5c6cf996c5..829237a8e2 100644--- a/apps/web/lib/actions/partners/start-partner-platform-verification.ts+++ b/apps/web/lib/actions/partners/start-partner-platform-verification.ts@@ -8,7 +8,7 @@ import { PARTNER_PLATFORMS_PROVIDERS } from "@/lib/api/partner-profile/partner-pimport { upsertPartnerPlatform } from "@/lib/api/partner-profile/upsert-partner-platform";import { generateOTP } from "@/lib/auth/utils";import { extractEmailDomain } from "@/lib/email/extract-email-domain";-import { isGenericEmail } from "@/lib/is-generic-email";+import { isGenericEmail } from "@/lib/email/is-generic-email";import {sanitizeSocialHandle,SOCIAL_PLATFORM_CONFIGS,diff --git a/apps/web/lib/actions/send-otp.ts b/apps/web/lib/actions/send-otp.tsindex 7059b04cc5..82521a87c1 100644--- a/apps/web/lib/actions/send-otp.ts+++ b/apps/web/lib/actions/send-otp.ts@@ -11,7 +11,7 @@ import { flattenValidationErrors } from "next-safe-action";import * as z from "zod/v4";import { generateOTP } from "../auth";import { EMAIL_OTP_EXPIRY_IN } from "../auth/constants";-import { isGenericEmail } from "../is-generic-email";+import { isGenericEmail } from "../email/is-generic-email";import { emailSchema, passwordSchema } from "../zod/schemas/auth";import { throwIfAuthenticated } from "./auth/throw-if-authenticated";import { actionClient } from "./safe-action";@@ -36,11 +36,10 @@ export const sendOtpAction = actionClientidentifier: [email, await getIP()],});- const isGenericEmailWithPlus = email.includes("+") && isGenericEmail(email);const emailDomainBlocked = await isEmailDomainBlocked(email);// if any of the flags match, run one final edge case check, before throwing an error- if (isGenericEmailWithPlus || emailDomainBlocked) {+ if (isGenericEmail(email) || emailDomainBlocked) {// edge case: the user already has a partner account on Dub with this email address,// or they have an existing application for a program, we can allow them to continueconst [isPartnerAccount, hasExistingApplications] = await Promise.all([diff --git a/apps/web/lib/api/fraud/rules/check-customer-email-match.ts b/apps/web/lib/api/fraud/rules/check-customer-email-match.tsindex 0fe68abb61..37ad7c719a 100644--- a/apps/web/lib/api/fraud/rules/check-customer-email-match.ts+++ b/apps/web/lib/api/fraud/rules/check-customer-email-match.ts@@ -1,5 +1,5 @@import { extractEmailDomain } from "@/lib/email/extract-email-domain";-import { isGenericEmail } from "@/lib/is-generic-email";+import { isGenericEmail } from "@/lib/email/is-generic-email";import { prisma } from "@/lib/prisma";import { FraudEventContext } from "@/lib/types";import { CustomerEmailMatchType } from "@/lib/zod/schemas/fraud";diff --git a/apps/web/lib/api/workspaces/is-saml-enforced-for-email-domain.ts b/apps/web/lib/api/workspaces/is-saml-enforced-for-email-domain.tsindex 963b7f0a3d..140cfd3434 100644--- a/apps/web/lib/api/workspaces/is-saml-enforced-for-email-domain.ts+++ b/apps/web/lib/api/workspaces/is-saml-enforced-for-email-domain.ts@@ -1,7 +1,7 @@import { prisma } from "@/lib/prisma";import { APP_HOSTNAMES } from "@dub/utils";import { headers } from "next/headers";-import { isGenericEmail } from "../../is-generic-email";+import { isGenericEmail } from "../../email/is-generic-email";// Checks if SAML SSO is enforced for a given email domainexport const isSamlEnforcedForEmailDomain = async (email: string) => {diff --git a/apps/web/lib/auth/request-email-change.ts b/apps/web/lib/auth/request-email-change.tsindex a0cffe92d1..579e2fdaf9 100644--- a/apps/web/lib/auth/request-email-change.ts+++ b/apps/web/lib/auth/request-email-change.ts@@ -6,7 +6,7 @@ import { randomBytes } from "crypto";import { hashToken } from ".";import { DubApiError } from "../api/errors";import { isEmailDomainBlocked } from "../email/is-email-domain-blocked";-import { isGenericEmail } from "../is-generic-email";+import { isGenericEmail } from "../email/is-generic-email";import { redis } from "../upstash";import { assertRateLimit } from "../upstash/assert-rate-limit";import { RATELIMIT_POLICIES } from "../upstash/ratelimit-policies";diff --git a/apps/web/lib/is-generic-email.ts b/apps/web/lib/email/is-generic-email.tssimilarity index 96%rename from apps/web/lib/is-generic-email.tsrename to apps/web/lib/email/is-generic-email.tsindex 5c9ae4e3fb..d7f695bee2 100644--- a/apps/web/lib/is-generic-email.ts+++ b/apps/web/lib/email/is-generic-email.ts@@ -1,4 +1,4 @@-import { extractEmailDomain } from "./email/extract-email-domain";+import { extractEmailDomain } from "./extract-email-domain";const GENERIC_EMAIL_DOMAINS = ["googlemail.com",diff --git a/apps/web/lib/plain/sync-user-plan.ts b/apps/web/lib/plain/sync-user-plan.tsindex 2838cf4942..fb2936f388 100644--- a/apps/web/lib/plain/sync-user-plan.ts+++ b/apps/web/lib/plain/sync-user-plan.ts@@ -1,5 +1,5 @@import { prisma } from "@/lib/prisma";-import { isGenericEmail } from "../is-generic-email";+import { isGenericEmail } from "../email/is-generic-email";import { plain, PlainUser } from "./client";import { upsertPlainCustomer } from "./upsert-plain-customer";diff --git a/apps/web/lib/stripe/is-eligible-for-trial.ts b/apps/web/lib/stripe/is-eligible-for-trial.tsindex 2dd6f2d393..6b96e1914e 100644--- a/apps/web/lib/stripe/is-eligible-for-trial.ts+++ b/apps/web/lib/stripe/is-eligible-for-trial.ts@@ -1,4 +1,4 @@-import { isGenericEmail } from "../is-generic-email";+import { isGenericEmail } from "../email/is-generic-email";// User is only eligible for a trial if they:// - are on the free plandiff --git a/apps/web/scripts/misc/cleanup-generic-email-fraud-events.ts b/apps/web/scripts/misc/cleanup-generic-email-fraud-events.tsindex e1dda58e49..039853b1ce 100644--- a/apps/web/scripts/misc/cleanup-generic-email-fraud-events.ts+++ b/apps/web/scripts/misc/cleanup-generic-email-fraud-events.ts@@ -1,6 +1,6 @@import "dotenv-flow/config";-import { isGenericEmail } from "@/lib/is-generic-email";+import { isGenericEmail } from "@/lib/email/is-generic-email";import { prisma } from "@/lib/prisma";async function main() {diff --git a/apps/web/ui/workspaces/create-workspace-form.tsx b/apps/web/ui/workspaces/create-workspace-form.tsxindex e6de574843..94c2dbdef6 100644--- a/apps/web/ui/workspaces/create-workspace-form.tsx+++ b/apps/web/ui/workspaces/create-workspace-form.tsx@@ -1,6 +1,6 @@"use client";-import { isGenericEmail } from "@/lib/is-generic-email";+import { isGenericEmail } from "@/lib/email/is-generic-email";import { AlertCircleFill } from "@/ui/shared/icons";import { Button, buttonVariants, FileUpload, useMediaQuery } from "@dub/ui";import { cn } from "@dub/utils";