@uniorganization/uni-lib 4.1.1 → 4.1.2

package/dist/modules/common/common.module.js

@@ -27,6 +27,6 @@ exports.CommonModule = CommonModule = __decorate([
             }),
         ],
         providers: [jwt_strategy_1.JwtStrategy, jwt_auth_guard_1.JwtAuthGuard],
-        exports: [jwt_auth_guard_1.JwtAuthGuard, passport_1.PassportModule, jwt_1.JwtModule, tenant_1.TenantModule],
+        exports: [jwt_auth_guard_1.JwtAuthGuard, jwt_strategy_1.JwtStrategy, passport_1.PassportModule, jwt_1.JwtModule, tenant_1.TenantModule],
     })
 ], CommonModule);

package/dist/modules/file-storage/file-storage.service.d.ts

@@ -1,6 +1,7 @@
 import { Repository } from 'typeorm';
 import { FileEntity } from '../../entities/file.entity';
 import { FileTypeEntity } from '../../entities/file-type.entity';
+import { TenantContext } from '../tenant/tenant-context.service';
 export interface FileStorageUploadOptions {
     fileTypeCode?: string;
     fileTypeId?: number;
@@ -16,13 +17,16 @@ export interface FileStorageUploadFile {
 export declare class FileStorageService {
     private readonly fileRepository;
     private readonly fileTypeRepository;
+    private readonly tenantContext?;
     private readonly logger;
     private readonly s3Client;
-    constructor(fileRepository: Repository<FileEntity>, fileTypeRepository: Repository<FileTypeEntity>);
+    constructor(fileRepository: Repository<FileEntity>, fileTypeRepository: Repository<FileTypeEntity>, tenantContext?: TenantContext);
     uploadDocument(file: FileStorageUploadFile, options: FileStorageUploadOptions): Promise<FileEntity>;
     deleteDocument(file: Pick<FileEntity, 'id' | 'path'>): Promise<void>;
     downloadDocument(bucketPath: string): Promise<Buffer>;
     resolveFileType(fileTypeCode?: string, fileTypeId?: number): Promise<FileTypeEntity>;
+    private findFileType;
+    private getClientId;
     private createS3Client;
     private putObject;
     private deleteObject;

package/dist/modules/file-storage/file-storage.service.js

@@ -37,11 +37,13 @@ const typeorm_2 = require("typeorm");
 const node_crypto_1 = require("node:crypto");
 const file_entity_1 = require("../../entities/file.entity");
 const file_type_entity_1 = require("../../entities/file-type.entity");
+const tenant_context_service_1 = require("../tenant/tenant-context.service");
 const constants_1 = require("./constants");
 let FileStorageService = FileStorageService_1 = class FileStorageService {
-    constructor(fileRepository, fileTypeRepository) {
+    constructor(fileRepository, fileTypeRepository, tenantContext) {
         this.fileRepository = fileRepository;
         this.fileTypeRepository = fileTypeRepository;
+        this.tenantContext = tenantContext;
         this.logger = new common_1.Logger(FileStorageService_1.name);
         this.s3Client = this.createS3Client();
     }
@@ -58,11 +60,16 @@ let FileStorageService = FileStorageService_1 = class FileStorageService {
             const extension = (0, constants_1.extractFileExtension)(file.originalname);
             const uniqueId = (0, node_crypto_1.randomUUID)();
             const bucketPrefix = process.env[constants_1.FILE_STORAGE_BUCKET_PREFIX_ENV];
+            const clientId = this.getClientId();
+            const tenantBucketPrefix = [bucketPrefix, `client-${clientId}`]
+                .filter(Boolean)
+                .join('/');
             const bucketName = this.getRequiredEnv(constants_1.FILE_STORAGE_BUCKET_NAME_ENV);
-            const bucketPath = (0, constants_1.buildBucketPath)(bucketPrefix, fileType.code, uniqueId, file.originalname);
+            const bucketPath = (0, constants_1.buildBucketPath)(tenantBucketPrefix, fileType.code, uniqueId, file.originalname);
             yield this.putObject(bucketName, bucketPath, file);
             try {
                 const fileRecord = this.fileRepository.create({
+                    clientId,
                     name: file.originalname,
                     typeId: fileType.id,
                     path: bucketPath,
@@ -82,17 +89,38 @@ let FileStorageService = FileStorageService_1 = class FileStorageService {
     deleteDocument(file) {
         return __awaiter(this, void 0, void 0, function* () {
             const bucketName = this.getRequiredEnv(constants_1.FILE_STORAGE_BUCKET_NAME_ENV);
-            yield this.deleteObject(bucketName, file.path);
-            yield this.fileRepository.softDelete(file.id);
+            const ownedFile = yield this.fileRepository.findOne({
+                where: {
+                    id: file.id,
+                    clientId: this.getClientId(),
+                },
+            });
+            if (!ownedFile) {
+                throw new Error('File not found');
+            }
+            yield this.deleteObject(bucketName, ownedFile.path);
+            yield this.fileRepository.softDelete({
+                id: ownedFile.id,
+                clientId: this.getClientId(),
+            });
         });
     }
     downloadDocument(bucketPath) {
         return __awaiter(this, void 0, void 0, function* () {
             const bucketName = this.getRequiredEnv(constants_1.FILE_STORAGE_BUCKET_NAME_ENV);
+            const ownedFile = yield this.fileRepository.findOne({
+                where: {
+                    path: bucketPath,
+                    clientId: this.getClientId(),
+                },
+            });
+            if (!ownedFile) {
+                throw new Error('File not found');
+            }
             try {
                 const response = yield this.s3Client.send(new client_s3_1.GetObjectCommand({
                     Bucket: bucketName,
-                    Key: bucketPath,
+                    Key: ownedFile.path,
                 }));
                 if (!response.Body) {
                     throw new Error(`Empty body returned for bucket path "${bucketPath}"`);
@@ -111,8 +139,8 @@ let FileStorageService = FileStorageService_1 = class FileStorageService {
         return __awaiter(this, void 0, void 0, function* () {
             if (fileTypeCode && typeof fileTypeId === 'number') {
                 const [byCode, byId] = yield Promise.all([
-                    this.fileTypeRepository.findOne({ where: { code: fileTypeCode } }),
-                    this.fileTypeRepository.findOne({ where: { id: fileTypeId } }),
+                    this.findFileType({ code: fileTypeCode }),
+                    this.findFileType({ id: fileTypeId }),
                 ]);
                 if (!byCode) {
                     throw new Error(`File type not found for code "${fileTypeCode}"`);
@@ -126,14 +154,14 @@ let FileStorageService = FileStorageService_1 = class FileStorageService {
                 return byCode;
             }
             if (fileTypeCode) {
-                const fileType = yield this.fileTypeRepository.findOne({ where: { code: fileTypeCode } });
+                const fileType = yield this.findFileType({ code: fileTypeCode });
                 if (!fileType) {
                     throw new Error(`File type not found for code "${fileTypeCode}"`);
                 }
                 return fileType;
             }
             if (typeof fileTypeId === 'number') {
-                const fileType = yield this.fileTypeRepository.findOne({ where: { id: fileTypeId } });
+                const fileType = yield this.findFileType({ id: fileTypeId });
                 if (!fileType) {
                     throw new Error(`File type not found for id "${fileTypeId}"`);
                 }
@@ -142,6 +170,30 @@ let FileStorageService = FileStorageService_1 = class FileStorageService {
             throw new Error('Either fileTypeCode or fileTypeId must be provided');
         });
     }
+    findFileType(options) {
+        const clientId = this.getClientId();
+        const query = this.fileTypeRepository
+            .createQueryBuilder('fileType')
+            .where('(fileType.client_id = :clientId OR fileType.client_id IS NULL)', {
+            clientId,
+        })
+            .andWhere('fileType.deletedDate IS NULL')
+            .orderBy('CASE WHEN fileType.client_id = :clientId THEN 0 ELSE 1 END', 'ASC')
+            .setParameter('clientId', clientId);
+        if (options.code) {
+            query.andWhere('fileType.code = :code', { code: options.code });
+        }
+        if (typeof options.id === 'number') {
+            query.andWhere('fileType.id = :id', { id: options.id });
+        }
+        return query.getOne();
+    }
+    getClientId() {
+        if (!this.tenantContext) {
+            throw new Error('File storage requires an active tenant context');
+        }
+        return this.tenantContext.getClientId();
+    }
     createS3Client() {
         const region = this.getRequiredEnv(constants_1.FILE_STORAGE_BUCKET_REGION_ENV);
         const accessKeyId = this.getRequiredEnv(constants_1.FILE_STORAGE_BUCKET_ACCESS_KEY_ID_ENV);
@@ -229,6 +281,8 @@ exports.FileStorageService = FileStorageService = FileStorageService_1 = __decor
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_1.InjectRepository)(file_entity_1.FileEntity)),
     __param(1, (0, typeorm_1.InjectRepository)(file_type_entity_1.FileTypeEntity)),
+    __param(2, (0, common_1.Optional)()),
     __metadata("design:paramtypes", [typeorm_2.Repository,
-        typeorm_2.Repository])
+        typeorm_2.Repository,
+        tenant_context_service_1.TenantContext])
 ], FileStorageService);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniorganization/uni-lib",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "UNI Library",
   "author": "Jhomiguel",
   "main": "dist/index.js",
@@ -9,6 +9,17 @@
     "dist/**/*",
     "*.md"
   ],
+  "scripts": {
+    "start:dev": "tsc -w",
+    "build": "tsc",
+    "prepublishOnly": "pnpm run build",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "lint": "tslint -p tsconfig.json -c tslint.json",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:cov": "jest --coverage",
+    "test:e2e": "jest --config ./test/jest-e2e.json"
+  },
   "dependencies": {
     "@googlemaps/google-maps-services-js": "^3.4.2",
     "@aws-sdk/client-s3": "^3.833.0",
@@ -71,15 +82,5 @@
     },
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
-  },
-  "scripts": {
-    "start:dev": "tsc -w",
-    "build": "tsc",
-    "format": "prettier --write \"src/**/*.ts\"",
-    "lint": "tslint -p tsconfig.json -c tslint.json",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:cov": "jest --coverage",
-    "test:e2e": "jest --config ./test/jest-e2e.json"
   }
-}
+}