@programisto/edrm-storage 1.0.6 → 1.0.9

package/dist/modules/edrm-storage/routes/edrm-storage.router.js

@@ -1,4 +1,5 @@
 import { EnduranceRouter } from '@programisto/endurance';
+import { defaultConfig } from '../config/edrm-storage.config.js';
 import { EdrmStorageService } from '../services/edrm-storage.service.js';
 class EdrmStorageRouter extends EnduranceRouter {
     storageService;
@@ -47,6 +48,9 @@ class EdrmStorageRouter extends EnduranceRouter {
          *               entityId:
          *                 type: string
          *                 description: Identifiant de l’entité métier associée
+         *               public:
+         *                 type: boolean
+         *                 description: Si true, image publique accessible depuis n'importe quelle entité (portalEntityId non défini)
          *               provider:
          *                 type: string
          *                 enum: [S3]
@@ -70,14 +74,23 @@ class EdrmStorageRouter extends EnduranceRouter {
          */
         this.post('/files/init', userOptions, async (req, res) => {
             try {
-                const { originalName, mimeType, size, tenantId, entityName, entityId, provider = 'S3', metadata, tags } = req.body;
-                if (!originalName || !mimeType || !size || !tenantId || !entityName || !entityId) {
+                const { originalName, mimeType, size, tenantId, entityName, entityId, public: isPublic = false, provider = 'S3', metadata, tags } = req.body;
+                const isPublicFile = isPublic === true;
+                const effectiveEntityName = isPublicFile ? 'portal' : entityName;
+                const effectiveEntityId = isPublicFile ? 'all' : entityId;
+                if (!originalName || !mimeType || !size || !tenantId) {
                     return res.status(400).json({
                         success: false,
-                        message: 'Paramètres manquants: originalName, mimeType, size, tenantId, entityName, entityId'
+                        message: 'Paramètres manquants: originalName, mimeType, size, tenantId'
                     });
                 }
-                const result = await this.storageService.initUpload(originalName, mimeType, size, tenantId, entityName, entityId, provider, metadata, tags, req.entity?._id?.toString());
+                if (!isPublicFile && (!entityName || !entityId)) {
+                    return res.status(400).json({
+                        success: false,
+                        message: 'Paramètres manquants: entityName et entityId (ou public: true)'
+                    });
+                }
+                const result = await this.storageService.initUpload(originalName, mimeType, size, tenantId, effectiveEntityName, effectiveEntityId, provider, metadata, tags, isPublicFile ? undefined : req.entity?._id?.toString());
                 return res.json({
                     success: true,
                     data: result
@@ -162,8 +175,14 @@ class EdrmStorageRouter extends EnduranceRouter {
         this.get('/files/:fileId/download', userOptions, async (req, res) => {
             try {
                 const { fileId } = req.params;
-                const { filename, expiresIn = 3600 } = req.query;
-                const result = await this.storageService.getDownloadUrl(fileId, filename, parseInt(expiresIn), req.entity?._id?.toString());
+                const { filename } = req.query;
+                const defaultExp = defaultConfig.general.downloadExpiresIn;
+                const rawExp = req.query.expiresIn;
+                const parsedExp = rawExp != null && String(rawExp).trim() !== ''
+                    ? parseInt(String(rawExp), 10)
+                    : defaultExp;
+                const expiresInSec = Number.isFinite(parsedExp) && parsedExp > 0 ? parsedExp : defaultExp;
+                const result = await this.storageService.getDownloadUrl(fileId, filename, expiresInSec, req.entity?._id?.toString());
                 return res.json({
                     success: true,
                     data: result

package/dist/modules/edrm-storage/services/edrm-storage.service.js

@@ -127,7 +127,8 @@ export class EdrmStorageService {
             url: downloadResponse.url,
             expiresAt: downloadResponse.expiresAt,
             filename: downloadResponse.filename,
-            contentType: downloadResponse.contentType
+            contentType: fileRecord.mimeType || downloadResponse.contentType,
+            size: fileRecord.size
         };
     }
     async deleteFile(fileId, portalEntityId) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@programisto/edrm-storage",
-  "version": "1.0.6",
+  "version": "1.0.9",
   "publishConfig": {
     "access": "public"
   },