@flusys/nestjs-storage 0.1.0-beta.2 → 1.0.0-beta

package/cjs/services/file-manager.service.js

@@ -90,6 +90,13 @@ const USER_ACTION_PERMISSION_CACHE_KEY = 'user_action_permission';
 const SHOW_PRIVATE_FILE_ACTION = 'storage.file.viewPrivate';
 let FileManagerService = class FileManagerService extends _classes.RequestScopedApiService {
     /**
+   * Get base URL for file serving
+   * Priority: appUrl config > request headers
+   */ getFileBaseUrl(protocol, host) {
+        const appUrl = this.storageConfig.getAppUrl();
+        return appUrl?.replace(/\/$/, '') ?? `${protocol}://${host}`;
+    }
+    /**
    * Resolve entity class for this service
    * @returns FileManager or FileManagerWithCompany based on configuration
    */ resolveEntity() {
@@ -188,6 +195,7 @@ let FileManagerService = class FileManagerService extends _classes.RequestScoped
                 'key',
                 'url',
                 'location',
+                'storageConfigId',
                 'isPrivate',
                 'createdAt',
                 'deletedAt'
@@ -198,6 +206,7 @@ let FileManagerService = class FileManagerService extends _classes.RequestScoped
         if (this.storageConfig.isCompanyFeatureEnabled()) {
             selectFields.push('file_manager.companyId');
         }
+        // Join folder
         selectFields.push('folder.id');
         selectFields.push('folder.name');
         query.leftJoinAndSelect('file_manager.folder', 'folder');
@@ -207,6 +216,57 @@ let FileManagerService = class FileManagerService extends _classes.RequestScoped
             isRaw: false
         };
     }
