From 2b5de793b4951d56842d565a54ea14ae20d33cb5 Mon Sep 17 00:00:00 2001
From: Alexander Biraben-Renard <ab1223@ic.ac.uk>
Date: Tue, 1 Oct 2024 16:54:21 +0100
Subject: [PATCH 1/2] feat: add "accept" field to form file input elements

---
 components/EditCompany.tsx | 12 +++++-------
 components/EditStudent.tsx | 11 ++++++++---
 components/FileInput.tsx   | 23 ++++++++++++++++++++++-
 components/UpsertEvent.tsx |  2 +-
 lib/constants.ts           |  4 ++++
 lib/files/saveFile.ts      | 16 +++++++---------
 6 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/components/EditCompany.tsx b/components/EditCompany.tsx
index 9fa495d7..083387b8 100644
--- a/components/EditCompany.tsx
+++ b/components/EditCompany.tsx
@@ -2,7 +2,7 @@
 
 import { SLUG_START, slugComputer } from "@/app/companies/slug"
 import { updateCompany } from "@/lib/crud/companies"
-import { ServerSideFormHandler } from "@/lib/types"
+import { FileCategory, ServerSideFormHandler } from "@/lib/types"
 
 import FileInput from "./FileInput"
 import { FormInModal } from "./forms/FormInModal"
@@ -10,10 +10,8 @@ import { GenericFormModal } from "./modals/GenericFormModal"
 
 import { MDXEditorMethods } from "@mdxeditor/editor"
 import { CompanyProfile } from "@prisma/client"
-import { InfoCircledIcon } from "@radix-ui/react-icons"
-import { Pencil1Icon } from "@radix-ui/react-icons"
-import { Tooltip } from "@radix-ui/themes"
-import { Card, Flex, IconButton, Text, TextField } from "@radix-ui/themes"
+import { InfoCircledIcon, Pencil1Icon } from "@radix-ui/react-icons"
+import { Card, Flex, IconButton, Text, TextField, Tooltip } from "@radix-ui/themes"
 import dynamic from "next/dynamic"
 import React, { useRef, useState } from "react"
 
