@researchdatabox/redbox-core 0.0.0-bootstrap.0 → 0.0.1-beta.10173

package/dist/services/AppConfigService.js

@@ -51,11 +51,13 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Services = void 0;
+exports.Services = exports.APP_CONFIG_SECRET_CLEAR = exports.APP_CONFIG_SECRET_MASK = void 0;
 const CoreService_1 = require("../CoreService");
 const ConfigModels_1 = require("../configmodels/ConfigModels");
 const TJS = __importStar(require("typescript-json-schema"));
 const glob_1 = require("glob");
+exports.APP_CONFIG_SECRET_MASK = '__REDACTED__';
+exports.APP_CONFIG_SECRET_CLEAR = '__CLEAR_SECRET__';
 var Services;
 (function (Services) {
     /**
@@ -118,12 +120,116 @@ var Services;
             const appConfig = await this.loadAppConfigurationModel(branding.id);
             this.brandingAppConfigMap[branding.name] = appConfig;
         }
+        getSecretFields(configKey) {
+            return ConfigModels_1.ConfigModels.getModelInfo(configKey)?.secretFields ?? [];
+        }
+        isMaskedSecretPlaceholder(value) {
+            return typeof value === 'string' && value === exports.APP_CONFIG_SECRET_MASK;
+        }
+        shouldMaskSecretValue(value) {
+            if (typeof value === 'string') {
+                return value.trim() !== '';
+            }
+            return value != null;
+        }
+        maskSecretFields(configKey, configData) {
+            const secretFields = this.getSecretFields(configKey);
+            if (secretFields.length === 0 || configData == null) {
+                return configData;
+            }
+            const masked = _.cloneDeep(configData);
+            secretFields.forEach((fieldPath) => {
+                if (_.has(masked, fieldPath) && this.shouldMaskSecretValue(_.get(masked, fieldPath))) {
+                    _.set(masked, fieldPath, exports.APP_CONFIG_SECRET_MASK);
+                }
+            });
+            return masked;
+        }
+        mergeSecretFields(configKey, incomingConfig, existingConfig) {
+            const secretFields = this.getSecretFields(configKey);
+            if (secretFields.length === 0 || incomingConfig == null) {
+                return incomingConfig;
+            }
+            const merged = _.cloneDeep(incomingConfig);
+            secretFields.forEach((fieldPath) => {
+                const incomingValue = _.get(merged, fieldPath);
+                if (this.isMaskedSecretPlaceholder(incomingValue)) {
+                    if (existingConfig != null && _.has(existingConfig, fieldPath)) {
+                        _.set(merged, fieldPath, _.get(existingConfig, fieldPath));
+                    }
+                    else {
+                        _.unset(merged, fieldPath);
+                    }
+                }
+                else if (incomingValue === exports.APP_CONFIG_SECRET_CLEAR) {
+                    _.unset(merged, fieldPath);
+                }
+            });
+            return merged;
+        }
+        prepareConfigModelForForm(configKey, model) {
+            const formAdapter = ConfigModels_1.ConfigModels.getModelInfo(configKey)?.formAdapter?.toForm;
+            const transformed = typeof formAdapter === 'function'
+                ? formAdapter(_.cloneDeep(model))
+                : _.cloneDeep(model);
+            return transformed;
+        }
+        prepareConfigModelForSave(configKey, model) {
+            const formAdapter = ConfigModels_1.ConfigModels.getModelInfo(configKey)?.formAdapter?.fromForm;
+            const transformed = typeof formAdapter === 'function'
+                ? formAdapter(_.cloneDeep(model))
+                : _.cloneDeep(model);
+            return transformed;
+        }
         getAppConfigurationForBrand(brandName) {
             return _.get(this.brandingAppConfigMap, brandName, sails.config.brandingConfigurationDefaults == undefined ? {} : sails.config.brandingConfigurationDefaults);
         }
         getAllConfigurationForBrand = (brandId) => {
             return AppConfig.find({ branding: brandId });
         };
+        getConfigRecordTimestamp(record) {
+            const updatedAt = Date.parse(String(record?.updatedAt ?? ''));
+            if (!Number.isNaN(updatedAt)) {
+                return updatedAt;
+            }
+            const createdAt = Date.parse(String(record?.createdAt ?? ''));
+            if (!Number.isNaN(createdAt)) {
+                return createdAt;
+            }
+            return 0;
+        }
+        chooseLatestConfigRecord(records) {
+            return records.reduce((latest, current) => {
+                if (latest == null) {
+                    return current;
+                }
+                return this.getConfigRecordTimestamp(current) >= this.getConfigRecordTimestamp(latest)
+                    ? current
+                    : latest;
+            }, undefined);
+        }
+        reduceToLatestConfigRecords(records) {
+            const latestByKey = new Map();
+            for (const record of records) {
+                const key = String(record.configKey ?? '');
+                const currentLatest = latestByKey.get(key);
+                if (currentLatest == null) {
+                    latestByKey.set(key, record);
+                    continue;
+                }
+                if (this.getConfigRecordTimestamp(record) >= this.getConfigRecordTimestamp(currentLatest)) {
+                    latestByKey.set(key, record);
+                }
+            }
+            return Array.from(latestByKey.values());
+        }
+        async findLatestConfigRecord(brandId, configKey) {
+            const records = await AppConfig.find({ branding: brandId, configKey });
+            if (records.length > 1) {
+                sails.log.warn(`Multiple appconfig records found for branding '${brandId}' and key '${configKey}'. Using the most recently updated record.`);
+            }
+            return this.chooseLatestConfigRecord(records);
+        }
         async loadAppConfigurationModel(brandId) {
             const appConfiguration = {};
             const modelNames = ConfigModels_1.ConfigModels.getConfigKeys();
@@ -139,16 +245,20 @@ var Services;
             // grab any default branding configuration we're overriding in config
             _.merge(appConfiguration, sails.config.brandingConfigurationDefaults);
             const appConfigItems = await this.getAllConfigurationForBrand(brandId);
-            for (const appConfigItem of appConfigItems) {
+            const latestAppConfigItems = this.reduceToLatestConfigRecords(appConfigItems);
+            if (latestAppConfigItems.length !== appConfigItems.length) {
+                sails.log.warn(`Duplicate appconfig records detected for branding '${brandId}'. Using the most recently updated record for each config key.`);
+            }
+            for (const appConfigItem of latestAppConfigItems) {
                 _.set(appConfiguration, appConfigItem.configKey, appConfigItem.configData);
             }
             return appConfiguration;
         }
         async getAppConfigByBrandAndKey(brandId, configKey) {
-            const dbConfig = await AppConfig.findOne({ branding: brandId, configKey });
+            const dbConfig = await this.findLatestConfigRecord(brandId, configKey);
             // If no config exists in the DB return the default settings
             if (dbConfig != null) {
-                return dbConfig.configData;
+                return this.maskSecretFields(configKey, dbConfig.configData);
             }
             let config = _.get(sails.config.brandingConfigurationDefaults, configKey, {});
             if (_.isEmpty(config)) {
@@ -159,29 +269,32 @@ var Services;
                 const modelClass = modelInfo.class;
                 config = new modelClass();
             }
-            return config;
+            return this.maskSecretFields(configKey, config);
         }
         async createOrUpdateConfig(branding, configKey, configData) {
-            const dbConfig = await AppConfig.findOne({ branding: branding.id, configKey });
+            const dbConfig = await this.findLatestConfigRecord(String(branding.id), configKey);
+            const preparedConfigData = this.prepareConfigModelForSave(configKey, configData);
+            const mergedConfigData = this.mergeSecretFields(configKey, preparedConfigData, dbConfig?.configData);
             // Create if no config exists
             let record;
             if (dbConfig == null) {
-                record = await AppConfig.create({ branding: branding.id, configKey: configKey, configData: configData });
+                record = await AppConfig.create({ branding: branding.id, configKey: configKey, configData: mergedConfigData });
             }
             else {
-                record = await AppConfig.updateOne({ branding: branding.id, configKey }).set({ configData: configData });
+                record = await AppConfig.updateOne({ branding: branding.id, configKey }).set({ configData: mergedConfigData });
             }
             await this.refreshBrandingAppConfigMap(branding);
-            return record.configData;
+            return this.maskSecretFields(configKey, record.configData);
         }
         async createConfig(brandName, configKey, configData) {
             const branding = BrandingService.getBrand(brandName);
-            const dbConfig = await AppConfig.findOne({ branding: branding.id, configKey });
+            const dbConfig = await this.findLatestConfigRecord(String(branding.id), configKey);
+            const preparedConfigData = this.prepareConfigModelForSave(configKey, configData);
             // Create if no config exists
             if (dbConfig == null) {
-                const createdRecord = await AppConfig.create({ branding: branding.id, configKey: configKey, configData: configData });
+                const createdRecord = await AppConfig.create({ branding: branding.id, configKey: configKey, configData: this.mergeSecretFields(configKey, preparedConfigData) });
                 await this.refreshBrandingAppConfigMap(branding);
-                return createdRecord.configData;
+                return this.maskSecretFields(configKey, createdRecord.configData);
             }
             throw Error(`Config with key ${configKey} for branding ${brandName} already exists`);
         }
@@ -195,7 +308,8 @@ var Services;
             const model = _.get(appConfig, configForm, new modelCtor());
             const jsonSchema = this.getJsonSchema(modelDefinition);
             const fieldOrder = typeof modelCtor.getFieldOrder === 'function' ? modelCtor.getFieldOrder() : [];
-            const configData = { model: model, schema: jsonSchema, fieldOrder: fieldOrder };
+            const preparedModel = this.prepareConfigModelForForm(configForm, model);
+            const configData = { model: this.maskSecretFields(configForm, preparedModel), schema: jsonSchema, fieldOrder: fieldOrder };
             return configData;
         }
         getJsonSchema(modelDefinition) {
@@ -239,7 +353,7 @@ var Services;
          */
         registerConfigModel(info) {
             // persist in ConfigModels registry
-            ConfigModels_1.ConfigModels.register(info.key, { modelName: info.modelName, class: info.class, schema: info.schema, tsGlob: info.tsGlob });
+            ConfigModels_1.ConfigModels.register(info.key, { modelName: info.modelName, class: info.class, schema: info.schema, tsGlob: info.tsGlob, secretFields: info.secretFields, formAdapter: info.formAdapter });
             // cache schema if provided
             if (info.schema) {
                 this.modelSchemaMap[info.modelName] = info.schema;
@@ -270,4 +384,4 @@ var Services;
     }
     Services.AppConfigs = AppConfigs;
 })(Services || (exports.Services = Services = {}));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AppConfigService.js","sourceRoot":"","sources":["../../src/services/AppConfigService.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AppConfigService.js","sourceRoot":"","sources":["../../src/services/AppConfigService.ts"],"names":[],"mappings":"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"}

package/dist/services/AttachmentMetadataService.d.ts

@@ -0,0 +1,34 @@
+import { Services as services } from '../CoreService';
+import { AttachmentAccessAuditAttributes, AttachmentMetadataAttributes } from '../waterline-models';
+export declare namespace Services {
+    type AttachmentAccessAction = 'access' | 'download' | 'list' | 'upload' | 'remove';
+    type AttachmentMetadataInput = Omit<AttachmentMetadataAttributes, 'id' | 'createdAt' | 'updatedAt'>;
+    type AttachmentAccessAuditInput = Omit<AttachmentAccessAuditAttributes, 'id' | 'createdAt' | 'updatedAt'>;
+    type AttachmentAccessEvent = {
+        oid: string;
+        fileId?: string;
+        storageKey?: string;
+        action: AttachmentAccessAction;
+        accessedBy?: string;
+        itemCount?: number;
+    };
+    class AttachmentMetadataService extends services.Core.Service {
+        protected _exportedMethods: string[];
+        protected logHeader: string;
+        upsert(row: AttachmentMetadataInput): Promise<void>;
+        findByOid(oid: string): Promise<AttachmentMetadataAttributes[]>;
+        findOneByStorageKey(storageKey: string): Promise<AttachmentMetadataAttributes | undefined>;
+        deleteByStorageKey(storageKey: string): Promise<void>;
+        recordAccess(event: AttachmentAccessEvent): Promise<void>;
+        private shouldIncrementAccessCount;
+        private normalizeMetadataRow;
+        private normalizeAccessEvent;
+        private optionalString;
+        private optionalNumber;
+        private optionalDateString;
+    }
+}
+declare global {
+    let AttachmentMetadataService: Services.AttachmentMetadataService;
+}
+//# sourceMappingURL=AttachmentMetadataService.d.ts.map

package/dist/services/AttachmentMetadataService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AttachmentMetadataService.d.ts","sourceRoot":"","sources":["../../src/services/AttachmentMetadataService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAEpG,yBAAiB,QAAQ,CAAC;IACxB,KAAY,sBAAsB,GAAG,QAAQ,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC1F,KAAY,uBAAuB,GAAG,IAAI,CAAC,4BAA4B,EAAE,IAAI,GAAG,WAAW,GAAG,WAAW,CAAC,CAAC;IAC3G,KAAY,0BAA0B,GAAG,IAAI,CAAC,+BAA+B,EAAE,IAAI,GAAG,WAAW,GAAG,WAAW,CAAC,CAAC;IACjH,KAAY,qBAAqB,GAAG;QAClC,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,sBAAsB,CAAC;QAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,MAAa,yBAA0B,SAAQ,QAAQ,CAAC,IAAI,CAAC,OAAO;QAClE,UAAmB,gBAAgB,EAAE,MAAM,EAAE,CAM3C;QAEF,UAAmB,SAAS,EAAE,MAAM,CAAiC;QAExD,MAAM,CAAC,GAAG,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;QAoBnD,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,4BAA4B,EAAE,CAAC;QAQ/D,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,4BAA4B,GAAG,SAAS,CAAC;QAQ1F,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;QAQrD,YAAY,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;QA2BtE,OAAO,CAAC,0BAA0B;QAIlC,OAAO,CAAC,oBAAoB;QAmB5B,OAAO,CAAC,oBAAoB;QAY5B,OAAO,CAAC,cAAc;QAKtB,OAAO,CAAC,cAAc;QAQtB,OAAO,CAAC,kBAAkB;KAO3B;CACF;AAED,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,yBAAyB,EAAE,QAAQ,CAAC,yBAAyB,CAAC;CACnE"}

package/dist/services/AttachmentMetadataService.js

@@ -0,0 +1,133 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Services = void 0;
+const CoreService_1 = require("../CoreService");
+var Services;
+(function (Services) {
+    class AttachmentMetadataService extends CoreService_1.Services.Core.Service {
+        _exportedMethods = [
+            'upsert',
+            'findByOid',
+            'findOneByStorageKey',
+            'deleteByStorageKey',
+            'recordAccess',
+        ];
+        logHeader = 'AttachmentMetadataService::';
+        async upsert(row) {
+            const storageKey = String(row.storageKey ?? '').trim();
+            if (!storageKey) {
+                throw new Error('AttachmentMetadataService.upsert requires storageKey');
+            }
+            const payload = this.normalizeMetadataRow(row);
+            const oid = String(payload.oid ?? '').trim();
+            const fileId = String(payload.fileId ?? '').trim();
+            const existing = await AttachmentMetadata.findOne({ storageKey })
+                ?? (oid && fileId
+                    ? await AttachmentMetadata.findOne({ oid, fileId })
+                    : null);
+            if (existing?.id) {
+                await AttachmentMetadata.updateOne({ id: existing.id }).set(payload);
+                return;
+            }
+            await AttachmentMetadata.create(payload).fetch();
+        }
+        async findByOid(oid) {
+            const normalizedOid = String(oid ?? '').trim();
+            if (!normalizedOid) {
+                return [];
+            }
+            return await AttachmentMetadata.find({ oid: normalizedOid }).sort([{ createdAt: 'ASC' }]);
+        }
+        async findOneByStorageKey(storageKey) {
+            const normalizedStorageKey = String(storageKey ?? '').trim();
+            if (!normalizedStorageKey) {
+                return undefined;
+            }
+            return await AttachmentMetadata.findOne({ storageKey: normalizedStorageKey });
+        }
+        async deleteByStorageKey(storageKey) {
+            const normalizedStorageKey = String(storageKey ?? '').trim();
+            if (!normalizedStorageKey) {
+                return;
+            }
+            await AttachmentMetadata.destroy({ storageKey: normalizedStorageKey });
+        }
+        async recordAccess(event) {
+            try {
+                const normalizedEvent = this.normalizeAccessEvent(event);
+                if (!normalizedEvent.oid || !normalizedEvent.action) {
+                    return;
+                }
+                if (normalizedEvent.storageKey && normalizedEvent.action !== 'list') {
+                    const existing = await AttachmentMetadata.findOne({ storageKey: normalizedEvent.storageKey });
+                    if (existing?.id) {
+                        const currentCount = Number(existing.accessCount ?? 0);
+                        const nextCount = this.shouldIncrementAccessCount(normalizedEvent.action) ? currentCount + 1 : currentCount;
+                        await AttachmentMetadata.updateOne({ id: existing.id }).set({
+                            lastAccessedAt: normalizedEvent.accessedAt,
+                            lastAccessedBy: normalizedEvent.accessedBy,
+                            accessCount: nextCount,
+                        });
+                    }
+                }
+                await AttachmentAccessAudit.create(normalizedEvent).fetch();
+            }
+            catch (err) {
+                this.logger.error(`${this.logHeader} recordAccess() failed`, err);
+                throw err;
+            }
+        }
+        shouldIncrementAccessCount(action) {
+            return action === 'download' || action === 'access';
+        }
+        normalizeMetadataRow(row) {
+            return {
+                oid: String(row.oid ?? '').trim(),
+                fileId: String(row.fileId ?? '').trim(),
+                storageKey: String(row.storageKey ?? '').trim(),
+                contentType: this.optionalString(row.contentType),
+                contentLength: this.optionalNumber(row.contentLength),
+                etag: this.optionalString(row.etag),
+                lastModified: this.optionalDateString(row.lastModified),
+                filename: this.optionalString(row.filename),
+                mimeType: this.optionalString(row.mimeType),
+                uploadedBy: this.optionalString(row.uploadedBy),
+                attachmentField: this.optionalString(row.attachmentField),
+                lastAccessedAt: this.optionalDateString(row.lastAccessedAt),
+                lastAccessedBy: this.optionalString(row.lastAccessedBy),
+                accessCount: this.optionalNumber(row.accessCount) ?? 0,
+            };
+        }
+        normalizeAccessEvent(event) {
+            return {
+                oid: String(event.oid ?? '').trim(),
+                fileId: this.optionalString(event.fileId),
+                storageKey: this.optionalString(event.storageKey),
+                action: String(event.action ?? '').trim(),
+                accessedBy: this.optionalString(event.accessedBy),
+                accessedAt: new Date().toISOString(),
+                itemCount: this.optionalNumber(event.itemCount),
+            };
+        }
+        optionalString(value) {
+            const normalized = String(value ?? '').trim();
+            return normalized ? normalized : undefined;
+        }
+        optionalNumber(value) {
+            if (value === null || value === undefined || value === '') {
+                return undefined;
+            }
+            const normalized = Number(value);
+            return Number.isFinite(normalized) ? normalized : undefined;
+        }
+        optionalDateString(value) {
+            if (!value) {
+                return undefined;
+            }
+            const normalizedDate = new Date(value);
+            return Number.isNaN(normalizedDate.getTime()) ? undefined : normalizedDate.toISOString();
+        }
+    }
+    Services.AttachmentMetadataService = AttachmentMetadataService;
+})(Services || (exports.Services = Services = {}));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXR0YWNobWVudE1ldGFkYXRhU2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXJ2aWNlcy9BdHRhY2htZW50TWV0YWRhdGFTZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLGdEQUFzRDtBQUd0RCxJQUFpQixRQUFRLENBdUp4QjtBQXZKRCxXQUFpQixRQUFRO0lBYXZCLE1BQWEseUJBQTBCLFNBQVEsc0JBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTztRQUMvQyxnQkFBZ0IsR0FBYTtZQUM5QyxRQUFRO1lBQ1IsV0FBVztZQUNYLHFCQUFxQjtZQUNyQixvQkFBb0I7WUFDcEIsY0FBYztTQUNmLENBQUM7UUFFaUIsU0FBUyxHQUFXLDZCQUE2QixDQUFDO1FBRTlELEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBNEI7WUFDOUMsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxVQUFVLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDdkQsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO2dCQUNoQixNQUFNLElBQUksS0FBSyxDQUFDLHNEQUFzRCxDQUFDLENBQUM7WUFDMUUsQ0FBQztZQUVELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUMvQyxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsSUFBSSxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUM3QyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sSUFBSSxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNuRCxNQUFNLFFBQVEsR0FBRyxNQUFNLGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUF3QzttQkFDbkcsQ0FBQyxHQUFHLElBQUksTUFBTTtvQkFDZixDQUFDLENBQUMsTUFBTSxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLENBQXdDO29CQUMxRixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDWixJQUFJLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQztnQkFDakIsTUFBTSxrQkFBa0IsQ0FBQyxTQUFTLENBQUMsRUFBRSxFQUFFLEVBQUUsUUFBUSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyRSxPQUFPO1lBQ1QsQ0FBQztZQUNELE1BQU0sa0JBQWtCLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ25ELENBQUM7UUFFTSxLQUFLLENBQUMsU0FBUyxDQUFDLEdBQVc7WUFDaEMsTUFBTSxhQUFhLEdBQUcsTUFBTSxDQUFDLEdBQUcsSUFBSSxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUMvQyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7Z0JBQ25CLE9BQU8sRUFBRSxDQUFDO1lBQ1osQ0FBQztZQUNELE9BQU8sTUFBTSxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFtQyxDQUFDO1FBQzlILENBQUM7UUFFTSxLQUFLLENBQUMsbUJBQW1CLENBQUMsVUFBa0I7WUFDakQsTUFBTSxvQkFBb0IsR0FBRyxNQUFNLENBQUMsVUFBVSxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQzdELElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO2dCQUMxQixPQUFPLFNBQVMsQ0FBQztZQUNuQixDQUFDO1lBQ0QsT0FBTyxNQUFNLGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxFQUFFLFVBQVUsRUFBRSxvQkFBb0IsRUFBRSxDQUE2QyxDQUFDO1FBQzVILENBQUM7UUFFTSxLQUFLLENBQUMsa0JBQWtCLENBQUMsVUFBa0I7WUFDaEQsTUFBTSxvQkFBb0IsR0FBRyxNQUFNLENBQUMsVUFBVSxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQzdELElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO2dCQUMxQixPQUFPO1lBQ1QsQ0FBQztZQUNELE1BQU0sa0JBQWtCLENBQUMsT0FBTyxDQUFDLEVBQUUsVUFBVSxFQUFFLG9CQUFvQixFQUFFLENBQUMsQ0FBQztRQUN6RSxDQUFDO1FBRU0sS0FBSyxDQUFDLFlBQVksQ0FBQyxLQUE0QjtZQUNwRCxJQUFJLENBQUM7Z0JBQ0gsTUFBTSxlQUFlLEdBQUcsSUFBSSxDQUFDLG9CQUFvQixDQUFDLEtBQUssQ0FBQyxDQUFDO2dCQUN6RCxJQUFJLENBQUMsZUFBZSxDQUFDLEdBQUcsSUFBSSxDQUFDLGVBQWUsQ0FBQyxNQUFNLEVBQUUsQ0FBQztvQkFDcEQsT0FBTztnQkFDVCxDQUFDO2dCQUVELElBQUksZUFBZSxDQUFDLFVBQVUsSUFBSSxlQUFlLENBQUMsTUFBTSxLQUFLLE1BQU0sRUFBRSxDQUFDO29CQUNwRSxNQUFNLFFBQVEsR0FBRyxNQUFNLGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsVUFBVSxFQUFFLENBQXdDLENBQUM7b0JBQ3JJLElBQUksUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUFDO3dCQUNqQixNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLFdBQVcsSUFBSSxDQUFDLENBQUMsQ0FBQzt3QkFDdkQsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLDBCQUEwQixDQUFDLGVBQWUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDO3dCQUM1RyxNQUFNLGtCQUFrQixDQUFDLFNBQVMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxRQUFRLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUM7NEJBQzFELGNBQWMsRUFBRSxlQUFlLENBQUMsVUFBVTs0QkFDMUMsY0FBYyxFQUFFLGVBQWUsQ0FBQyxVQUFVOzRCQUMxQyxXQUFXLEVBQUUsU0FBUzt5QkFDdkIsQ0FBQyxDQUFDO29CQUNMLENBQUM7Z0JBQ0gsQ0FBQztnQkFFRCxNQUFNLHFCQUFxQixDQUFDLE1BQU0sQ0FBQyxlQUFrRCxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDakcsQ0FBQztZQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7Z0JBQ2IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsU0FBUyx3QkFBd0IsRUFBRSxHQUFHLENBQUMsQ0FBQztnQkFDbEUsTUFBTSxHQUFHLENBQUM7WUFDWixDQUFDO1FBQ0gsQ0FBQztRQUVPLDBCQUEwQixDQUFDLE1BQWM7WUFDL0MsT0FBTyxNQUFNLEtBQUssVUFBVSxJQUFJLE1BQU0sS0FBSyxRQUFRLENBQUM7UUFDdEQsQ0FBQztRQUVPLG9CQUFvQixDQUFDLEdBQTRCO1lBQ3ZELE9BQU87Z0JBQ0wsR0FBRyxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRTtnQkFDakMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRTtnQkFDdkMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsVUFBVSxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRTtnQkFDL0MsV0FBVyxFQUFFLElBQUksQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQztnQkFDakQsYUFBYSxFQUFFLElBQUksQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQztnQkFDckQsSUFBSSxFQUFFLElBQUksQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQztnQkFDbkMsWUFBWSxFQUFFLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDO2dCQUN2RCxRQUFRLEVBQUUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO2dCQUMzQyxRQUFRLEVBQUUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO2dCQUMzQyxVQUFVLEVBQUUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDO2dCQUMvQyxlQUFlLEVBQUUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDO2dCQUN6RCxjQUFjLEVBQUUsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUM7Z0JBQzNELGNBQWMsRUFBRSxJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUM7Z0JBQ3ZELFdBQVcsRUFBRSxJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDO2FBQ3ZELENBQUM7UUFDSixDQUFDO1FBRU8sb0JBQW9CLENBQUMsS0FBNEI7WUFDdkQsT0FBTztnQkFDTCxHQUFHLEVBQUUsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFO2dCQUNuQyxNQUFNLEVBQUUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDO2dCQUN6QyxVQUFVLEVBQUUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDO2dCQUNqRCxNQUFNLEVBQUUsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFO2dCQUN6QyxVQUFVLEVBQUUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDO2dCQUNqRCxVQUFVLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQyxXQUFXLEVBQUU7Z0JBQ3BDLFNBQVMsRUFBRSxJQUFJLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUM7YUFDaEQsQ0FBQztRQUNKLENBQUM7UUFFTyxjQUFjLENBQUMsS0FBYztZQUNuQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQzlDLE9BQU8sVUFBVSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztRQUM3QyxDQUFDO1FBRU8sY0FBYyxDQUFDLEtBQWM7WUFDbkMsSUFBSSxLQUFLLEtBQUssSUFBSSxJQUFJLEtBQUssS0FBSyxTQUFTLElBQUksS0FBSyxLQUFLLEVBQUUsRUFBRSxDQUFDO2dCQUMxRCxPQUFPLFNBQVMsQ0FBQztZQUNuQixDQUFDO1lBQ0QsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ2pDLE9BQU8sTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDOUQsQ0FBQztRQUVPLGtCQUFrQixDQUFDLEtBQWM7WUFDdkMsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO2dCQUNYLE9BQU8sU0FBUyxDQUFDO1lBQ25CLENBQUM7WUFDRCxNQUFNLGNBQWMsR0FBRyxJQUFJLElBQUksQ0FBQyxLQUErQixDQUFDLENBQUM7WUFDakUsT0FBTyxNQUFNLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUMzRixDQUFDO0tBQ0Y7SUF6SVksa0NBQXlCLDRCQXlJckMsQ0FBQTtBQUNILENBQUMsRUF2SmdCLFFBQVEsd0JBQVIsUUFBUSxRQXVKeEIifQ==

package/dist/services/BrandingLogoService.d.ts

@@ -1,16 +1,20 @@
 import { Services as coreServices } from '../CoreService';
+/**
+ * BrandingLogoService
+ * - sanitizeAndValidate(fileBuf, contentType)
+ * - putLogo({branding, portal, fileBuf, contentType}) -> storage key `${branding}/${portal}/images/logo.(ext)`
+ */
 export declare namespace Services {
     class BrandingLogo extends coreServices.Core.Service {
-        /** Cached GridFS bucket to avoid repeated initialization. */
-        private cachedBucket;
-        /** In-memory placeholder storage keyed by gridFsId. */
+        /** In-memory placeholder storage keyed by storage identifier. */
         private _binaryById;
         private getCacheTtlMs;
         private pruneExpiredEntries;
         private setCache;
         private getFromCache;
-        /** Lazily create a GridFS bucket using the configured 'mongodb' datastore. */
-        private getBucket;
+        private isStorageNotFoundError;
+        private isLegacyGridFsObjectId;
+        private logoStorageKey;
         getMaxBytes(): number;
         allowedContentTypes: Set<string>;
         /** Basic SVG detection */
@@ -23,7 +27,6 @@ export declare namespace Services {
             warnings?: string[];
             finalContentType?: string;
         }>;
-        /** Write logo to storage (GridFS) and update BrandingConfig.logo metadata */
         putLogo(opts: {
             branding: string;
             portal: string;
@@ -32,13 +35,13 @@ export declare namespace Services {
         }): Promise<{
             hash: string;
             gridFsId: string;
+            storageKey: string;
             contentType: string;
             updatedAt: string;
         }>;
-        /** Retrieve stored binary (interim). */
         getBinary(id: string): Buffer | null;
-        /** Retrieve stored binary from persistent storage (GridFS) if available. */
         getBinaryAsync(id: string): Promise<Buffer | null>;
+        private getLegacyGridFsBinary;
     }
 }
 declare global {

package/dist/services/BrandingLogoService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BrandingLogoService.d.ts","sourceRoot":"","sources":["../../src/services/BrandingLogoService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAyB1D,yBAAiB,QAAQ,CAAC;IACxB,MACa,YAAa,SAAQ,YAAY,CAAC,IAAI,CAAC,OAAO;QAEzD,6DAA6D;QAC7D,OAAO,CAAC,YAAY,CAA6B;QAEjD,uDAAuD;QACvD,OAAO,CAAC,WAAW,CAA4D;QAE/E,OAAO,CAAC,aAAa;QAUrB,OAAO,CAAC,mBAAmB;QAS3B,OAAO,CAAC,QAAQ;QAKhB,OAAO,CAAC,YAAY;QAUpB,8EAA8E;QAC9E,OAAO,CAAC,SAAS;QAoBjB,WAAW,IAAI,MAAM;QAIrB,mBAAmB,cAIhB;QAEH,0BAA0B;QAC1B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO;QAMjC,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;YAAE,EAAE,EAAE,OAAO,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAC;YAAC,eAAe,CAAC,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;YAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;SAAE,CAAC;QA8CxM,6EAA6E;QACvE,OAAO,CAAC,IAAI,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,MAAM,CAAC;SAAE,GAAG,OAAO,CAAC;YAC3G,IAAI,EAAE,MAAM,CAAC;YACb,QAAQ,EAAE,MAAM,CAAC;YACjB,WAAW,EAAE,MAAM,CAAC;YACpB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;QAsCF,wCAAwC;QACxC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;QAIpC,4EAA4E;QACtE,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;KAuBzD;CACF;AAED,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,mBAAmB,EAAE,QAAQ,CAAC,YAAY,CAAC;CAChD"}
+{"version":3,"file":"BrandingLogoService.d.ts","sourceRoot":"","sources":["../../src/services/BrandingLogoService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAK1D;;;;GAIG;AAEH,yBAAiB,QAAQ,CAAC;IACxB,MACa,YAAa,SAAQ,YAAY,CAAC,IAAI,CAAC,OAAO;QACzD,iEAAiE;QACjE,OAAO,CAAC,WAAW,CAA4D;QAE/E,OAAO,CAAC,aAAa;QASrB,OAAO,CAAC,mBAAmB;QAS3B,OAAO,CAAC,QAAQ;QAKhB,OAAO,CAAC,YAAY;QAUpB,OAAO,CAAC,sBAAsB;QAc9B,OAAO,CAAC,sBAAsB;QAI9B,OAAO,CAAC,cAAc;QAKtB,WAAW,IAAI,MAAM;QAIrB,mBAAmB,cAIhB;QAEH,0BAA0B;QAC1B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO;QAMjC,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;YAAE,EAAE,EAAE,OAAO,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAC;YAAC,eAAe,CAAC,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;YAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;SAAE,CAAC;QA6ClM,OAAO,CAAC,IAAI,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,MAAM,CAAC;SAAE,GAAG,OAAO,CAAC;YAC3G,IAAI,EAAE,MAAM,CAAC;YACb,QAAQ,EAAE,MAAM,CAAC;YACjB,UAAU,EAAE,MAAM,CAAC;YACnB,WAAW,EAAE,MAAM,CAAC;YACpB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;QAwBF,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;QAI9B,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;gBAoB1C,qBAAqB;KA6BpC;CACF;AAED,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,mBAAmB,EAAE,QAAQ,CAAC,YAAY,CAAC;CAChD"}