+    /**
+   * Enrich file list with provider names from storage_config table
+   * Call this method to add providerName to the list results
+   */ async enrichWithProviderNames(items) {
+        // Get unique storage config IDs
+        const configIds = [
+            ...new Set(items.map((item)=>item.storageConfigId).filter(Boolean))
+        ];
+        this.logger.debug(`enrichWithProviderNames: items count=${items.length}, configIds=${JSON.stringify(configIds)}`);
+        if (configIds.length === 0) {
+            this.logger.debug('enrichWithProviderNames: No storage config IDs found in items');
+            return items.map((item)=>({
+                    ...item,
+                    providerName: undefined
+                }));
+        }
+        // Fetch storage config names
+        try {
+            const enableCompanyFeature = this.storageConfig.isCompanyFeatureEnabled();
+            const storageConfigEntity = enableCompanyFeature ? (await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")))).StorageConfigWithCompany : (await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")))).StorageConfig;
+            const storageConfigRepository = await this.dataSourceProvider.getRepository(storageConfigEntity);
+            const configs = await storageConfigRepository.find({
+                where: {
+                    id: (0, _typeorm.In)(configIds)
+                },
+                select: [
+                    'id',
+                    'name'
+                ]
+            });
+            this.logger.debug(`enrichWithProviderNames: Found ${configs.length} configs: ${JSON.stringify(configs)}`);
+            // Create a map for quick lookup
+            const configNameMap = new Map(configs.map((c)=>[
+                    c.id,
+                    c.name
+                ]));
+            // Enrich items with provider names
+            const enrichedItems = items.map((item)=>({
+                    ...item,
+                    providerName: item.storageConfigId ? configNameMap.get(item.storageConfigId) : undefined
+                }));
+            this.logger.debug(`enrichWithProviderNames: First enriched item: ${JSON.stringify(enrichedItems[0])}`);
+            return enrichedItems;
+        } catch (error) {
+            this.logger.warn(`Failed to fetch provider names: ${error}`);
+            return items.map((item)=>({
+                    ...item,
+                    providerName: undefined
+                }));
+        }
+    }
     async getFilterQuery(query, filter, _user) {
         Object.entries(filter).forEach(([key, value])=>{
             if (key === 'contentType') {
@@ -269,7 +329,7 @@ let FileManagerService = class FileManagerService extends _classes.RequestScoped
         }
         return result;
     }
-    async beforeDeleteOperation(dto, _user, _queryRunner) {
+    async beforeDeleteOperation(dto, user, _queryRunner) {
         if (dto.type === 'permanent') {
             const ids = Array.isArray(dto.id) ? dto.id : [
                 dto.id
@@ -282,13 +342,46 @@ let FileManagerService = class FileManagerService extends _classes.RequestScoped
             fileManager.forEach((file)=>{
                 const configId = file.storageConfigId || 'default';
                 if (!filesByConfig.has(configId)) {
-                    filesByConfig.set(configId, []);
+                    filesByConfig.set(configId, {
+                        keys: [],
+                        location: file.location
+                    });
                 }
-                filesByConfig.get(configId).push(file.key);
+                filesByConfig.get(configId).keys.push(file.key);
             });
             // Delete files from each storage config
-            for (const [configId, keys] of filesByConfig){
-                await this.uploadService.deleteMultipleFile(keys, configId === 'default' ? undefined : configId);
+            for (const [configId, { keys, location }] of filesByConfig){
+                // For local files with old key format (no '/'), we need to prefix with basePath
+                let deleteKeys = keys;
+                if (location === _filelocationenum.FileLocationEnum.LOCAL && configId !== 'default') {
+                    try {
+                        const enableCompanyFeature = this.storageConfig.isCompanyFeatureEnabled();
+                        const storageConfigEntity = enableCompanyFeature ? (await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")))).StorageConfigWithCompany : (await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")))).StorageConfig;
+                        const storageConfigRepository = await this.dataSourceProvider.getRepository(storageConfigEntity);
+                        const config = await storageConfigRepository.findOne({
+                            where: {
+                                id: configId
+                            },
+                            select: [
+                                'id',
+                                'config'
+                            ]
+                        });
+                        if (config && config.config?.basePath) {
+                            const basePath = config.config.basePath.replace(/^\.\//, '');
+                            // Convert old keys to new format
+                            deleteKeys = keys.map((key)=>{
+                                if (!key.includes('/')) {
+                                    return `${basePath}/${key}`;
+                                }
+                                return key;
+                            });
+                        }
+                    } catch (error) {
+                        this.logger.warn(`Failed to get basePath for delete: ${error}`);
+                    }
+                }
+                await this.uploadService.deleteMultipleFile(deleteKeys, configId === 'default' ? undefined : configId, user ?? undefined, location);
             }
         }
     }
@@ -320,13 +413,43 @@ let FileManagerService = class FileManagerService extends _classes.RequestScoped
                     shouldUpdate = true;
                 } catch (error) {
                     this.logger.error(`Failed to generate URL for file ${file.id}: ${error?.message || 'Unknown error'}`);
-                    // Use fallback URL
-                    file.url = `${protocol}://${host}/storage/upload/file/${file.key}`;
+                    // Use fallback URL with appUrl from config
+                    const baseUrl = this.getFileBaseUrl(protocol, host);
+                    file.url = `${baseUrl}/storage/upload/file/${file.key}`;
                 }
             }
             // SFTP/Local files - always construct full URL (no expiry, but need full path)
             if (file.location === _filelocationenum.FileLocationEnum.SFTP || file.location === _filelocationenum.FileLocationEnum.LOCAL) {
-                const expectedUrl = `${protocol}://${host}/storage/upload/file/${file.key}`;
+                // For backward compatibility: if key doesn't include basePath, look it up from config
+                let fileKey = file.key;
+                // Check if key looks like it's missing the basePath (old format)
+                // Old format: "uuid-filename.png"
+                // New format: "uploads/uuid-filename.png" or "uploads/company1/uuid-filename.png"
+                if (!fileKey.includes('/') && file.storageConfigId) {
+                    try {
+                        const enableCompanyFeature = this.storageConfig.isCompanyFeatureEnabled();
+                        const storageConfigEntity = enableCompanyFeature ? (await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")))).StorageConfigWithCompany : (await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")))).StorageConfig;
+                        const storageConfigRepository = await this.dataSourceProvider.getRepository(storageConfigEntity);
+                        const config = await storageConfigRepository.findOne({
+                            where: {
+                                id: file.storageConfigId
+                            },
+                            select: [
+                                'id',
+                                'config'
+                            ]
+                        });
+                        if (config && config.config?.basePath) {
+                            const basePath = config.config.basePath.replace(/^\.\//, ''); // Remove leading ./
+                            fileKey = `${basePath}/${file.key}`;
+                            this.logger.debug(`Prefixed old key with basePath: ${fileKey}`);
+                        }
+                    } catch (error) {
+                        this.logger.warn(`Failed to get basePath for file ${file.id}: ${error}`);
+                    }
+                }
+                const baseUrl = this.getFileBaseUrl(protocol, host);
+                const expectedUrl = `${baseUrl}/storage/upload/file/${fileKey}`;
                 if (file.url !== expectedUrl) {
                     file.url = expectedUrl;
                     shouldUpdate = true;
@@ -337,7 +460,9 @@ let FileManagerService = class FileManagerService extends _classes.RequestScoped
                 id: file.id,
                 name: file.name,
                 contentType: file.contentType,
-                url: file.url || ''
+                url: file.url || '',
+                location: file.location,
+                storageConfigId: file.storageConfigId || undefined
             };
         }));
         // Save only changed records

