updated route + bug fixed

pages/api/v1/archives/[...params].ts

@@ -1,32 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from "next";
-import getPermission from "@/lib/api/getPermission";
-import readFile from "@/lib/api/storage/readFile";
-import { getToken } from "next-auth/jwt";
-
-export default async function Index(req: NextApiRequest, res: NextApiResponse) {
-  if (!req.query.params)
-    return res.status(401).json({ response: "Invalid parameters." });
-
-  const token = await getToken({ req });
-  const userId = token?.id;
-
-  const collectionId = req.query.params[0];
-  const linkId = req.query.params[1];
-
-  const collectionIsAccessible = await getPermission({
-    userId,
-    collectionId: Number(collectionId),
-  });
-
-  if (!collectionIsAccessible)
-    return res
-      .status(401)
-      .json({ response: "You don't have access to this collection." });
-
-  const { file, contentType, status } = await readFile(
-    `archives/${collectionId}/${linkId}`
-  );
-  res.setHeader("Content-Type", contentType).status(status as number);
-
-  return res.send(file);
-}

pages/api/v1/archives/[linkId].ts

@@ -0,0 +1,49 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+import readFile from "@/lib/api/storage/readFile";
+import { getToken } from "next-auth/jwt";
+import { prisma } from "@/lib/api/db";
+import { ArchivedFormat } from "@/types/global";
+
+export default async function Index(req: NextApiRequest, res: NextApiResponse) {
+  const linkId = Number(req.query.linkId);
+  const format = Number(req.query.format);
+
+  let suffix;
+
+  if (format === ArchivedFormat.screenshot) suffix = ".png";
+  else if (format === ArchivedFormat.pdf) suffix = ".pdf";
+  else if (format === ArchivedFormat.readability) suffix = "_readability.json";
+
+  if (!linkId || !suffix)
+    return res.status(401).json({ response: "Invalid parameters." });
+
+  const token = await getToken({ req });
+  const userId = token?.id;
+
+  const collectionIsAccessible = await prisma.collection.findFirst({
+    where: {
+      links: {
+        some: {
+          id: linkId,
+        },
+      },
+      OR: [
+        { ownerId: userId || -1 },
+        { members: { some: { userId: userId || -1 } } },
+        { isPublic: true },
+      ],
+    },
+  });
+
+  if (!collectionIsAccessible)
+    return res
+      .status(401)
+      .json({ response: "You don't have access to this collection." });
+
+  const { file, contentType, status } = await readFile(
+    `archives/${collectionIsAccessible.id}/${linkId + suffix}`
+  );
+  res.setHeader("Content-Type", contentType).status(status as number);
+
+  return res.send(file);
+}

pages/links/[id].tsx

@@ -3,7 +3,10 @@ import React, { useEffect, useState } from "react";
 import Link from "next/link";
 import useLinkStore from "@/store/links";
 import { useRouter } from "next/router";
-import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
+import {
+  ArchivedFormat,
+  LinkIncludingShortenedCollectionAndTags,
+} from "@/types/global";
 import Image from "next/image";
 import ColorThief, { RGBColor } from "colorthief";
 import { useTheme } from "next-themes";
@@ -63,7 +66,9 @@ export default function Index() {
         link?.readabilityPath &&
         link?.readabilityPath !== "pending"
       ) {
-        const response = await fetch(`/api/v1/${link?.readabilityPath}`);
+        const response = await fetch(
+          `/api/v1/archives/${link?.id}?format=${ArchivedFormat.readability}`
+        );
 
         const data = await response?.json();
 

pages/public/links/[id].tsx

@@ -3,7 +3,10 @@ import React, { useEffect, useState } from "react";
 import Link from "next/link";
 import useLinkStore from "@/store/links";
 import { useRouter } from "next/router";
-import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
+import {
+  ArchivedFormat,
+  LinkIncludingShortenedCollectionAndTags,
+} from "@/types/global";
 import Image from "next/image";
 import ColorThief, { RGBColor } from "colorthief";
 import { useTheme } from "next-themes";
@@ -64,7 +67,9 @@ export default function Index() {
         link?.readabilityPath &&
         link?.readabilityPath !== "pending"
       ) {
-        const response = await fetch(`/api/v1/${link?.readabilityPath}`);
+        const response = await fetch(
+          `/api/v1/archives/${link?.id}?format=${ArchivedFormat.readability}`
+        );
 
         const data = await response?.json();