@programisto/edrm-storage 1.0.5 → 1.0.7

package/dist/modules/edrm-storage/models/file.model.d.ts

@@ -40,6 +40,7 @@ export interface IFile {
     tenantId?: string;
     entityName?: string;
     entityId?: string;
+    portalEntityId?: string;
     uploadedBy?: string;
     expiresAt?: Date;
     lastAccessedAt?: Date;
@@ -65,6 +66,8 @@ declare class File extends EnduranceSchema implements IFile {
     tenantId: string;
     entityName: string;
     entityId: string;
+    /** Identifiant de l'entité du portail (multi-entités). Optionnel pour rétrocompatibilité. */
+    portalEntityId: string;
     uploadedBy: string;
     expiresAt: Date;
     lastAccessedAt: Date;

package/dist/modules/edrm-storage/models/file.model.js

@@ -56,6 +56,8 @@ let File = class File extends EnduranceSchema {
     tenantId;
     entityName;
     entityId;
+    /** Identifiant de l'entité du portail (multi-entités). Optionnel pour rétrocompatibilité. */
+    portalEntityId;
     uploadedBy;
     expiresAt;
     lastAccessedAt;
@@ -140,6 +142,10 @@ __decorate([
     EnduranceModelType.prop({ required: false }),
     __metadata("design:type", String)
 ], File.prototype, "entityId", void 0);
+__decorate([
+    EnduranceModelType.prop({ required: false }),
+    __metadata("design:type", String)
+], File.prototype, "portalEntityId", void 0);
 __decorate([
     EnduranceModelType.prop({ required: false }),
     __metadata("design:type", String)

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

@@ -47,6 +47,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 +73,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);
+                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
@@ -114,7 +126,7 @@ class EdrmStorageRouter extends EnduranceRouter {
         this.post('/files/:fileId/complete', userOptions, async (req, res) => {
             try {
                 const { fileId } = req.params;
-                const result = await this.storageService.completeUpload(fileId);
+                const result = await this.storageService.completeUpload(fileId, req.entity?._id?.toString());
                 return res.json({
                     success: true,
                     data: result
@@ -163,7 +175,7 @@ class EdrmStorageRouter extends EnduranceRouter {
             try {
                 const { fileId } = req.params;
                 const { filename, expiresIn = 3600 } = req.query;
-                const result = await this.storageService.getDownloadUrl(fileId, filename, parseInt(expiresIn));
+                const result = await this.storageService.getDownloadUrl(fileId, filename, parseInt(expiresIn), req.entity?._id?.toString());
                 return res.json({
                     success: true,
                     data: result
@@ -200,7 +212,7 @@ class EdrmStorageRouter extends EnduranceRouter {
         this.delete('/files/:fileId', adminOptions, async (req, res) => {
             try {
                 const { fileId } = req.params;
-                await this.storageService.deleteFile(fileId);
+                await this.storageService.deleteFile(fileId, req.entity?._id?.toString());
                 return res.json({
                     success: true,
                     message: 'Fichier supprimé avec succès'
@@ -264,7 +276,7 @@ class EdrmStorageRouter extends EnduranceRouter {
         this.get('/files', adminOptions, async (req, res) => {
             try {
                 const { tenantId, entityName, entityId, status, page = 1, limit = 20 } = req.query;
-                const result = await this.storageService.listFiles(tenantId, entityName, entityId, status, parseInt(page), parseInt(limit));
+                const result = await this.storageService.listFiles(tenantId, entityName, entityId, status, parseInt(page), parseInt(limit), req.entity?._id?.toString());
                 return res.json({
                     success: true,
                     data: result
@@ -301,7 +313,7 @@ class EdrmStorageRouter extends EnduranceRouter {
         this.get('/files/:fileId', userOptions, async (req, res) => {
             try {
                 const { fileId } = req.params;
-                const result = await this.storageService.getFileById(fileId);
+                const result = await this.storageService.getFileById(fileId, req.entity?._id?.toString());
                 return res.json({
                     success: true,
                     data: result

package/dist/modules/edrm-storage/services/edrm-storage.service.d.ts

@@ -7,7 +7,7 @@ export declare class EdrmStorageService {
     private getProvider;
     private generateKey;
     private detectFileType;
-    initUpload(originalName: string, mimeType: string, size: number, tenantId: string, entityName: string, entityId: string, provider?: FileProvider, metadata?: Record<string, any>, tags?: string[]): Promise<{
+    initUpload(originalName: string, mimeType: string, size: number, tenantId: string, entityName: string, entityId: string, provider?: FileProvider, metadata?: Record<string, any>, tags?: string[], portalEntityId?: string): Promise<{
         fileId: import("mongoose").Types.ObjectId;
         uploadId: string;
         presignedUrl: string;
@@ -15,14 +15,14 @@ export declare class EdrmStorageService {
         bucket: string;
         key: string;
     }>;
-    completeUpload(fileId: string): Promise<any>;
-    getDownloadUrl(fileId: string, filename?: string, expiresIn?: number): Promise<any>;
-    deleteFile(fileId: string): Promise<void>;
-    listFiles(tenantId?: string, entityName?: string, entityId?: string, status?: FileStatus, page?: number, limit?: number): Promise<{
+    completeUpload(fileId: string, portalEntityId?: string): Promise<any>;
+    getDownloadUrl(fileId: string, filename?: string, expiresIn?: number, portalEntityId?: string): Promise<any>;
+    deleteFile(fileId: string, portalEntityId?: string): Promise<void>;
+    listFiles(tenantId?: string, entityName?: string, entityId?: string, status?: FileStatus, page?: number, limit?: number, portalEntityId?: string): Promise<{
         files: any[];
         total: number;
         page: number;
         totalPages: number;
     }>;
-    getFileById(fileId: string): Promise<any>;
+    getFileById(fileId: string, portalEntityId?: string): Promise<any>;
 }

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

@@ -41,7 +41,7 @@ export class EdrmStorageService {
             return FileType.ARCHIVE;
         return FileType.OTHER;
     }
-    async initUpload(originalName, mimeType, size, tenantId, entityName, entityId, provider = this.defaultProvider, metadata, tags) {
+    async initUpload(originalName, mimeType, size, tenantId, entityName, entityId, provider = this.defaultProvider, metadata, tags, portalEntityId) {
         const bucket = process.env.S3_BUCKET || 'edrm-storage';
         const key = this.generateKey(tenantId, entityName, entityId, originalName);
         const storageProvider = this.getProvider(provider);
@@ -64,6 +64,7 @@ export class EdrmStorageService {
             tenantId,
             entityName,
             entityId,
+            ...(portalEntityId && { portalEntityId }),
             uploadedBy: 'system', // À remplacer par l'utilisateur connecté
             accessCount: 0
         });
@@ -77,11 +78,14 @@ export class EdrmStorageService {
             key
         };
     }
-    async completeUpload(fileId) {
+    async completeUpload(fileId, portalEntityId) {
         const fileRecord = await FileModel.findById(fileId);
         if (!fileRecord) {
             throw new Error('Fichier non trouvé');
         }
+        if (portalEntityId && fileRecord.portalEntityId && fileRecord.portalEntityId !== portalEntityId) {
+            throw new Error('Fichier non trouvé');
+        }
         const storageProvider = this.getProvider(fileRecord.provider);
         try {
             // Vérifier que le fichier existe dans le stockage
@@ -102,11 +106,14 @@ export class EdrmStorageService {
             throw new Error(`Erreur lors de la finalisation de l'upload: ${error}`);
         }
     }
-    async getDownloadUrl(fileId, filename, expiresIn = 3600) {
+    async getDownloadUrl(fileId, filename, expiresIn = 3600, portalEntityId) {
         const fileRecord = await FileModel.findById(fileId);
         if (!fileRecord) {
             throw new Error('Fichier non trouvé');
         }
+        if (portalEntityId && fileRecord.portalEntityId && fileRecord.portalEntityId !== portalEntityId) {
+            throw new Error('Fichier non trouvé');
+        }
         if (fileRecord.status !== FileStatus.COMPLETED) {
             throw new Error('Fichier non encore finalisé');
         }
@@ -123,11 +130,14 @@ export class EdrmStorageService {
             contentType: downloadResponse.contentType
         };
     }
-    async deleteFile(fileId) {
+    async deleteFile(fileId, portalEntityId) {
         const fileRecord = await FileModel.findById(fileId);
         if (!fileRecord) {
             throw new Error('Fichier non trouvé');
         }
+        if (portalEntityId && fileRecord.portalEntityId && fileRecord.portalEntityId !== portalEntityId) {
+            throw new Error('Fichier non trouvé');
+        }
         const storageProvider = this.getProvider(fileRecord.provider);
         try {
             // Supprimer du stockage
@@ -141,7 +151,7 @@ export class EdrmStorageService {
             throw new Error(`Erreur lors de la suppression: ${error}`);
         }
     }
-    async listFiles(tenantId, entityName, entityId, status, page = 1, limit = 20) {
+    async listFiles(tenantId, entityName, entityId, status, page = 1, limit = 20, portalEntityId) {
         const query = {};
         if (tenantId)
             query.tenantId = tenantId;
@@ -149,6 +159,8 @@ export class EdrmStorageService {
             query.entityName = entityName;
         if (entityId)
             query.entityId = entityId;
+        if (portalEntityId)
+            query.portalEntityId = portalEntityId;
         if (status)
             query.status = status;
         const skip = (page - 1) * limit;
@@ -167,11 +179,14 @@ export class EdrmStorageService {
             totalPages: Math.ceil(total / limit)
         };
     }
-    async getFileById(fileId) {
+    async getFileById(fileId, portalEntityId) {
         const fileRecord = await FileModel.findById(fileId);
         if (!fileRecord) {
             throw new Error('Fichier non trouvé');
         }
+        if (portalEntityId && fileRecord.portalEntityId && fileRecord.portalEntityId !== portalEntityId) {
+            throw new Error('Fichier non trouvé');
+        }
         return fileRecord;
     }
 }

package/package.json

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