@flusys/nestjs-storage 0.1.0-beta.3 → 1.1.0-beta

package/README.md

@@ -412,6 +412,12 @@ export class StorageConfig extends Identity {
   @Column({ type: 'json' })
   config: Record<string, any>; // Provider-specific config
 
+  @Column({ default: true })
+  isActive: boolean; // Whether config is active and usable
+
+  @Column({ default: false })
+  isDefault: boolean; // Set as default configuration
+
   @Column({ nullable: true })
   companyId: string; // Company scope (when enabled)
 }
@@ -438,6 +444,8 @@ export class SetupService {
           accessKeyId: process.env.AWS_ACCESS_KEY,
           secretAccessKey: process.env.AWS_SECRET_KEY,
         },
+        isActive: true,
+        isDefault: true,  // Set as default configuration
       },
       user,
     );
@@ -453,6 +461,8 @@ export class SetupService {
           privateKey: process.env.SFTP_PRIVATE_KEY,
           basePath: '/backups',
         },
+        isActive: true,
+        isDefault: false, // Not the default
       },
       user,
     );
@@ -462,25 +472,34 @@ export class SetupService {
 
 ### Default Configuration Resolution
 
+When `storageConfigId` is not provided for uploads, the system automatically resolves the default config:
+
+1. **Priority 1:** Find config with `isDefault: true` and `isActive: true`
+2. **Priority 2:** Fall back to oldest active config
+
 ```typescript
 // StorageProviderConfigService
 async getDefaultConfig(user?: ILoggedUserInfo): Promise<StorageConfigBase | null> {
+  await this.ensureRepositoryInitialized();
+
+  const baseWhere: any = { isActive: true };
+
   // Filter by company if enabled
-  const where: any = {};
-  if (this.isCompanyFeatureEnabled() && user?.companyId) {
-    where.companyId = user.companyId;
+  if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
+    baseWhere.companyId = user.companyId;
   }
 
-  // First try 'default' named config
+  // First try to find config marked as default
   const defaultConfig = await this.repository.findOne({
-    where: { ...where, name: 'default' },
+    where: { ...baseWhere, isDefault: true },
+    order: { createdAt: 'ASC' },
   });
 
   if (defaultConfig) return defaultConfig;
 
-  // Fall back to any available config
+  // Fall back to oldest active config
   return await this.repository.findOne({
-    where,
+    where: baseWhere,
     order: { createdAt: 'ASC' },
   });
 }
@@ -1279,10 +1298,4 @@ The `@flusys/nestjs-storage` package provides:
 
 ---
 
-**Last Updated:** 2026-02-09
-
-**Recent Changes:**
-- 2026-02-09: Added explicit `@Inject()` decorators to all services for esbuild bundling compatibility
-- 2026-02-09: Fixed `instanceof` checks in FolderService and FileManagerService - replaced with `'id' in dto` pattern
-- 2026-02-07: Condensed DataSource Provider pattern documentation
-- 2026-02-07: Simplified provider registration section
+**Last Updated:** 2026-02-16

package/cjs/controllers/file-manager.controller.js

@@ -9,11 +9,11 @@ Object.defineProperty(exports, "FileManagerController", {
     }
 });
 const _common = require("@nestjs/common");
-const _guards = require("@flusys/nestjs-shared/guards");
 const _classes = require("@flusys/nestjs-shared/classes");
 const _decorators = require("@flusys/nestjs-shared/decorators");
-const _interfaces = require("@flusys/nestjs-shared/interfaces");
 const _dtos = require("@flusys/nestjs-shared/dtos");
+const _guards = require("@flusys/nestjs-shared/guards");
+const _interfaces = require("@flusys/nestjs-shared/interfaces");
 const _dtos1 = require("../dtos");
 const _swagger = require("@nestjs/swagger");
 const _express = require("express");
@@ -45,7 +45,9 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let FileManagerController = class FileManagerController extends (0, _classes.createApiController)(_dtos1.CreateFileManagerDto, _dtos1.UpdateFileManagerDto, _dtos1.FileManagerResponseDto) {
+let FileManagerController = class FileManagerController extends (0, _classes.createApiController)(_dtos1.CreateFileManagerDto, _dtos1.UpdateFileManagerDto, _dtos1.FileManagerResponseDto, {
+    security: 'jwt'
+}) {
     async getFiles(dto, req, user) {
         if (!dto || !dto.length) {
             throw new _common.BadRequestException('No files provided');
@@ -64,6 +66,8 @@ let FileManagerController = class FileManagerController extends (0, _classes.cre
 };
 _ts_decorate([
     (0, _common.Post)('get-files'),
+    (0, _common.UseGuards)(_guards.JwtAuthGuard),
+    (0, _swagger.ApiBearerAuth)(),
     (0, _common.HttpCode)(200),
     (0, _swagger.ApiBody)({
         type: _dtos1.GetFilesRequestDto,
@@ -90,9 +94,7 @@ _ts_decorate([
 ], FileManagerController.prototype, "getFiles", null);
 FileManagerController = _ts_decorate([
     (0, _swagger.ApiTags)('Files'),
-    (0, _swagger.ApiBearerAuth)(),
     (0, _common.Controller)('storage/file-manager'),
-    (0, _common.UseGuards)(_guards.JwtAuthGuard),
     _ts_param(0, (0, _common.Inject)(_filemanagerservice.FileManagerService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [

package/cjs/controllers/folder.controller.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "FolderController", {
         return FolderController;
     }
 });
-const _guards = require("@flusys/nestjs-shared/guards");
 const _classes = require("@flusys/nestjs-shared/classes");
 const _dtos = require("../dtos");
 const _common = require("@nestjs/common");
@@ -41,16 +40,16 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let FolderController = class FolderController extends (0, _classes.createApiController)(_dtos.CreateFolderDto, _dtos.UpdateFolderDto, _dtos.FolderResponseDto) {
+let FolderController = class FolderController extends (0, _classes.createApiController)(_dtos.CreateFolderDto, _dtos.UpdateFolderDto, _dtos.FolderResponseDto, {
+    security: 'jwt'
+}) {
     constructor(folderService){
         super(folderService), _define_property(this, "folderService", void 0), this.folderService = folderService;
     }
 };
 FolderController = _ts_decorate([
     (0, _swagger.ApiTags)('Folders'),
-    (0, _swagger.ApiBearerAuth)(),
     (0, _common.Controller)('storage/folder'),
-    (0, _common.UseGuards)(_guards.JwtAuthGuard),
     _ts_param(0, (0, _common.Inject)(_folderservice.FolderService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [

package/cjs/controllers/storage-config.controller.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "StorageConfigController", {
         return StorageConfigController;
     }
 });
-const _guards = require("@flusys/nestjs-shared/guards");
 const _classes = require("@flusys/nestjs-shared/classes");
 const _dtos = require("../dtos");
 const _common = require("@nestjs/common");
@@ -41,16 +40,16 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let StorageConfigController = class StorageConfigController extends (0, _classes.createApiController)(_dtos.CreateStorageConfigDto, _dtos.UpdateStorageConfigDto, _dtos.StorageConfigResponseDto) {
+let StorageConfigController = class StorageConfigController extends (0, _classes.createApiController)(_dtos.CreateStorageConfigDto, _dtos.UpdateStorageConfigDto, _dtos.StorageConfigResponseDto, {
+    security: 'jwt'
+}) {
     constructor(storageConfigService){
         super(storageConfigService), _define_property(this, "storageConfigService", void 0), this.storageConfigService = storageConfigService;
     }
 };
 StorageConfigController = _ts_decorate([
     (0, _swagger.ApiTags)('Storage Config'),
-    (0, _swagger.ApiBearerAuth)(),
     (0, _common.Controller)('storage/storage-config'),
-    (0, _common.UseGuards)(_guards.JwtAuthGuard),
     _ts_param(0, (0, _common.Inject)(_storageproviderconfigservice.StorageProviderConfigService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [

package/cjs/dtos/storage-config.dto.js

@@ -50,6 +50,8 @@ let CreateStorageConfigDto = class CreateStorageConfigDto {
         _define_property(this, "name", void 0);
         _define_property(this, "storage", void 0);
         _define_property(this, "config", void 0);
+        _define_property(this, "isActive", void 0);
+        _define_property(this, "isDefault", void 0);
     }
 };
 _ts_decorate([
@@ -97,12 +99,32 @@ _ts_decorate([
     (0, _classvalidator.IsNotEmpty)(),
     _ts_metadata("design:type", typeof Record === "undefined" ? Object : Record)
 ], CreateStorageConfigDto.prototype, "config", void 0);
+_ts_decorate([
+    (0, _swagger.ApiPropertyOptional)({
+        example: true,
+        description: 'Whether storage configuration is active'
+    }),
+    (0, _classvalidator.IsBoolean)(),
+    (0, _classvalidator.IsOptional)(),
+    _ts_metadata("design:type", Boolean)
+], CreateStorageConfigDto.prototype, "isActive", void 0);
+_ts_decorate([
+    (0, _swagger.ApiPropertyOptional)({
+        example: false,
+        description: 'Set as default storage configuration'
+    }),
+    (0, _classvalidator.IsBoolean)(),
+    (0, _classvalidator.IsOptional)(),
+    _ts_metadata("design:type", Boolean)
+], CreateStorageConfigDto.prototype, "isDefault", void 0);
 let UpdateStorageConfigDto = class UpdateStorageConfigDto {
     constructor(){
         _define_property(this, "id", void 0);
         _define_property(this, "name", void 0);
         _define_property(this, "storage", void 0);
         _define_property(this, "config", void 0);
+        _define_property(this, "isActive", void 0);
+        _define_property(this, "isDefault", void 0);
     }
 };
 _ts_decorate([
@@ -157,8 +179,26 @@ _ts_decorate([
     (0, _classvalidator.IsOptional)(),
     _ts_metadata("design:type", typeof Record === "undefined" ? Object : Record)
 ], UpdateStorageConfigDto.prototype, "config", void 0);
+_ts_decorate([
+    (0, _swagger.ApiPropertyOptional)({
+        example: true,
+        description: 'Whether storage configuration is active'
+    }),
+    (0, _classvalidator.IsBoolean)(),
+    (0, _classvalidator.IsOptional)(),
+    _ts_metadata("design:type", Boolean)
+], UpdateStorageConfigDto.prototype, "isActive", void 0);
+_ts_decorate([
+    (0, _swagger.ApiPropertyOptional)({
+        example: false,
+        description: 'Set as default storage configuration'
+    }),
+    (0, _classvalidator.IsBoolean)(),
+    (0, _classvalidator.IsOptional)(),
+    _ts_metadata("design:type", Boolean)
+], UpdateStorageConfigDto.prototype, "isDefault", void 0);
 let StorageConfigResponseDto = class StorageConfigResponseDto extends _dtos.IdentityResponseDto {
     constructor(...args){
-        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), _define_property(this, "config", void 0);
+        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), _define_property(this, "config", void 0), _define_property(this, "isActive", void 0), _define_property(this, "isDefault", void 0);
     }
 };

package/cjs/entities/storage-config-base.entity.js

@@ -35,8 +35,7 @@ function _ts_metadata(k, v) {
 }
 let StorageConfigBase = class StorageConfigBase extends _entities.Identity {
     constructor(...args){
-        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), // add config for storage
-        _define_property(this, "config", void 0);
+        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), _define_property(this, "config", void 0), _define_property(this, "isActive", void 0), _define_property(this, "isDefault", void 0);
     }
 };
 _ts_decorate([
@@ -62,3 +61,33 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", typeof Record === "undefined" ? Object : Record)
 ], StorageConfigBase.prototype, "config", void 0);
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: 'boolean',
+        default: true,
+        name: 'is_active'
+    }),
+    _ts_metadata("design:type", Boolean)
+], StorageConfigBase.prototype, "isActive", void 0);
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: 'boolean',
+        default: false,
+        name: 'is_default'
+    }),
+    _ts_metadata("design:type", Boolean)
+], StorageConfigBase.prototype, "isDefault", void 0);
+StorageConfigBase = _ts_decorate([
+    (0, _typeorm.Index)([
+        'name'
+    ]),
+    (0, _typeorm.Index)([
+        'storage'
+    ]),
+    (0, _typeorm.Index)([
+        'isActive'
+    ]),
+    (0, _typeorm.Index)([
+        'isDefault'
+    ])
+], StorageConfigBase);

package/cjs/modules/storage.module.js

@@ -117,10 +117,8 @@ let StorageModule = class StorageModule {
             ]
         };
     }
-    // ==================== Private Helper Methods ====================
-    /**
-   * Get controllers (all controllers always loaded)
-   */ static getControllers(options) {
+    // Private Helper Methods
+    /** Get controllers (all controllers always loaded) */ static getControllers(options) {
         return [
             _controllers.FileManagerController,
             _controllers.FolderController,

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,61 +42,47 @@ 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',
                 'storage',
                 'config',
+                'isActive',
+                'isDefault',
                 '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
             });
@@ -118,19 +104,21 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
     }
     /**
    * Get default storage configuration (scoped to user's company if enabled)
-   * Falls back to any available config if 'default' not found
+   * Priority: isDefault=true > any active config (oldest first)
    */ async getDefaultConfig(user) {
         await this.ensureRepositoryInitialized();
-        const baseWhere = {};
+        const baseWhere = {
+            isActive: true
+        };
         // Filter by company only if company feature is enabled and user is provided
         if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
             baseWhere.companyId = user.companyId;
         }
-        // First try to find config named 'default'
+        // First try to find config marked as default
         const defaultConfig = await this.repository.findOne({
             where: {
                 ...baseWhere,
-                name: 'default'
+                isDefault: true
             },
             order: {
                 createdAt: 'ASC'
@@ -139,7 +127,7 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
         if (defaultConfig) {
             return defaultConfig;
         }
-        // Fall back to any available config for this company/user
+        // Fall back to any available active config (oldest first for consistency)
         return await this.repository.findOne({
             where: baseWhere,
             order: {
@@ -152,7 +140,8 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
    */ async getConfigByType(storage, user) {
         await this.ensureRepositoryInitialized();
         const where = {
-            storage
+            storage,
+            isActive: true
         };
         // Filter by company only if company feature is enabled and user is provided
         if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
@@ -162,9 +151,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;
     }
 };

package/controllers/file-manager.controller.d.ts

@@ -1,5 +1,5 @@
-import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { SingleResponseDto } from '@flusys/nestjs-shared/dtos';
+import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { CreateFileManagerDto, FileManagerResponseDto, FilesResponseDto, GetFilesRequestDto, UpdateFileManagerDto } from '../dtos';
 import { Request } from 'express';
 import { FileManagerService } from '../services/file-manager.service';

package/dtos/storage-config.dto.d.ts

@@ -5,6 +5,8 @@ export declare class CreateStorageConfigDto implements Record<string, unknown> {
     name: string;
     storage: FileLocationEnum;
     config: Record<string, any>;
+    isActive?: boolean;
+    isDefault?: boolean;
 }
 export declare class UpdateStorageConfigDto implements Record<string, unknown> {
     [key: string]: unknown;
@@ -12,10 +14,14 @@ export declare class UpdateStorageConfigDto implements Record<string, unknown> {
     name?: string;
     storage?: FileLocationEnum;
     config?: Record<string, any>;
+    isActive?: boolean;
+    isDefault?: boolean;
 }
 export declare class StorageConfigResponseDto extends IdentityResponseDto implements Record<string, unknown> {
     [key: string]: unknown;
     name: string;
     storage: FileLocationEnum;
     config: Record<string, any>;
+    isActive: boolean;
+    isDefault: boolean;
 }

package/entities/storage-config-base.entity.d.ts

@@ -4,4 +4,6 @@ export declare abstract class StorageConfigBase extends Identity {
     name: string;
     storage: FileLocationEnum;
     config: Record<string, any>;
+    isActive: boolean;
+    isDefault: boolean;
 }

package/fesm/controllers/file-manager.controller.js

@@ -26,16 +26,18 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 import { BadRequestException, Body, Controller, HttpCode, Inject, Post, Req, UseGuards } from '@nestjs/common';
-import { JwtAuthGuard } from '@flusys/nestjs-shared/guards';
 import { createApiController } from '@flusys/nestjs-shared/classes';
 import { CurrentUser } from '@flusys/nestjs-shared/decorators';
-import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { SingleResponseDto } from '@flusys/nestjs-shared/dtos';
+import { JwtAuthGuard } from '@flusys/nestjs-shared/guards';
+import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { CreateFileManagerDto, FileManagerResponseDto, GetFilesRequestDto, UpdateFileManagerDto } from '../dtos';
 import { ApiBearerAuth, ApiBody, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { Request } from 'express';
 import { FileManagerService } from '../services/file-manager.service';
-export class FileManagerController extends createApiController(CreateFileManagerDto, UpdateFileManagerDto, FileManagerResponseDto) {
+export class FileManagerController extends createApiController(CreateFileManagerDto, UpdateFileManagerDto, FileManagerResponseDto, {
+    security: 'jwt'
+}) {
     async getFiles(dto, req, user) {
         if (!dto || !dto.length) {
             throw new BadRequestException('No files provided');
@@ -54,6 +56,8 @@ export class FileManagerController extends createApiController(CreateFileManager
 }
 _ts_decorate([
     Post('get-files'),
+    UseGuards(JwtAuthGuard),
+    ApiBearerAuth(),
     HttpCode(200),
     ApiBody({
         type: GetFilesRequestDto,
@@ -80,9 +84,7 @@ _ts_decorate([
 ], FileManagerController.prototype, "getFiles", null);
 FileManagerController = _ts_decorate([
     ApiTags('Files'),
-    ApiBearerAuth(),
     Controller('storage/file-manager'),
-    UseGuards(JwtAuthGuard),
     _ts_param(0, Inject(FileManagerService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [

package/fesm/controllers/folder.controller.js

@@ -25,22 +25,21 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { JwtAuthGuard } from '@flusys/nestjs-shared/guards';
 import { createApiController } from '@flusys/nestjs-shared/classes';
 import { CreateFolderDto, FolderResponseDto, UpdateFolderDto } from '../dtos';
-import { Controller, Inject, UseGuards } from '@nestjs/common';
-import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
+import { Controller, Inject } from '@nestjs/common';
+import { ApiTags } from '@nestjs/swagger';
 import { FolderService } from '../services/folder.service';
-export class FolderController extends createApiController(CreateFolderDto, UpdateFolderDto, FolderResponseDto) {
+export class FolderController extends createApiController(CreateFolderDto, UpdateFolderDto, FolderResponseDto, {
+    security: 'jwt'
+}) {
     constructor(folderService){
         super(folderService), _define_property(this, "folderService", void 0), this.folderService = folderService;
     }
 }
 FolderController = _ts_decorate([
     ApiTags('Folders'),
-    ApiBearerAuth(),
     Controller('storage/folder'),
-    UseGuards(JwtAuthGuard),
     _ts_param(0, Inject(FolderService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [

package/fesm/controllers/storage-config.controller.js

@@ -25,22 +25,21 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { JwtAuthGuard } from '@flusys/nestjs-shared/guards';
 import { createApiController } from '@flusys/nestjs-shared/classes';
 import { CreateStorageConfigDto, StorageConfigResponseDto, UpdateStorageConfigDto } from '../dtos';
-import { Controller, Inject, UseGuards } from '@nestjs/common';
-import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
+import { Controller, Inject } from '@nestjs/common';
+import { ApiTags } from '@nestjs/swagger';
 import { StorageProviderConfigService } from '../services/storage-provider-config.service';
-export class StorageConfigController extends createApiController(CreateStorageConfigDto, UpdateStorageConfigDto, StorageConfigResponseDto) {
+export class StorageConfigController extends createApiController(CreateStorageConfigDto, UpdateStorageConfigDto, StorageConfigResponseDto, {
+    security: 'jwt'
+}) {
     constructor(storageConfigService){
         super(storageConfigService), _define_property(this, "storageConfigService", void 0), this.storageConfigService = storageConfigService;
     }
 }
 StorageConfigController = _ts_decorate([
     ApiTags('Storage Config'),
-    ApiBearerAuth(),
     Controller('storage/storage-config'),
-    UseGuards(JwtAuthGuard),
     _ts_param(0, Inject(StorageProviderConfigService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [

package/fesm/dtos/storage-config.dto.js

@@ -23,7 +23,7 @@ function _ts_metadata(k, v) {
 import { IdentityResponseDto } from '@flusys/nestjs-shared/dtos';
 import { FileLocationEnum } from '../enums';
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import { IsEnum, IsNotEmpty, IsObject, IsOptional, IsString, MaxLength } from 'class-validator';
+import { IsBoolean, IsEnum, IsNotEmpty, IsObject, IsOptional, IsString, MaxLength } from 'class-validator';
 /**
  * DTO for creating storage configuration
  */ export class CreateStorageConfigDto {
@@ -31,6 +31,8 @@ import { IsEnum, IsNotEmpty, IsObject, IsOptional, IsString, MaxLength } from 'c
         _define_property(this, "name", void 0);
         _define_property(this, "storage", void 0);
         _define_property(this, "config", void 0);
+        _define_property(this, "isActive", void 0);
+        _define_property(this, "isDefault", void 0);
     }
 }
 _ts_decorate([
@@ -78,6 +80,24 @@ _ts_decorate([
     IsNotEmpty(),
     _ts_metadata("design:type", typeof Record === "undefined" ? Object : Record)
 ], CreateStorageConfigDto.prototype, "config", void 0);
+_ts_decorate([
+    ApiPropertyOptional({
+        example: true,
+        description: 'Whether storage configuration is active'
+    }),
+    IsBoolean(),
+    IsOptional(),
+    _ts_metadata("design:type", Boolean)
+], CreateStorageConfigDto.prototype, "isActive", void 0);
+_ts_decorate([
+    ApiPropertyOptional({
+        example: false,
+        description: 'Set as default storage configuration'
+    }),
+    IsBoolean(),
+    IsOptional(),
+    _ts_metadata("design:type", Boolean)
+], CreateStorageConfigDto.prototype, "isDefault", void 0);
 /**
  * DTO for updating storage configuration
  */ export class UpdateStorageConfigDto {
@@ -86,6 +106,8 @@ _ts_decorate([
         _define_property(this, "name", void 0);
         _define_property(this, "storage", void 0);
         _define_property(this, "config", void 0);
+        _define_property(this, "isActive", void 0);
+        _define_property(this, "isDefault", void 0);
     }
 }
 _ts_decorate([
@@ -140,10 +162,28 @@ _ts_decorate([
     IsOptional(),
     _ts_metadata("design:type", typeof Record === "undefined" ? Object : Record)
 ], UpdateStorageConfigDto.prototype, "config", void 0);
+_ts_decorate([
+    ApiPropertyOptional({
+        example: true,
+        description: 'Whether storage configuration is active'
+    }),
+    IsBoolean(),
+    IsOptional(),
+    _ts_metadata("design:type", Boolean)
+], UpdateStorageConfigDto.prototype, "isActive", void 0);
+_ts_decorate([
+    ApiPropertyOptional({
+        example: false,
+        description: 'Set as default storage configuration'
+    }),
+    IsBoolean(),
+    IsOptional(),
+    _ts_metadata("design:type", Boolean)
+], UpdateStorageConfigDto.prototype, "isDefault", void 0);
 /**
  * Response DTO for storage configuration
  */ export class StorageConfigResponseDto extends IdentityResponseDto {
     constructor(...args){
-        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), _define_property(this, "config", void 0);
+        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), _define_property(this, "config", void 0), _define_property(this, "isActive", void 0), _define_property(this, "isDefault", void 0);
     }
 }

package/fesm/entities/storage-config-base.entity.js

@@ -22,14 +22,10 @@ function _ts_metadata(k, v) {
 }
 import { Identity } from '@flusys/nestjs-shared/entities';
 import { FileLocationEnum } from '../enums';
-import { Column } from 'typeorm';
-/**
- * Base StorageConfig Entity
- * Contains common fields shared by both StorageConfig and StorageConfigWithCompany
- */ export class StorageConfigBase extends Identity {
+import { Column, Index } from 'typeorm';
+export class StorageConfigBase extends Identity {
     constructor(...args){
-        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), // add config for storage
-        _define_property(this, "config", void 0);
+        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), _define_property(this, "config", void 0), _define_property(this, "isActive", void 0), _define_property(this, "isDefault", void 0);
     }
 }
 _ts_decorate([
@@ -55,3 +51,33 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", typeof Record === "undefined" ? Object : Record)
 ], StorageConfigBase.prototype, "config", void 0);
+_ts_decorate([
+    Column({
+        type: 'boolean',
+        default: true,
+        name: 'is_active'
+    }),
+    _ts_metadata("design:type", Boolean)
+], StorageConfigBase.prototype, "isActive", void 0);
+_ts_decorate([
+    Column({
+        type: 'boolean',
+        default: false,
+        name: 'is_default'
+    }),
+    _ts_metadata("design:type", Boolean)
+], StorageConfigBase.prototype, "isDefault", void 0);
+StorageConfigBase = _ts_decorate([
+    Index([
+        'name'
+    ]),
+    Index([
+        'storage'
+    ]),
+    Index([
+        'isActive'
+    ]),
+    Index([
+        'isDefault'
+    ])
+], StorageConfigBase);

package/fesm/modules/storage.module.js

@@ -107,10 +107,8 @@ export class StorageModule {
             ]
         };
     }
-    // ==================== Private Helper Methods ====================
-    /**
-   * Get controllers (all controllers always loaded)
-   */ static getControllers(options) {
+    // Private Helper Methods
+    /** Get controllers (all controllers always loaded) */ static getControllers(options) {
         return [
             FileManagerController,
             FolderController,

package/fesm/services/folder.service.js

@@ -27,51 +27,29 @@ function _ts_param(paramIndex, decorator) {
 }
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { Inject, Injectable, NotFoundException, Scope } from '@nestjs/common';
+import { Inject, Injectable, Scope } from '@nestjs/common';
 import { StorageConfigService } from '../config';
 import { Folder, FolderWithCompany } from '../entities';
 import { StorageDataSourceProvider } from './storage-datasource.provider';
 export class FolderService extends RequestScopedApiService {
-    /**
-   * Resolve entity class for this service
-   * @returns Folder or FolderWithCompany based on configuration
-   */ resolveEntity() {
-        const enableCompanyFeature = this.storageConfig.isCompanyFeatureEnabled();
-        return enableCompanyFeature ? FolderWithCompany : Folder;
+    resolveEntity() {
+        return this.storageConfig.isCompanyFeatureEnabled() ? FolderWithCompany : 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 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',
@@ -79,35 +57,26 @@ export class FolderService extends 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/fesm/services/storage-datasource.provider.js

@@ -32,10 +32,8 @@ import { Request } from 'express';
 import { StorageModuleOptions } from '../interfaces';
 import { STORAGE_MODULE_OPTIONS } from '../config/storage.constants';
 export class StorageDataSourceProvider extends 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,
@@ -43,10 +41,8 @@ export class StorageDataSourceProvider extends MultiTenantDataSourceService {
             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;
     }
     /**
@@ -60,11 +56,11 @@ export class StorageDataSourceProvider extends MultiTenantDataSourceService {
    */ 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 import('../entities');
@@ -84,10 +80,8 @@ export class StorageDataSourceProvider extends MultiTenantDataSourceService {
             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/fesm/services/storage-provider-config.service.js

@@ -32,61 +32,47 @@ import { StorageConfigService } from '../config';
 import { StorageConfig, StorageConfigWithCompany } from '../entities';
 import { StorageDataSourceProvider } from './storage-datasource.provider';
 export class StorageProviderConfigService extends RequestScopedApiService {
-    /**
-   * Resolve entity class for this service
-   * @returns StorageConfig or StorageConfigWithCompany based on configuration
-   */ resolveEntity() {
-        const enableCompanyFeature = this.storageConfig.isCompanyFeatureEnabled();
-        return enableCompanyFeature ? StorageConfigWithCompany : StorageConfig;
+    resolveEntity() {
+        return this.storageConfig.isCompanyFeatureEnabled() ? StorageConfigWithCompany : 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',
                 'storage',
                 'config',
+                'isActive',
+                'isDefault',
                 '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
             });
@@ -108,19 +94,21 @@ export class StorageProviderConfigService extends RequestScopedApiService {
     }
     /**
    * Get default storage configuration (scoped to user's company if enabled)
-   * Falls back to any available config if 'default' not found
+   * Priority: isDefault=true > any active config (oldest first)
    */ async getDefaultConfig(user) {
         await this.ensureRepositoryInitialized();
-        const baseWhere = {};
+        const baseWhere = {
+            isActive: true
+        };
         // Filter by company only if company feature is enabled and user is provided
         if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
             baseWhere.companyId = user.companyId;
         }
-        // First try to find config named 'default'
+        // First try to find config marked as default
         const defaultConfig = await this.repository.findOne({
             where: {
                 ...baseWhere,
-                name: 'default'
+                isDefault: true
             },
             order: {
                 createdAt: 'ASC'
@@ -129,7 +117,7 @@ export class StorageProviderConfigService extends RequestScopedApiService {
         if (defaultConfig) {
             return defaultConfig;
         }
-        // Fall back to any available config for this company/user
+        // Fall back to any available active config (oldest first for consistency)
         return await this.repository.findOne({
             where: baseWhere,
             order: {
@@ -142,7 +130,8 @@ export class StorageProviderConfigService extends RequestScopedApiService {
    */ async getConfigByType(storage, user) {
         await this.ensureRepositoryInitialized();
         const where = {
-            storage
+            storage,
+            isActive: true
         };
         // Filter by company only if company feature is enabled and user is provided
         if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
@@ -152,9 +141,7 @@ export class StorageProviderConfigService extends RequestScopedApiService {
             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;
     }
 }

package/interfaces/storage-config.interface.d.ts

@@ -4,6 +4,8 @@ export interface IStorageConfig extends IIdentity {
     name: string;
     storage: FileLocationEnum;
     config: Record<string, any>;
+    isActive: boolean;
+    isDefault: boolean;
     companyId?: string | null;
 }
 export interface IAwsS3Config {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-storage",
-  "version": "0.1.0-beta.3",
+  "version": "1.1.0-beta",
   "description": "Modular storage package with optional AWS S3, Azure Blob, and SFTP providers",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -128,7 +128,7 @@
     }
   },
   "dependencies": {
-    "@flusys/nestjs-core": "0.1.0-beta.3",
-    "@flusys/nestjs-shared": "0.1.0-beta.3"
+    "@flusys/nestjs-core": "1.1.0-beta",
+    "@flusys/nestjs-shared": "1.1.0-beta"
   }
 }

package/services/folder.service.d.ts

@@ -1,5 +1,4 @@
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
-import { FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { EntityTarget, Repository, SelectQueryBuilder } from 'typeorm';
@@ -21,7 +20,7 @@ export declare class FolderService extends RequestScopedApiService<CreateFolderD
         query: SelectQueryBuilder<FolderBase>;
         isRaw: boolean;
     }>;
-    protected getExtraManipulateQuery(query: SelectQueryBuilder<FolderBase>, filterDto: FilterAndPaginationDto, user: ILoggedUserInfo | null): Promise<{
+    protected getExtraManipulateQuery(query: SelectQueryBuilder<FolderBase>, filterDto: any, user: ILoggedUserInfo | null): Promise<{
         query: SelectQueryBuilder<FolderBase>;
         isRaw: boolean;
     }>;

package/services/storage-provider-config.service.d.ts

@@ -1,5 +1,4 @@
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
-import { FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { EntityTarget, Repository, SelectQueryBuilder } from 'typeorm';
@@ -22,7 +21,7 @@ export declare class StorageProviderConfigService extends RequestScopedApiServic
         query: SelectQueryBuilder<StorageConfigBase>;
         isRaw: boolean;
     }>;
-    protected getExtraManipulateQuery(query: SelectQueryBuilder<StorageConfigBase>, filterDto: FilterAndPaginationDto, user: ILoggedUserInfo | null): Promise<{
+    protected getExtraManipulateQuery(query: SelectQueryBuilder<StorageConfigBase>, filterDto: any, user: ILoggedUserInfo | null): Promise<{
         query: SelectQueryBuilder<StorageConfigBase>;
         isRaw: boolean;
     }>;