Merge pull request #123 from Coding-Club-IITG/aditya

Resolved Conflicts

Author: aditya-samal

client/src/api/File.js

@@ -53,3 +53,22 @@ export const getThumbnail = async (fileId) => {
     });
     console.log("Thumbnail Refreshed");
 };
+
+export const getFileDownloadLink = async (fileId) => {
+    const response = await fetch( serverRoot + '/api/files/download',{
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({ url: fileId }),
+            })
+
+    if (!response.ok) {
+        throw new Error(`Error fetching download link: ${response.statusText}`);
+    }
+
+    const data = await response.json();
+    return data.downloadLink;
+};
+
+

client/src/api/Folder.js

@@ -29,3 +29,12 @@ export const deleteFolder = async ({ folder, parentFolderId }) => {
     });
     return data;
 };
+
+export const fetchFolder = async (folderId) => {
+    const response = await API.get(`/folder/content/${folderId}`);
+    if (response.status !== 200) {
+        throw new Error("Failed to fetch folder data");
+    }
+    const data = response.data;
+    return data;
+}

client/src/screens/browse/components/file-display/index.jsx

@@ -14,6 +14,7 @@ import Share from "../../../share";
 import { verifyFile, unverifyFile } from "../../../../api/File";
 import { RemoveFileFromFolder, UpdateFileVerificationStatus } from "../../../../actions/filebrowser_actions.js";
 import ConfirmDialog from "./components/ConfirmDialog.jsx";
+import { getFileDownloadLink } from "../../../../api/File";
 import server from "../../../../api/server.js";
 
 const FileDisplay = ({ file, path, code }) => {
@@ -66,16 +67,7 @@ const FileDisplay = ({ file, path, code }) => {
             return;
         }
 
-        const response = await fetch( server + '/api/files/download',{
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({ url: file.webUrl }),
-        })
-
-        const data = await response.json();
-        const downloadLink = data.downloadLink;
+        const downloadLink = await getFileDownloadLink(file.webUrl);
 
         if (!downloadLink) {
             toast.error("Failed to generate download link.");

client/src/screens/browse/components/folder-info/index.jsx

@@ -19,6 +19,7 @@ import { ConfirmDialog } from "./confirmDialog";
 import server from "../../../../api/server";
 import JSZip from "jszip";
 import { saveAs } from "file-saver";
+import { fetchFolder } from "../../../../api/Folder";
 
 const FolderInfo = ({
     isBR,
@@ -107,13 +108,8 @@ const FolderInfo = ({
 
     const downloadFolder = async (id, folderPath = "") => {
         try {
-            const response = await fetch(`${server}/api/folder/content/${id}`);
-            if (!response.ok) {
-                toast.error("Failed to download folder content.");
-                return null;
-            }
+            const data = await fetchFolder(id);
 
-            const data = await response.json();
             const zip = new JSZip();
 
             // Process all children

server/scripts/downloadFile.js

@@ -15,9 +15,10 @@ const encodeGraphShareUrl = (shareUrl) => {
   return `u!${base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "")}`;
 };
 
- const access = await getAccessToken();
+
 
  export const downloadFiles = async (req, res) => {
+   const access = await getAccessToken();
   try {
     const inputUrl = req.body?.url;
     if (!inputUrl) {