Merge pull request #34 from dandanthedev/dev

Add downloadAs type
dandanthedev · Aug 11, 2024 · acafe28 · acafe28
2 parents 1ab1600 + 0d58fb5
commit acafe28
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 22 deletions.
diff --git a/src/api/generateToken.ts b/src/api/generateToken.ts
@@ -12,13 +12,16 @@ export default async function handle(
   const file = params.get("file");
   const type = params.get("type");
   const expiresIn = params.get("expiresIn");
+  const downloadAs = params.get("downloadAs");
 
   if (!buckets.includes(bucket)) return resp(res, 400, "Invalid bucket");
 
   if (type && ["upload", "download", "delete", "rename"].indexOf(type) === -1)
     return resp(res, 400, "Invalid type");
 
-  const token = await generateSignedToken(bucket, file, type, expiresIn);
+  if(downloadAs && type && type !== "download") return resp(res, 400, "Downloadas can only be used on a download type")
+
+  const token = await generateSignedToken(bucket, file, type, expiresIn, downloadAs);
   if (!token) return resp(res, 400, "Error generating token");
 
   resp(res, 200, token);

diff --git a/src/http.ts b/src/http.ts
@@ -57,6 +57,14 @@ async function canAccessFile(
     if (timeLeft) res.setHeader("Token-ExpiresIn", timeLeft ?? "never");
     if (decoded?.file) res.setHeader("Token-File", decoded.file ?? "any");
     if (decoded?.type) res.setHeader("Token-Type", decoded.type ?? "any");
+    if (decoded?.downloadAs) {
+      res.setHeader("Token-DownloadAs", decoded.downloadAs ?? "any");
+      if (type === "download")
+        res.setHeader(
+          "ResponseContentDisposition",
+          `attachment; filename="${decoded.downloadAs}"`
+        );
+    }
   }
 
   return true;
@@ -188,28 +196,8 @@ export const requestListener = async function (
     else if (req.method === "HEAD") type = "head";
     else return resp(res, 400, "Invalid method");
 
-    if (
-      ((await canAccessFile(bucket, null, file, "download", res)) === true &&
-        type === "download") ||
-      type === "head"
-    ) {
-      if (req.method === "HEAD") {
-        const stats = getFileStats(bucket, file);
-        if (!stats) return resp(res, 404);
-        res.setHeader("Content-Length", stats.size);
-        return resp(res, 204);
-      } else if (req.method === "GET") {
-        //if accessible without authentication
-        const foundFile = streamFile(bucket, file);
-        if (!foundFile) return resp(res, 404);
-        return resp(res, 200, foundFile, "file");
-      }
-    }
-
     const key = params.get("key");
 
-    if (!key) return resp(res, 401, "Key required");
-
     const canAccess = await canAccessFile(bucket, key, file, type, res);
     if (canAccess !== true) return resp(res, 401, canAccess);
 

diff --git a/src/jwt.ts b/src/jwt.ts
@@ -8,13 +8,15 @@ export async function generateSignedToken(
   bucket: string | null,
   file: string | null,
   type: string | null,
-  expiry?: string | number | null
+  expiry?: string | number | null,
+  downloadAs?: string | null
 ) {
   try {
     const token = new jose.SignJWT({
       bucket,
       file,
       type,
+      downloadAs,
     });
     token.setExpirationTime(expiry ?? "60s");
     token.setProtectedHeader({