bugfix

tonywhite11 · Aug 28, 2023 · a7e8978 · a7e8978
1 parent 6aa770c
commit a7e8978
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/components/app/modals/add-edit-link-modal/index.tsx b/components/app/modals/add-edit-link-modal/index.tsx
@@ -75,7 +75,10 @@ function AddEditLinkModal({
     props ||
       duplicateProps || {
         ...DEFAULT_LINK_PROPS,
-        domain: primaryDomain || (domains && domains[0].slug) || "",
+        domain:
+          primaryDomain ||
+          (domains && domains.length > 0 && domains[0].slug) ||
+          "",
         key: "",
         url: "",
       },

diff --git a/lib/api/domains.ts b/lib/api/domains.ts
@@ -12,7 +12,9 @@ export const validateDomain = async (
   }
   const validDomain =
     validDomainRegex.test(domain) &&
+    domain !== "dub.co" &&
     !domain.endsWith(".dub.co") &&
+    domain !== "dub.sh" &&
     !domain.endsWith(".dub.sh");
 
   if (!validDomain) {

diff --git a/lib/swr/use-domains.ts b/lib/swr/use-domains.ts
@@ -39,7 +39,7 @@ export default function useDomains({ domain }: { domain?: string } = {}) {
     domains,
     primaryDomain:
       domains?.find((domain) => domain.primary)?.slug ||
-      (domains && domains[0].slug),
+      (domains && domains.length > 0 && domains[0].slug),
     verified: domain
       ? // If a domain is passed, check if it's verified
         domains?.find((d) => d.slug === domain)?.verified

diff --git a/pages/api/projects/index.ts b/pages/api/projects/index.ts
@@ -55,7 +55,7 @@ export default withUserAuth(
       if (slugError || validDomain !== true) {
         return res.status(422).json({
           slugError,
-          domainError: validDomain ? null : "Invalid domain",
+          domainError: validDomain === true ? null : validDomain,
         });
       }
       const [slugExist, domainExist] = await Promise.all([