package/cjs/services/folder.service.js

@@ -42,46 +42,24 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let FolderService = class FolderService extends _classes.RequestScopedApiService {
-    /**
-   * Resolve entity class for this service
-   * @returns Folder or FolderWithCompany based on configuration
-   */ resolveEntity() {
-        const enableCompanyFeature = this.storageConfig.isCompanyFeatureEnabled();
-        return enableCompanyFeature ? _entities.FolderWithCompany : _entities.Folder;
+    resolveEntity() {
+        return this.storageConfig.isCompanyFeatureEnabled() ? _entities.FolderWithCompany : _entities.Folder;
     }
-    /**
-   * Get DataSource provider for this service
-   * @returns StorageDataSourceProvider instance
-   */ getDataSourceProvider() {
+    getDataSourceProvider() {
         return this.dataSourceProvider;
     }
+    // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
-        let folder = {};
-        // NOTE: Using 'id' in dto check instead of instanceof - instanceof may not work after esbuild bundling
-        if ('id' in dto && dto.id && typeof dto.id === 'string') {
-            const dbData = await this.repository.findOne({
-                where: {
-                    id: dto.id
-                }
-            });
-            if (!dbData) {
-                throw new _common.NotFoundException('No such entity data found for update! Please, Try Again.');
-            }
-            folder = dbData;
-        }
-        // Set company/branch IDs if company feature is enabled
-        folder = {
-            ...folder,
-            ...dto
-        };
-        // Only set company fields if they exist on the entity (when company feature is enabled)
-        if ('companyId' in folder) {
-            folder.companyId = user?.companyId ?? null;
+        const entity = await super.convertSingleDtoToEntity(dto, user);
+        // Set companyId from user context if company feature enabled
+        if (this.storageConfig.isCompanyFeatureEnabled()) {
+            entity.companyId = user?.companyId ?? null;
         }
-        return folder;
+        return entity;
     }
+    // Query Customization
     async getSelectQuery(query, _user, select) {
-        if (!select || !select.length) {
+        if (!select?.length) {
             select = [
                 'id',
                 'name',
@@ -89,35 +67,26 @@ let FolderService = class FolderService extends _classes.RequestScopedApiService
                 'createdAt',
                 'deletedAt'
             ];
+            if (this.storageConfig.isCompanyFeatureEnabled()) {
+                select.push('companyId');
+            }
         }
-        const selectFields = select.map((field)=>`${this.entityName}.${field}`);
-        // Add company context fields if company feature is enabled
-        // The entity will have these fields only if company feature is enabled
-        if (this.storageConfig.isCompanyFeatureEnabled()) {
-            selectFields.push('folder.companyId');
-        }
-        query.select(selectFields);
+        query.select(select.map((f)=>`${this.entityName}.${f}`));
         return {
             query,
             isRaw: false
         };
     }
-    /**
-   * Override: Extra query manipulation - Auto-filter by user's company
-   */ async getExtraManipulateQuery(query, filterDto, user) {
+    async getExtraManipulateQuery(query, filterDto, user) {
         const result = await super.getExtraManipulateQuery(query, filterDto, user);
-        // If company feature enabled and user has companyId, filter by user's company
-        const enableCompanyFeature = this.storageConfig.isCompanyFeatureEnabled();
-        if (enableCompanyFeature && user?.companyId) {
+        if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
             query.andWhere('folder.companyId = :companyId', {
                 companyId: user.companyId
             });
         }
         return result;
     }
-    // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
     constructor(cacheManager, utilsService, storageConfig, dataSourceProvider){
-        // Repository will be set asynchronously by RequestScopedApiService
         super('folder', null, cacheManager, utilsService, FolderService.name, true), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider;
     }
 };

package/cjs/services/storage-datasource.provider.js

@@ -83,10 +83,8 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let StorageDataSourceProvider = class StorageDataSourceProvider extends _modules.MultiTenantDataSourceService {
-    // ==================== Factory Methods ====================
-    /**
-   * Build parent options from StorageModuleOptions
-   */ static buildParentOptions(options) {
+    // Factory Methods
+    /** Build parent options from StorageModuleOptions */ static buildParentOptions(options) {
         return {
             bootstrapAppConfig: options.bootstrapAppConfig,
             defaultDatabaseConfig: options.config?.defaultDatabaseConfig,
@@ -94,10 +92,8 @@ let StorageDataSourceProvider = class StorageDataSourceProvider extends _modules
             tenants: options.config?.tenants
         };
     }
-    // ==================== Feature Flags ====================
-    /**
-   * Get global enable company feature flag
-   */ getEnableCompanyFeature() {
+    // Feature Flags
+    /** Get global enable company feature flag */ getEnableCompanyFeature() {
         return this.storageOptions.bootstrapAppConfig?.enableCompanyFeature ?? false;
     }
     /**
@@ -111,11 +107,11 @@ let StorageDataSourceProvider = class StorageDataSourceProvider extends _modules
    */ getEnableCompanyFeatureForCurrentTenant() {
         return this.getEnableCompanyFeatureForTenant(this.getCurrentTenant() ?? undefined);
     }
-    // ==================== Entity Management ====================
+    // Entity Management
     /**
-   * Get storage entities for migrations based on company feature flag
-   * Note: For TypeORM repositories, we always use the base entities (FileManager, etc.)
-   * But for migrations, we need the correct entity based on the feature flag
+   * Get storage entities for migrations based on company feature flag.
+   * For TypeORM repositories, we always use the base entities (FileManager, etc.)
+   * but for migrations, we need the correct entity based on the feature flag.
    */ async getStorageEntities(enableCompanyFeature) {
         const enable = enableCompanyFeature ?? this.getEnableCompanyFeature();
         const { FileManager, Folder, StorageConfig } = await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")));
@@ -135,10 +131,8 @@ let StorageDataSourceProvider = class StorageDataSourceProvider extends _modules
             StorageConfig
         ];
     }
-    // ==================== Overrides ====================
-    /**
-   * Override to dynamically set entities based on tenant config
-   */ async createDataSourceFromConfig(config) {
+    // Overrides
+    /** Override to dynamically set entities based on tenant config */ async createDataSourceFromConfig(config) {
         const currentTenant = this.getCurrentTenant();
         const enableCompanyFeature = this.getEnableCompanyFeatureForTenant(currentTenant ?? undefined);
         const entities = await this.getStorageEntities(enableCompanyFeature);

package/cjs/services/storage-provider-config.service.js

@@ -42,34 +42,24 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let StorageProviderConfigService = class StorageProviderConfigService extends _classes.RequestScopedApiService {
-    /**
-   * Resolve entity class for this service
-   * @returns StorageConfig or StorageConfigWithCompany based on configuration
-   */ resolveEntity() {
-        const enableCompanyFeature = this.storageConfig.isCompanyFeatureEnabled();
-        return enableCompanyFeature ? _entities.StorageConfigWithCompany : _entities.StorageConfig;
+    resolveEntity() {
+        return this.storageConfig.isCompanyFeatureEnabled() ? _entities.StorageConfigWithCompany : _entities.StorageConfig;
     }
-    /**
-   * Get DataSource provider for this service
-   * @returns StorageDataSourceProvider instance
-   */ getDataSourceProvider() {
+    getDataSourceProvider() {
         return this.dataSourceProvider;
     }
+    // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
-        let storageConfig = {};
-        // Set basic fields
-        storageConfig = {
-            ...storageConfig,
-            ...dto
-        };
-        // Only set company fields if they exist on the entity (when company feature is enabled)
-        if ('companyId' in storageConfig) {
-            storageConfig.companyId = user?.companyId ?? null;
+        const entity = await super.convertSingleDtoToEntity(dto, user);
+        // Set companyId from user context if company feature enabled
+        if (this.storageConfig.isCompanyFeatureEnabled()) {
+            entity.companyId = user?.companyId ?? null;
         }
-        return storageConfig;
+        return entity;
     }
+    // Query Customization
     async getSelectQuery(query, _user, select) {
-        if (!select || !select.length) {
+        if (!select?.length) {
             select = [
                 'id',
                 'name',
@@ -78,25 +68,19 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
                 'createdAt',
                 'updatedAt'
             ];
-            // Add company fields if company feature is enabled
             if (this.storageConfig.isCompanyFeatureEnabled()) {
                 select.push('companyId');
             }
         }
-        const selectFields = select.map((field)=>`${this.entityName}.${field}`);
-        query.select(selectFields);
+        query.select(select.map((f)=>`${this.entityName}.${f}`));
         return {
             query,
             isRaw: false
         };
     }
-    /**
-   * Override: Extra query manipulation - Auto-filter by user's company
-   */ async getExtraManipulateQuery(query, filterDto, user) {
+    async getExtraManipulateQuery(query, filterDto, user) {
         const result = await super.getExtraManipulateQuery(query, filterDto, user);
-        // If company feature enabled and user has companyId, filter by user's company
-        const enableCompanyFeature = this.storageConfig.isCompanyFeatureEnabled();
-        if (enableCompanyFeature && user?.companyId) {
+        if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
             query.andWhere('storageConfig.companyId = :companyId', {
                 companyId: user.companyId
             });
@@ -105,6 +89,18 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
         return result;
     }
     /**
+   * Find storage config by ID without throwing (returns null if not found)
+   * Uses direct repository query - bypasses company filtering
+   * Use for internal operations like file deletion where config ID is already known
+   */ async findByIdDirect(id) {
+        await this.ensureRepositoryInitialized();
+        return await this.repository.findOne({
+            where: {
+                id
+            }
+        });
+    }
+    /**
    * Get default storage configuration (scoped to user's company if enabled)
    * Falls back to any available config if 'default' not found
    */ async getDefaultConfig(user) {
@@ -150,9 +146,7 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
             where
         });
     }
-    // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
     constructor(cacheManager, utilsService, storageConfig, dataSourceProvider){
-        // Repository will be set asynchronously by RequestScopedApiService
         super('storageConfig', null, cacheManager, utilsService, StorageProviderConfigService.name, true), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider;
     }
 };