@ruiapp/rapid-core 0.1.72 → 0.1.73

package/dist/index.js

@@ -5640,15 +5640,19 @@ const code$7 = "downloadFile";
 async function handler$7(plugin, ctx, options) {
     const { server, applicationConfig, routerContext, input } = ctx;
     const { request, response } = routerContext;
-    const dataAccessor = ctx.server.getDataAccessor({
-        singularCode: "ecm_storage_object",
-    });
-    const storageObject = await dataAccessor.findById(input.fileId);
-    if (!storageObject) {
-        ctx.output = { error: new Error("Storage object not found.") };
-        return;
+    //TODO: only public files can download by this handler
+    let fileKey = input.fileKey;
+    if (!fileKey && input.fileId) {
+        const dataAccessor = ctx.server.getDataAccessor({
+            singularCode: "ecm_storage_object",
+        });
+        const storageObject = await dataAccessor.findById(input.fileId);
+        if (!storageObject) {
+            ctx.output = { error: new Error("Storage object not found.") };
+            return;
+        }
+        fileKey = storageObject.key;
     }
-    const fileKey = storageObject.key;
     const filePathName = path__default["default"].join(server.config.localFileStoragePath, fileKey);
     const attachmentFileName = input.fileName || path__default["default"].basename(fileKey);
     response.body = await readFile(filePathName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.72",
+  "version": "0.1.73",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/plugins/fileManage/actionHandlers/downloadFile.ts

@@ -1,28 +1,33 @@
-import path from "path";
-import { readFile } from "~/utilities/fsUtility";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
-
-export const code = "downloadFile";
-
-export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
-  const { server, applicationConfig, routerContext, input } = ctx;
-  const { request, response } = routerContext;
-
-  const dataAccessor = ctx.server.getDataAccessor({
-    singularCode: "ecm_storage_object",
-  });
-
-  const storageObject = await dataAccessor.findById(input.fileId);
-  if (!storageObject) {
-    ctx.output = { error: new Error("Storage object not found.") };
-    return;
-  }
-
-  const fileKey = storageObject.key;
-  const filePathName = path.join(server.config.localFileStoragePath, fileKey);
-  const attachmentFileName = input.fileName || path.basename(fileKey);
-
-  response.body = await readFile(filePathName);
-  response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(attachmentFileName)}"`);
-}
+import path from "path";
+import { readFile } from "~/utilities/fsUtility";
+import { ActionHandlerContext } from "~/core/actionHandler";
+import { RapidPlugin } from "~/core/server";
+
+export const code = "downloadFile";
+
+export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
+  const { server, applicationConfig, routerContext, input } = ctx;
+  const { request, response } = routerContext;
+  //TODO: only public files can download by this handler
+
+  let fileKey: string = input.fileKey;
+
+  if (!fileKey && input.fileId) {
+    const dataAccessor = ctx.server.getDataAccessor({
+      singularCode: "ecm_storage_object",
+    });
+
+    const storageObject = await dataAccessor.findById(input.fileId);
+    if (!storageObject) {
+      ctx.output = { error: new Error("Storage object not found.") };
+      return;
+    }
+
+    fileKey = storageObject.key;
+  }
+  const filePathName = path.join(server.config.localFileStoragePath, fileKey);
+  const attachmentFileName = input.fileName || path.basename(fileKey);
+
+  response.body = await readFile(filePathName);
+  response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(attachmentFileName)}"`);
+}