@@ -70,9 +68,9 @@ const EditCompanyForm = ({ close, prevCompanyProfile }: { close: () => void; pre
         <input type="hidden" readOnly name="summary" value={summary ?? ""} />
       </label>
 
-      <FileInput name="banner" header="Banner" value={prevCompanyProfile.banner} />
+      <FileInput name="banner" header="Banner" value={prevCompanyProfile.banner} category={FileCategory.IMAGE} />
 
-      <FileInput name="logo" header="Logo" value={prevCompanyProfile.logo} />
+      <FileInput name="logo" header="Logo" value={prevCompanyProfile.logo} category={FileCategory.IMAGE} />
 
       <label>
         <Text as="div" size="2" mb="1" weight="bold">
diff --git a/components/EditStudent.tsx b/components/EditStudent.tsx
index b5e84aff..d498304e 100644
--- a/components/EditStudent.tsx
+++ b/components/EditStudent.tsx
@@ -3,7 +3,7 @@
 import { DangerZone } from "@/components/DeleteStudent"
 import DialogTOS from "@/components/DialogTOS"
 import { updateStudent } from "@/lib/crud/students"
-import { ServerSideFormHandler } from "@/lib/types"
+import { FileCategory, ServerSideFormHandler } from "@/lib/types"
 
 import Chip from "./Chip"
 import FileInput from "./FileInput"
@@ -125,8 +125,13 @@ const EditStudentForm = ({
           </Flex>
         </label>
 
-        <FileInput name="cv" header="CV" value={prevStudentProfile.cv} />
-        <FileInput name="avatar" header="Profile Picture" value={prevStudentProfile.user.image} />
+        <FileInput name="cv" header="CV" value={prevStudentProfile.cv} category={FileCategory.DOCUMENT} />
+        <FileInput
+          name="avatar"
+          header="Profile Picture"
+          value={prevStudentProfile.user.image}
+          category={FileCategory.IMAGE}
+        />
 
         <label>
           <Text as="div" size="2" mb="1" weight="bold">
diff --git a/components/FileInput.tsx b/components/FileInput.tsx
index 4b3b0e3b..914fdf30 100644
--- a/components/FileInput.tsx
+++ b/components/FileInput.tsx
@@ -1,4 +1,6 @@
 import { FileViewer } from "@/components/FileViewer"
+import { allowedDocumentTypes, allowedImageTypes } from "@/lib/constants"
+import { FileCategory } from "@/lib/types"
 
 import { Button, Flex, Text } from "@radix-ui/themes"
 import { useState } from "react"
@@ -9,11 +11,29 @@ import { BsCloudUploadFill, BsSearch } from "react-icons/bs"
  * @param name - The name of the file input for the form.
  * @param header - The header of the file input to show on the page.
  * @param value - The path to the current file, if any.
+ * @param category - The category of the file - image or document.
  */
-const FileInput = ({ name, header, value }: { name: string; header: string; value?: string | null }) => {
+const FileInput = ({
+  name,
+  header,
+  value,
+  category,
+}: {
+  name: string
+  header: string
+  value?: string | null
+  category: FileCategory | "ANY"
+}) => {
   const [filePath, setFilePath] = useState(value ? `/api/uploads/${value}` : "")
   const [file, setFile] = useState<File | null>(null)
 
+  const allowedFileTypes =
+    category === "ANY"
+      ? "*"
+      : category === FileCategory.IMAGE
+        ? allowedImageTypes.join(",")
+        : allowedDocumentTypes.join(",")
+
   return (
     <>
       <Text as="div" size="2" weight="bold">
@@ -25,6 +45,7 @@ const FileInput = ({ name, header, value }: { name: string; header: string; valu
             <input
               type="file"
               hidden
+              accept={allowedFileTypes}
               name={name}
               onChange={e => {
                 const file = e.target.files?.[0]
diff --git a/components/UpsertEvent.tsx b/components/UpsertEvent.tsx
index 72272a2b..64227629 100644
--- a/components/UpsertEvent.tsx
+++ b/components/UpsertEvent.tsx
@@ -78,7 +78,7 @@ const UpsertEventForm = ({
         />
       </label>
 
-      <FileInput name="attachment" header="Attachment" value={prevEvent?.attachment} />
+      <FileInput name="attachment" header="Attachment" value={prevEvent?.attachment} category="ANY" />
 
       <label>
         <Text as="div" size="2" mb="1" weight="bold">
diff --git a/lib/constants.ts b/lib/constants.ts
index b4de3ab1..c622d6d6 100644
--- a/lib/constants.ts
+++ b/lib/constants.ts
@@ -3,3 +3,7 @@ export const TIMEZONE = "Europe/London"
 
 // The maximum file size in bytes
 export const MAX_FILE_SIZE = 10 * 1_000_000 - 1 //10MB
+
+// Must be the same as the allowed file types in the file viewer
+export const allowedImageTypes = ["image/png", "image/jpeg", "image/gif", "image/svg+xml"]
+export const allowedDocumentTypes = ["application/pdf", "text/plain"]
diff --git a/lib/files/saveFile.ts b/lib/files/saveFile.ts
index 9ed90b09..6cf879f7 100644
--- a/lib/files/saveFile.ts
+++ b/lib/files/saveFile.ts
@@ -1,14 +1,12 @@
-import { MAX_FILE_SIZE } from "@/lib/constants"
+"use server"
+
+import { MAX_FILE_SIZE, allowedDocumentTypes, allowedImageTypes } from "@/lib/constants"
 import { FileCategory } from "@/lib/types"
 
 import { promises as fs } from "fs"
 import { join } from "path"
 import path from "path"
 
-// Must be the same as the allowed file types in the file viewer
-const allowedImageTypes = ["image/png", "image/jpeg", "image/gif", "image/svg+xml"]
-const allowedDocumentTypes = ["application/pdf", "text/plain"]
-
 /**
  * Save a file to the file system
  * @param filePath The path in the volume to save the file
@@ -24,7 +22,7 @@ export const saveFile = async (filePath: string, file: File, fileType: FileCateg
 
   // Validate the file and path
   validateFile(file, fileType)
-  if (!validateFilePath(filePath)) {
+  if (!(await validateFilePath(filePath))) {
     throw new Error("Invalid path", {
       cause: "The path provided is invalid",
     })
@@ -38,7 +36,7 @@ export const saveFile = async (filePath: string, file: File, fileType: FileCateg
  * @param filePath The path to validate
  * @returns Whether the path is safe
  */
-export const validateFilePath = (filePath: string): boolean => {
+export const validateFilePath = async (filePath: string): Promise<boolean> => {
   // Normalize the path to move all the ../ to the front of the path
   // Apply regex to remove any ../ from the front of the path
   const safePath = path.normalize(filePath).replace(/^(\.\.(\/|\\|$))+/, "")
@@ -84,11 +82,11 @@ const validateFile = (file: File, fileType: FileCategory) => {
  * Can be used to check if a file has been provided
  * @param file The file to check
  */
-export const isFileNotEmpty = (file: File) => file.size > 0
+export const isFileNotEmpty = async (file: File) => file.size > 0
 
 /**
  * Get the file extension of a file
  * @param file The file to get the extension of
  * @example getFileExtension(<some png image>) => "png"
  */
-export const getFileExtension = (file: File) => file.type.split("/")[1].split("+")[0]
+export const getFileExtension = async (file: File) => file.type.split("/")[1].split("+")[0]

From 2d7a154c5c74fe638246019b816d90af2a6471b0 Mon Sep 17 00:00:00 2001
From: Alexander Biraben-Renard <ab1223@ic.ac.uk>
Date: Tue, 1 Oct 2024 17:08:41 +0100
Subject: [PATCH 2/2] fix: await promises returned from async file helper
 functions

---
 lib/files/updateUpload.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/files/updateUpload.ts b/lib/files/updateUpload.ts
index a85d9160..1d374d4c 100644
--- a/lib/files/updateUpload.ts
+++ b/lib/files/updateUpload.ts
@@ -40,8 +40,8 @@ export const updateUpload = async (
   getOldPath: () => Promise<string | null | undefined>,
   setNewPath: (path: string) => Promise<any>,
 ): Promise<FormPassBackState> => {
-  if (isFileNotEmpty(file)) {
-    const filePath = `${folder}/${randomBytes(16).toString("hex")}.${getFileExtension(file)}`
+  if (await isFileNotEmpty(file)) {
+    const filePath = `${folder}/${randomBytes(16).toString("hex")}.${await getFileExtension(file)}`
 
     // Save the new file to the file system
     try {