Merge branch 'main' into combine-link-method

devkiran · devkiran · commit e1fc3bf63216 · 2024-04-29T13:22:05.000+05:30
diff --git a/apps/docs/sdks/typescript/domains/add.mdx b/apps/docs/sdks/typescript/domains/add.mdx
@@ -60,6 +60,7 @@ await dub.domains.add({
 
 ```ts
 {
+  id: "clvcep2sn87jh8nf808x00005",
   slug: "acme.com",
   verified: false,
   primary: true,
diff --git a/apps/docs/sdks/typescript/domains/list.mdx b/apps/docs/sdks/typescript/domains/list.mdx
@@ -27,6 +27,7 @@ await dub.domains.list({});
 ```ts
 [
   {
+    id: "clvcep2sn87jh8nf808x00005",
     slug: "acme.com",
     verified: false,
     primary: true,
diff --git a/apps/docs/sdks/typescript/domains/set-primary.mdx b/apps/docs/sdks/typescript/domains/set-primary.mdx
@@ -28,6 +28,7 @@ await dub.domains.setPrimary("acme.com");
 
 ```ts
 {
+  id: "clvcep2sn87jh8nf808x00005",
   slug: "acme.com",
   verified: false,
   primary: true,
diff --git a/apps/docs/sdks/typescript/domains/transfer.mdx b/apps/docs/sdks/typescript/domains/transfer.mdx
@@ -34,6 +34,7 @@ await dub.domains.transfer("acme.com", {
 
 ```ts
 {
+  id: "clvcep2sn87jh8nf808x00005",
   slug: "acme.com",
   verified: false,
   primary: true,
diff --git a/apps/docs/sdks/typescript/domains/update.mdx b/apps/docs/sdks/typescript/domains/update.mdx
@@ -62,6 +62,7 @@ await dub.domains.update("acme.com", {
 
 ```ts
 {
+  id: "clvcep2sn87jh8nf808x00005",
   slug: "acme.com",
   verified: false,
   primary: true,
diff --git a/apps/docs/snippets/domain-response.mdx b/apps/docs/snippets/domain-response.mdx
@@ -1,3 +1,7 @@
+<ParamField body="id" type="string" required>
+  The unique identifier of the domain.
+</ParamField>
+
 <ParamField body="slug" type="string" required>
   The domain name.
 </ParamField>
diff --git a/apps/web/.env.example b/apps/web/.env.example
@@ -106,4 +106,8 @@ ANTHROPIC_API_KEY=
 NEXT_PUBLIC_IS_DUB=
 
 # For cron jobs
-CRON_SECRET=
+CRON_SECRET=
+
+# Pangea - Retrieve reputation for a domain.
+# Get your Pange API Key here: https://pangea.cloud/docs/admin-guide/tokens/
+PANGEA_API_KEY=
diff --git a/apps/web/app/api/ai/completion/route.ts b/apps/web/app/api/ai/completion/route.ts
@@ -26,6 +26,11 @@ export async function POST(req: NextRequest) {
   const { workspaceId } = searchParams;
   const workspace = await getWorkspaceViaEdge(workspaceId);
 
+  if (!anthropic) {
+    console.error("Anthropic is not configured. Skipping the request.");
+    return new Response(null, { status: 200 });
+  }
+
   if (!workspace) {
     return new Response("Workspace not found", { status: 404 });
   }
diff --git a/apps/web/app/api/ai/generate-support-title/route.ts b/apps/web/app/api/ai/generate-support-title/route.ts
@@ -8,6 +8,11 @@ import { NextRequest } from "next/server";
 export const runtime = "edge";
 
 export async function POST(req: NextRequest) {
+  if (!anthropic) {
+    console.error("Anthropic is not configured. Skipping the request.");
+    return new Response(null, { status: 200 });
+  }
+
   try {
     const session = await getToken({
       req,
diff --git a/apps/web/app/api/domains/route.ts b/apps/web/app/api/domains/route.ts
@@ -7,6 +7,7 @@ import { exceededLimitError } from "@/lib/api/errors";
 import { parseRequestBody } from "@/lib/api/utils";
 import { withWorkspace } from "@/lib/auth";
 import prisma from "@/lib/prisma";
+import z from "@/lib/zod";
 import { DomainSchema, addDomainBodySchema } from "@/lib/zod/schemas";
 import { NextResponse } from "next/server";
 
@@ -16,19 +17,9 @@ export const GET = withWorkspace(async ({ workspace }) => {
     where: {
       projectId: workspace.id,
     },
-    select: {
-      slug: true,
-      verified: true,
-      primary: true,
-      archived: true,
-      target: true,
-      type: true,
-      placeholder: true,
-      clicks: true,
-      expiredUrl: true,
-    },
   });
-  return NextResponse.json(domains);
+
+  return NextResponse.json(z.array(DomainSchema).parse(domains));
 });
 
 // POST /api/domains - add a domain
diff --git a/apps/web/lib/anthropic.ts b/apps/web/lib/anthropic.ts
@@ -1,5 +1,5 @@
 import Anthropic from "@anthropic-ai/sdk";
 
-export const anthropic = new Anthropic({
-  apiKey: process.env.ANTHROPIC_API_KEY || "",
-});
+const apiKey = process.env.ANTHROPIC_API_KEY;
+
+export const anthropic = apiKey ? new Anthropic({ apiKey }) : null;
diff --git a/apps/web/lib/api/links/process-link.ts b/apps/web/lib/api/links/process-link.ts
@@ -323,35 +323,38 @@ async function maliciousLinkCheck(url: string) {
     return false;
   }
 
-  try {
-    const response = await getPangeaDomainIntel(domain);
+  // Check with Pangea for domain reputation
+  if (process.env.PANGEA_API_KEY) {
+    try {
+      const response = await getPangeaDomainIntel(domain);
 
-    const verdict = response.result.data[apexDomain].verdict;
-    console.log("Pangea verdict for domain", apexDomain, verdict);
+      const verdict = response.result.data[apexDomain].verdict;
+      console.log("Pangea verdict for domain", apexDomain, verdict);
 
-    if (verdict === "benign") {
-      await updateConfig({
-        key: "whitelistedDomains",
-        value: domain,
-      });
-      return false;
-    } else if (verdict === "malicious" || verdict === "suspicious") {
-      await Promise.all([
-        updateConfig({
-          key: "domains",
+      if (verdict === "benign") {
+        await updateConfig({
+          key: "whitelistedDomains",
           value: domain,
-        }),
-        log({
-          message: `Suspicious link detected via Pangea → ${url}`,
-          type: "links",
-          mention: true,
-        }),
-      ]);
+        });
+        return false;
+      } else if (verdict === "malicious" || verdict === "suspicious") {
+        await Promise.all([
+          updateConfig({
+            key: "domains",
+            value: domain,
+          }),
+          log({
+            message: `Suspicious link detected via Pangea → ${url}`,
+            type: "links",
+            mention: true,
+          }),
+        ]);
 
-      return true;
+        return true;
+      }
+    } catch (e) {
+      console.error("Error checking domain with Pangea", e);
     }
-  } catch (e) {
-    console.error("Error checking domain with Pangea", e);
   }
 
   return false;
diff --git a/apps/web/lib/zod/schemas/domains.ts b/apps/web/lib/zod/schemas/domains.ts
@@ -2,6 +2,7 @@ import z from "@/lib/zod";
 import { parseUrlSchema } from "./links";
 
 export const DomainSchema = z.object({
+  id: z.string().describe("The unique identifier of the domain."),
   slug: z
     .string()
     .describe("The domain name.")

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ await dub.domains.add({`
`60`	`60`
`61`	`61`	```ts
`62`	`62`	`{`
	`63`	`+ id: "clvcep2sn87jh8nf808x00005",`
`63`	`64`	`slug: "acme.com",`
`64`	`65`	`verified: false,`
`65`	`66`	`primary: true,`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ await dub.domains.list({});`
`27`	`27`	```ts
`28`	`28`	`[`
`29`	`29`	`{`
	`30`	`+ id: "clvcep2sn87jh8nf808x00005",`
`30`	`31`	`slug: "acme.com",`
`31`	`32`	`verified: false,`
`32`	`33`	`primary: true,`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ await dub.domains.setPrimary("acme.com");`
`28`	`28`
`29`	`29`	```ts
`30`	`30`	`{`
	`31`	`+ id: "clvcep2sn87jh8nf808x00005",`
`31`	`32`	`slug: "acme.com",`
`32`	`33`	`verified: false,`
`33`	`34`	`primary: true,`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ await dub.domains.transfer("acme.com", {`
`34`	`34`
`35`	`35`	```ts
`36`	`36`	`{`
	`37`	`+ id: "clvcep2sn87jh8nf808x00005",`
`37`	`38`	`slug: "acme.com",`
`38`	`39`	`verified: false,`
`39`	`40`	`primary: true,`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ await dub.domains.update("acme.com", {`
`62`	`62`
`63`	`63`	```ts
`64`	`64`	`{`
	`65`	`+ id: "clvcep2sn87jh8nf808x00005",`
`65`	`66`	`slug: "acme.com",`
`66`	`67`	`verified: false,`
`67`	`68`	`primary: true,`