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.

fix domain verification bug

Steven Teyc07c762d245b
diff --git a/apps/web/lib/actions/partners/update-partner-platforms.ts b/apps/web/lib/actions/partners/update-partner-platforms.ts
index 930baf5474..718a7e2c2c 100644
--- a/apps/web/lib/actions/partners/update-partner-platforms.ts
+++ b/apps/web/lib/actions/partners/update-partner-platforms.ts
@@ -5,7 +5,7 @@ import { sanitizeSocialHandle, sanitizeWebsite } from "@/lib/social-utils";
import { parseUrlSchemaAllowEmpty } from "@/lib/zod/schemas/utils";
import { prisma } from "@dub/prisma";
import { PartnerPlatform, PlatformType } from "@dub/prisma/client";
-import { isValidUrl } from "@dub/utils";
+import { getDomainWithoutWWW, getUrlFromString, isValidUrl } from "@dub/utils";
import * as z from "zod/v4";
import { authPartnerActionClient } from "../safe-action";
@@ -118,13 +118,14 @@ export const updatePartnerPlatformsAction = authPartnerActionClient
let domainChanged = false;
try {
- const oldDomain = currentIdentifier
- ? new URL(currentIdentifier).hostname
- : null;
- const newDomain = inputValue ? new URL(inputValue).hostname : null;
-
- domainChanged =
- oldDomain?.toLowerCase() !== newDomain?.toLowerCase();
+ const oldDomain = getDomainWithoutWWW(
+ getUrlFromString(currentIdentifier ?? ""),
+ );
+ const newDomain = getDomainWithoutWWW(
+ getUrlFromString(inputValue ?? ""),
+ );
+
+ domainChanged = oldDomain !== newDomain;
} catch (error) {
console.error("Failed to get domain from partner website", error);
domainChanged = true;
diff --git a/apps/web/lib/actions/partners/verify-domain.ts b/apps/web/lib/actions/partners/verify-partner-website.ts
similarity index 89%
rename from apps/web/lib/actions/partners/verify-domain.ts
rename to apps/web/lib/actions/partners/verify-partner-website.ts
index b9a1d15beb..8d32647137 100644
--- a/apps/web/lib/actions/partners/verify-domain.ts
+++ b/apps/web/lib/actions/partners/verify-partner-website.ts
@@ -1,11 +1,11 @@
"use server";
import { prisma } from "@dub/prisma";
-import { getUrlFromString } from "@dub/utils";
+import { getDomainWithoutWWW } from "@dub/utils";
import dns from "dns";
import { authPartnerActionClient } from "../safe-action";
-export const verifyDomainAction = authPartnerActionClient.action(
+export const verifyPartnerWebsiteAction = authPartnerActionClient.action(
async ({ ctx }) => {
const { partner } = ctx;
@@ -35,7 +35,7 @@ export const verifyDomainAction = authPartnerActionClient.action(
let domain: string | null = null;
try {
- domain = new URL(getUrlFromString(partnerPlatform.identifier)).hostname;
+ domain = getDomainWithoutWWW(partnerPlatform.identifier)!;
} catch (e) {
throw new Error("Please make sure the website is a valid URL.");
}
diff --git a/apps/web/ui/modals/domain-verification-modal.tsx b/apps/web/ui/modals/domain-verification-modal.tsx
index c35defb109..898b824850 100644
--- a/apps/web/ui/modals/domain-verification-modal.tsx
+++ b/apps/web/ui/modals/domain-verification-modal.tsx
@@ -1,4 +1,4 @@
-import { verifyDomainAction } from "@/lib/actions/partners/verify-domain";
+import { verifyPartnerWebsiteAction } from "@/lib/actions/partners/verify-partner-website";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import { Button, CopyButton, Modal } from "@dub/ui";
import { X } from "lucide-react";
@@ -37,7 +37,7 @@ function DomainVerificationModalInner({
}: DomainVerificationModalProps) {
const { mutate: mutatePartner } = usePartnerProfile();
- const { executeAsync, status } = useAction(verifyDomainAction, {
+ const { executeAsync, status } = useAction(verifyPartnerWebsiteAction, {
onSuccess: async () => {
toast.success("Your domain verified successfully!");
setShowDomainVerificationModal(false);