@webiny/api-file-manager 5.39.1 → 5.39.2-beta.0

package/FileManagerContextSetup.js

@@ -8,8 +8,6 @@ exports.FileManagerContextSetup = void 0;
 var _createFileManager = require("./createFileManager");
 var _FileStorage = require("./storage/FileStorage");
 var _error = _interopRequireDefault(require("@webiny/error"));
-var _isInstallationPending = require("./cmsFileStorage/isInstallationPending");
-var _createFileManagerPlugins = require("./cmsFileStorage/createFileManagerPlugins");
 var _file = require("./cmsFileStorage/file.model");
 var _CmsFilesStorage = require("./cmsFileStorage/CmsFilesStorage");
 var _CmsModelModifier = require("./modelModifier/CmsModelModifier");
@@ -65,19 +63,14 @@ class FileManagerContextSetup {
     return this.context.security.getPermissions(name);
   }
   async setupCmsStorageOperations(aliases) {
-    if ((0, _isInstallationPending.isInstallationPending)({
-      tenancy: this.context.tenancy,
-      i18n: this.context.i18n
-    })) {
+    if (!(await (0, _apiHeadlessCms.isHeadlessCmsReady)(this.context))) {
       console.log("Installation pending!");
       return;
     }
     const withPrivateFiles = this.context.wcp.canUsePrivateFiles();
 
     // This registers code plugins (model group, models)
-    const {
-      fileModelDefinition
-    } = (0, _createFileManagerPlugins.createFileModel)({
+    const fileModelDefinition = (0, _file.createFileModel)({
       withPrivateFiles
     });
     const modelModifiers = this.context.plugins.byType(_CmsModelModifier.CmsModelModifierPlugin.type);

package/FileManagerContextSetup.js.map

@@ -1 +1 @@
-{"version":3,"names":["_createFileManager","require","_FileStorage","_error","_interopRequireDefault","_isInstallationPending","_createFileManagerPlugins","_file","_CmsFilesStorage","_CmsModelModifier","_apiHeadlessCms","_FilesPermissions","FileManagerContextSetup","constructor","context","setupContext","storageOperations","beforeInit","fileStorageOps","security","withoutAuthorization","setupCmsStorageOperations","aliases","files","filesPermissions","FilesPermissions","getIdentity","getPermissions","fullAccessPermissionName","createFileManager","getTenantId","bind","getLocaleCode","storage","FileStorage","WEBINY_VERSION","locale","i18n","getContentLocale","WebinyError","code","tenancy","getCurrentTenant","id","name","isInstallationPending","console","log","withPrivateFiles","wcp","canUsePrivateFiles","fileModelDefinition","createFileModel","modelModifiers","plugins","byType","CmsModelModifierPlugin","type","modifier","modifyModel","register","CmsModelPlugin","fileModel","getModel","FILE_MODEL_ID","CmsFilesStorage","create","cms","modelId","model","message","exports"],"sources":["FileManagerContextSetup.ts"],"sourcesContent":["import { FileManagerAliasesStorageOperations, FileManagerContext } from \"~/types\";\nimport { createFileManager, FileManagerConfig } from \"~/createFileManager\";\nimport { FileStorage } from \"~/storage/FileStorage\";\nimport WebinyError from \"@webiny/error\";\nimport { SecurityPermission } from \"@webiny/api-security/types\";\nimport { isInstallationPending } from \"~/cmsFileStorage/isInstallationPending\";\nimport { createFileModel } from \"~/cmsFileStorage/createFileManagerPlugins\";\nimport { FILE_MODEL_ID } from \"~/cmsFileStorage/file.model\";\nimport { CmsFilesStorage } from \"~/cmsFileStorage/CmsFilesStorage\";\nimport { CmsModelModifierPlugin } from \"~/modelModifier/CmsModelModifier\";\nimport { CmsModelPlugin } from \"@webiny/api-headless-cms\";\nimport { FilesPermissions } from \"~/createFileManager/permissions/FilesPermissions\";\n\nexport class FileManagerContextSetup {\n    private readonly context: FileManagerContext;\n\n    constructor(context: FileManagerContext) {\n        this.context = context;\n    }\n\n    async setupContext(storageOperations: FileManagerConfig[\"storageOperations\"]) {\n        if (storageOperations.beforeInit) {\n            await storageOperations.beforeInit(this.context);\n        }\n\n        const fileStorageOps = await this.context.security.withoutAuthorization(() => {\n            return this.setupCmsStorageOperations(storageOperations.aliases);\n        });\n\n        if (fileStorageOps) {\n            storageOperations.files = fileStorageOps;\n        }\n\n        const filesPermissions = new FilesPermissions({\n            getIdentity: this.context.security.getIdentity,\n            getPermissions: () => this.context.security.getPermissions(\"fm.file\"),\n            fullAccessPermissionName: \"fm.*\"\n        });\n\n        return createFileManager({\n            storageOperations,\n            filesPermissions,\n            getTenantId: this.getTenantId.bind(this),\n            getLocaleCode: this.getLocaleCode.bind(this),\n            getIdentity: this.getIdentity.bind(this),\n            getPermissions: this.getPermissions.bind(this),\n            storage: new FileStorage({\n                context: this.context\n            }),\n            // TODO: maybe this is no longer necessary, as this wil be managed by CMS?\n            WEBINY_VERSION: this.context.WEBINY_VERSION\n        });\n    }\n\n    private getLocaleCode() {\n        const locale = this.context.i18n.getContentLocale();\n        if (!locale) {\n            throw new WebinyError(\n                \"Missing locale on context.i18n locale in File Manager API.\",\n                \"LOCALE_ERROR\"\n            );\n        }\n        return locale.code;\n    }\n\n    private getIdentity() {\n        return this.context.security.getIdentity();\n    }\n\n    private getTenantId() {\n        return this.context.tenancy.getCurrentTenant().id;\n    }\n\n    private async getPermissions<T extends SecurityPermission = SecurityPermission>(\n        name: string\n    ): Promise<T[]> {\n        return this.context.security.getPermissions(name);\n    }\n\n    private async setupCmsStorageOperations(aliases: FileManagerAliasesStorageOperations) {\n        if (isInstallationPending({ tenancy: this.context.tenancy, i18n: this.context.i18n })) {\n            console.log(\"Installation pending!\");\n            return;\n        }\n\n        const withPrivateFiles = this.context.wcp.canUsePrivateFiles();\n\n        // This registers code plugins (model group, models)\n        const { fileModelDefinition } = createFileModel({ withPrivateFiles });\n\n        const modelModifiers = this.context.plugins.byType<CmsModelModifierPlugin>(\n            CmsModelModifierPlugin.type\n        );\n\n        for (const modifier of modelModifiers) {\n            await modifier.modifyModel(fileModelDefinition);\n        }\n\n        // Finally, register all plugins\n        this.context.plugins.register([new CmsModelPlugin(fileModelDefinition)]);\n\n        // Now load the file model registered in the previous step\n        const fileModel = await this.getModel(FILE_MODEL_ID);\n\n        // Overwrite the original `files` storage ops\n        return await CmsFilesStorage.create({\n            fileModel,\n            cms: this.context.cms,\n            security: this.context.security,\n            aliases\n        });\n    }\n\n    private async getModel(modelId: string) {\n        const model = await this.context.cms.getModel(modelId);\n        if (!model) {\n            throw new WebinyError({\n                code: \"MODEL_NOT_FOUND\",\n                message: `Content model \"${modelId}\" was not found!`\n            });\n        }\n\n        return model;\n    }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_createFileManager","require","_FileStorage","_error","_interopRequireDefault","_file","_CmsFilesStorage","_CmsModelModifier","_apiHeadlessCms","_FilesPermissions","FileManagerContextSetup","constructor","context","setupContext","storageOperations","beforeInit","fileStorageOps","security","withoutAuthorization","setupCmsStorageOperations","aliases","files","filesPermissions","FilesPermissions","getIdentity","getPermissions","fullAccessPermissionName","createFileManager","getTenantId","bind","getLocaleCode","storage","FileStorage","WEBINY_VERSION","locale","i18n","getContentLocale","WebinyError","code","tenancy","getCurrentTenant","id","name","isHeadlessCmsReady","console","log","withPrivateFiles","wcp","canUsePrivateFiles","fileModelDefinition","createFileModel","modelModifiers","plugins","byType","CmsModelModifierPlugin","type","modifier","modifyModel","register","CmsModelPlugin","fileModel","getModel","FILE_MODEL_ID","CmsFilesStorage","create","cms","modelId","model","message","exports"],"sources":["FileManagerContextSetup.ts"],"sourcesContent":["import { FileManagerAliasesStorageOperations, FileManagerContext } from \"~/types\";\nimport { createFileManager, FileManagerConfig } from \"~/createFileManager\";\nimport { FileStorage } from \"~/storage/FileStorage\";\nimport WebinyError from \"@webiny/error\";\nimport { SecurityPermission } from \"@webiny/api-security/types\";\nimport { createFileModel, FILE_MODEL_ID } from \"~/cmsFileStorage/file.model\";\nimport { CmsFilesStorage } from \"~/cmsFileStorage/CmsFilesStorage\";\nimport { CmsModelModifierPlugin } from \"~/modelModifier/CmsModelModifier\";\nimport { CmsModelPlugin, isHeadlessCmsReady } from \"@webiny/api-headless-cms\";\nimport { FilesPermissions } from \"~/createFileManager/permissions/FilesPermissions\";\n\nexport class FileManagerContextSetup {\n    private readonly context: FileManagerContext;\n\n    constructor(context: FileManagerContext) {\n        this.context = context;\n    }\n\n    async setupContext(storageOperations: FileManagerConfig[\"storageOperations\"]) {\n        if (storageOperations.beforeInit) {\n            await storageOperations.beforeInit(this.context);\n        }\n\n        const fileStorageOps = await this.context.security.withoutAuthorization(() => {\n            return this.setupCmsStorageOperations(storageOperations.aliases);\n        });\n\n        if (fileStorageOps) {\n            storageOperations.files = fileStorageOps;\n        }\n\n        const filesPermissions = new FilesPermissions({\n            getIdentity: this.context.security.getIdentity,\n            getPermissions: () => this.context.security.getPermissions(\"fm.file\"),\n            fullAccessPermissionName: \"fm.*\"\n        });\n\n        return createFileManager({\n            storageOperations,\n            filesPermissions,\n            getTenantId: this.getTenantId.bind(this),\n            getLocaleCode: this.getLocaleCode.bind(this),\n            getIdentity: this.getIdentity.bind(this),\n            getPermissions: this.getPermissions.bind(this),\n            storage: new FileStorage({\n                context: this.context\n            }),\n            // TODO: maybe this is no longer necessary, as this wil be managed by CMS?\n            WEBINY_VERSION: this.context.WEBINY_VERSION\n        });\n    }\n\n    private getLocaleCode() {\n        const locale = this.context.i18n.getContentLocale();\n        if (!locale) {\n            throw new WebinyError(\n                \"Missing locale on context.i18n locale in File Manager API.\",\n                \"LOCALE_ERROR\"\n            );\n        }\n        return locale.code;\n    }\n\n    private getIdentity() {\n        return this.context.security.getIdentity();\n    }\n\n    private getTenantId() {\n        return this.context.tenancy.getCurrentTenant().id;\n    }\n\n    private async getPermissions<T extends SecurityPermission = SecurityPermission>(\n        name: string\n    ): Promise<T[]> {\n        return this.context.security.getPermissions(name);\n    }\n\n    private async setupCmsStorageOperations(aliases: FileManagerAliasesStorageOperations) {\n        if (!(await isHeadlessCmsReady(this.context))) {\n            console.log(\"Installation pending!\");\n            return;\n        }\n\n        const withPrivateFiles = this.context.wcp.canUsePrivateFiles();\n\n        // This registers code plugins (model group, models)\n        const fileModelDefinition = createFileModel({ withPrivateFiles });\n\n        const modelModifiers = this.context.plugins.byType<CmsModelModifierPlugin>(\n            CmsModelModifierPlugin.type\n        );\n\n        for (const modifier of modelModifiers) {\n            await modifier.modifyModel(fileModelDefinition);\n        }\n\n        // Finally, register all plugins\n        this.context.plugins.register([new CmsModelPlugin(fileModelDefinition)]);\n\n        // Now load the file model registered in the previous step\n        const fileModel = await this.getModel(FILE_MODEL_ID);\n\n        // Overwrite the original `files` storage ops\n        return await CmsFilesStorage.create({\n            fileModel,\n            cms: this.context.cms,\n            security: this.context.security,\n            aliases\n        });\n    }\n\n    private async getModel(modelId: string) {\n        const model = await this.context.cms.getModel(modelId);\n        if (!model) {\n            throw new WebinyError({\n                code: \"MODEL_NOT_FOUND\",\n                message: `Content model \"${modelId}\" was not found!`\n            });\n        }\n\n        return model;\n    }\n}\n"],"mappings":"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"}

package/cmsFileStorage/CmsFilesStorage.js

@@ -41,11 +41,9 @@ class CmsFilesStorage {
         folderId: _contants.ROOT_FOLDER
       };
     }
-    const entry = await this.security.withoutAuthorization(() => {
-      return this.cms.createEntry(model, {
-        ...file,
-        wbyAco_location: file.location
-      });
+    const entry = await this.cms.createEntry(model, {
+      ...file,
+      wbyAco_location: file.location
     });
     await this.aliases.storeAliases(file);
     return this.getFileFieldValues(entry);
@@ -63,9 +61,7 @@ class CmsFilesStorage {
     file
   }) {
     const model = this.modelWithContext(file);
-    await this.security.withoutAuthorization(() => {
-      return this.cms.deleteEntry(model, file.id);
-    });
+    await this.cms.deleteEntry(model, file.id);
     await this.aliases.deleteAliases(file);
   }
   async get({
@@ -80,13 +76,11 @@ class CmsFilesStorage {
       tenant,
       locale
     });
-    const entry = await this.security.withoutAuthorization(() => {
-      return this.cms.getEntry(model, {
-        where: {
-          entryId: id,
-          latest: true
-        }
-      });
+    const entry = await this.cms.getEntry(model, {
+      where: {
+        entryId: id,
+        latest: true
+      }
     });
     return entry ? this.getFileFieldValues(entry) : null;
   }
@@ -97,15 +91,13 @@ class CmsFilesStorage {
       tenant,
       locale
     });
-    const [entries, meta] = await this.security.withoutAuthorization(() => {
-      const where = this.filesWhereProcessor.process(params.where);
-      return this.cms.listLatestEntries(model, {
-        after: params.after,
-        limit: params.limit,
-        sort: params.sort,
-        where,
-        search: params.search
-      });
+    const where = this.filesWhereProcessor.process(params.where);
+    const [entries, meta] = await this.cms.listLatestEntries(model, {
+      after: params.after,
+      limit: params.limit,
+      sort: params.sort,
+      where,
+      search: params.search
     });
     return [entries.map(entry => this.getFileFieldValues(entry)), meta];
   }
@@ -116,14 +108,12 @@ class CmsFilesStorage {
       tenant,
       locale
     });
-    const uniqueValues = await this.security.withoutAuthorization(() => {
-      return this.cms.getUniqueFieldValues(model, {
-        fieldId: "tags",
-        where: {
-          ...this.tagsWhereProcessor.process(params.where),
-          latest: true
-        }
-      });
+    const uniqueValues = await this.cms.getUniqueFieldValues(model, {
+      fieldId: "tags",
+      where: {
+        ...this.tagsWhereProcessor.process(params.where),
+        latest: true
+      }
     });
     return uniqueValues.map(uv => ({
       tag: uv.value,
@@ -138,21 +128,19 @@ class CmsFilesStorage {
     file
   }) {
     const model = this.modelWithContext(file);
-    return await this.security.withoutAuthorization(async () => {
-      const entry = await this.cms.getEntry(model, {
-        where: {
-          entryId: file.id,
-          latest: true
-        }
-      });
-      const values = (0, _omit.default)(file, ["id", "tenant", "locale", "webinyVersion"]);
-      const updatedEntry = await this.cms.updateEntry(model, entry.id, {
-        ...values,
-        wbyAco_location: values.location ?? entry.location
-      });
-      await this.aliases.storeAliases(file);
-      return this.getFileFieldValues(updatedEntry);
+    const entry = await this.cms.getEntry(model, {
+      where: {
+        entryId: file.id,
+        latest: true
+      }
     });
+    const values = (0, _omit.default)(file, ["id", "tenant", "locale", "webinyVersion"]);
+    const updatedEntry = await this.cms.updateEntry(model, entry.id, {
+      ...values,
+      wbyAco_location: values.location ?? entry.location
+    });
+    await this.aliases.storeAliases(file);
+    return this.getFileFieldValues(updatedEntry);
   }
   getFileFieldValues(entry) {
     return {

package/cmsFileStorage/CmsFilesStorage.js.map

@@ -1 +1 @@
-{"version":3,"names":["_omit","_interopRequireDefault","require","_ListFilesWhereProcessor","_ListTagsWhereProcessor","_contants","CmsFilesStorage","create","params","fileModel","cms","security","aliases","constructor","model","filesWhereProcessor","ListFilesWhereProcessor","tagsWhereProcessor","ListTagsWhereProcessor","modelWithContext","tenant","locale","file","location","folderId","ROOT_FOLDER","entry","withoutAuthorization","createEntry","wbyAco_location","storeAliases","getFileFieldValues","createBatch","files","Promise","all","map","delete","deleteEntry","id","deleteAliases","get","where","getEntry","entryId","latest","list","entries","meta","process","listLatestEntries","after","limit","sort","search","tags","uniqueValues","getUniqueFieldValues","fieldId","uv","tag","value","count","a","b","update","values","omit","updatedEntry","updateEntry","createdBy","modifiedBy","savedBy","createdOn","modifiedOn","savedOn","webinyVersion","exports"],"sources":["CmsFilesStorage.ts"],"sourcesContent":["import omit from \"lodash/omit\";\nimport { CmsEntry, CmsModel, HeadlessCms } from \"@webiny/api-headless-cms/types\";\nimport { Security } from \"@webiny/api-security/types\";\nimport {\n    File,\n    FileManagerAliasesStorageOperations,\n    FileManagerFilesStorageOperations,\n    FileManagerFilesStorageOperationsCreateBatchParams,\n    FileManagerFilesStorageOperationsCreateParams,\n    FileManagerFilesStorageOperationsDeleteParams,\n    FileManagerFilesStorageOperationsGetParams,\n    FileManagerFilesStorageOperationsListParams,\n    FileManagerFilesStorageOperationsListResponse,\n    FileManagerFilesStorageOperationsTagsParams,\n    FileManagerFilesStorageOperationsTagsResponse,\n    FileManagerFilesStorageOperationsUpdateParams\n} from \"~/types\";\nimport { ListFilesWhereProcessor } from \"~/cmsFileStorage/ListFilesWhereProcessor\";\nimport { ListTagsWhereProcessor } from \"~/cmsFileStorage/ListTagsWhereProcessor\";\nimport { ROOT_FOLDER } from \"~/contants\";\n\ninterface ModelContext {\n    tenant: string;\n    locale: string;\n}\n\nexport class CmsFilesStorage implements FileManagerFilesStorageOperations {\n    private readonly cms: HeadlessCms;\n    private readonly security: Security;\n    private readonly model: CmsModel;\n    private readonly aliases: FileManagerAliasesStorageOperations;\n    private readonly filesWhereProcessor: ListFilesWhereProcessor;\n    private readonly tagsWhereProcessor: ListTagsWhereProcessor;\n\n    static async create(params: {\n        fileModel: CmsModel;\n        cms: HeadlessCms;\n        security: Security;\n        aliases: FileManagerAliasesStorageOperations;\n    }) {\n        return new CmsFilesStorage(params.fileModel, params.cms, params.security, params.aliases);\n    }\n\n    private constructor(\n        fileModel: CmsModel,\n        cms: HeadlessCms,\n        security: Security,\n        aliases: FileManagerAliasesStorageOperations\n    ) {\n        this.model = fileModel;\n        this.aliases = aliases;\n        this.cms = cms;\n        this.security = security;\n        this.filesWhereProcessor = new ListFilesWhereProcessor();\n        this.tagsWhereProcessor = new ListTagsWhereProcessor();\n    }\n\n    private modelWithContext({ tenant, locale }: ModelContext): CmsModel {\n        return { ...this.model, tenant, locale };\n    }\n\n    async create({ file }: FileManagerFilesStorageOperationsCreateParams): Promise<File> {\n        const model = this.modelWithContext(file);\n\n        if (!file.location?.folderId) {\n            file.location = {\n                ...file.location,\n                folderId: ROOT_FOLDER\n            };\n        }\n\n        const entry = await this.security.withoutAuthorization(() => {\n            return this.cms.createEntry(model, {\n                ...file,\n                wbyAco_location: file.location\n            });\n        });\n\n        await this.aliases.storeAliases(file);\n\n        return this.getFileFieldValues(entry);\n    }\n\n    async createBatch({\n        files\n    }: FileManagerFilesStorageOperationsCreateBatchParams): Promise<File[]> {\n        return await Promise.all(\n            files.map(file => {\n                return this.create({ file });\n            })\n        );\n    }\n\n    async delete({ file }: FileManagerFilesStorageOperationsDeleteParams): Promise<void> {\n        const model = this.modelWithContext(file);\n        await this.security.withoutAuthorization(() => {\n            return this.cms.deleteEntry(model, file.id);\n        });\n\n        await this.aliases.deleteAliases(file);\n    }\n\n    async get({ where }: FileManagerFilesStorageOperationsGetParams): Promise<File | null> {\n        const { id, tenant, locale } = where;\n        const model = this.modelWithContext({ tenant, locale });\n        const entry = await this.security.withoutAuthorization(() => {\n            return this.cms.getEntry(model, { where: { entryId: id, latest: true } });\n        });\n        return entry ? this.getFileFieldValues(entry) : null;\n    }\n\n    async list(\n        params: FileManagerFilesStorageOperationsListParams\n    ): Promise<FileManagerFilesStorageOperationsListResponse> {\n        const tenant = params.where.tenant;\n        const locale = params.where.locale;\n\n        const model = this.modelWithContext({ tenant, locale });\n        const [entries, meta] = await this.security.withoutAuthorization(() => {\n            const where = this.filesWhereProcessor.process(params.where);\n            return this.cms.listLatestEntries(model, {\n                after: params.after,\n                limit: params.limit,\n                sort: params.sort,\n                where,\n                search: params.search\n            });\n        });\n\n        return [entries.map(entry => this.getFileFieldValues(entry)), meta];\n    }\n\n    async tags(\n        params: FileManagerFilesStorageOperationsTagsParams\n    ): Promise<FileManagerFilesStorageOperationsTagsResponse[]> {\n        const tenant = params.where.tenant;\n        const locale = params.where.locale;\n        const model = this.modelWithContext({ tenant, locale });\n        const uniqueValues = await this.security.withoutAuthorization(() => {\n            return this.cms.getUniqueFieldValues(model, {\n                fieldId: \"tags\",\n                where: {\n                    ...this.tagsWhereProcessor.process(params.where),\n                    latest: true\n                }\n            });\n        });\n\n        return uniqueValues\n            .map(uv => ({\n                tag: uv.value,\n                count: uv.count\n            }))\n            .sort((a, b) => {\n                return a.tag < b.tag ? -1 : 1;\n            })\n            .sort((a, b) => {\n                return a.count > b.count ? -1 : 1;\n            });\n    }\n\n    async update({ file }: FileManagerFilesStorageOperationsUpdateParams): Promise<File> {\n        const model = this.modelWithContext(file);\n\n        return await this.security.withoutAuthorization(async () => {\n            const entry = await this.cms.getEntry(model, {\n                where: { entryId: file.id, latest: true }\n            });\n\n            const values = omit(file, [\"id\", \"tenant\", \"locale\", \"webinyVersion\"]);\n\n            const updatedEntry = await this.cms.updateEntry(model, entry.id, {\n                ...values,\n                wbyAco_location: values.location ?? entry.location\n            });\n\n            await this.aliases.storeAliases(file);\n\n            return this.getFileFieldValues(updatedEntry);\n        });\n    }\n\n    private getFileFieldValues(entry: CmsEntry) {\n        return {\n            id: entry.entryId,\n\n            // We're safe to use entry-level meta fields because we don't use revisions with files.\n            createdBy: entry.createdBy,\n            modifiedBy: entry.modifiedBy || null,\n            savedBy: entry.savedBy,\n            createdOn: entry.createdOn,\n            modifiedOn: entry.modifiedOn || null,\n            savedOn: entry.savedOn,\n\n            locale: entry.locale,\n            tenant: entry.tenant,\n            webinyVersion: entry.webinyVersion,\n            ...entry.values\n        } as File;\n    }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_omit","_interopRequireDefault","require","_ListFilesWhereProcessor","_ListTagsWhereProcessor","_contants","CmsFilesStorage","create","params","fileModel","cms","security","aliases","constructor","model","filesWhereProcessor","ListFilesWhereProcessor","tagsWhereProcessor","ListTagsWhereProcessor","modelWithContext","tenant","locale","file","location","folderId","ROOT_FOLDER","entry","createEntry","wbyAco_location","storeAliases","getFileFieldValues","createBatch","files","Promise","all","map","delete","deleteEntry","id","deleteAliases","get","where","getEntry","entryId","latest","list","process","entries","meta","listLatestEntries","after","limit","sort","search","tags","uniqueValues","getUniqueFieldValues","fieldId","uv","tag","value","count","a","b","update","values","omit","updatedEntry","updateEntry","createdBy","modifiedBy","savedBy","createdOn","modifiedOn","savedOn","webinyVersion","exports"],"sources":["CmsFilesStorage.ts"],"sourcesContent":["import omit from \"lodash/omit\";\nimport { CmsEntry, CmsModel, HeadlessCms } from \"@webiny/api-headless-cms/types\";\nimport { Security } from \"@webiny/api-security/types\";\nimport {\n    File,\n    FileManagerAliasesStorageOperations,\n    FileManagerFilesStorageOperations,\n    FileManagerFilesStorageOperationsCreateBatchParams,\n    FileManagerFilesStorageOperationsCreateParams,\n    FileManagerFilesStorageOperationsDeleteParams,\n    FileManagerFilesStorageOperationsGetParams,\n    FileManagerFilesStorageOperationsListParams,\n    FileManagerFilesStorageOperationsListResponse,\n    FileManagerFilesStorageOperationsTagsParams,\n    FileManagerFilesStorageOperationsTagsResponse,\n    FileManagerFilesStorageOperationsUpdateParams\n} from \"~/types\";\nimport { ListFilesWhereProcessor } from \"~/cmsFileStorage/ListFilesWhereProcessor\";\nimport { ListTagsWhereProcessor } from \"~/cmsFileStorage/ListTagsWhereProcessor\";\nimport { ROOT_FOLDER } from \"~/contants\";\n\ninterface ModelContext {\n    tenant: string;\n    locale: string;\n}\n\nexport class CmsFilesStorage implements FileManagerFilesStorageOperations {\n    private readonly cms: HeadlessCms;\n    private readonly security: Security;\n    private readonly model: CmsModel;\n    private readonly aliases: FileManagerAliasesStorageOperations;\n    private readonly filesWhereProcessor: ListFilesWhereProcessor;\n    private readonly tagsWhereProcessor: ListTagsWhereProcessor;\n\n    static async create(params: {\n        fileModel: CmsModel;\n        cms: HeadlessCms;\n        security: Security;\n        aliases: FileManagerAliasesStorageOperations;\n    }) {\n        return new CmsFilesStorage(params.fileModel, params.cms, params.security, params.aliases);\n    }\n\n    private constructor(\n        fileModel: CmsModel,\n        cms: HeadlessCms,\n        security: Security,\n        aliases: FileManagerAliasesStorageOperations\n    ) {\n        this.model = fileModel;\n        this.aliases = aliases;\n        this.cms = cms;\n        this.security = security;\n        this.filesWhereProcessor = new ListFilesWhereProcessor();\n        this.tagsWhereProcessor = new ListTagsWhereProcessor();\n    }\n\n    private modelWithContext({ tenant, locale }: ModelContext): CmsModel {\n        return { ...this.model, tenant, locale };\n    }\n\n    async create({ file }: FileManagerFilesStorageOperationsCreateParams): Promise<File> {\n        const model = this.modelWithContext(file);\n\n        if (!file.location?.folderId) {\n            file.location = {\n                ...file.location,\n                folderId: ROOT_FOLDER\n            };\n        }\n\n        const entry = await this.cms.createEntry(model, {\n            ...file,\n            wbyAco_location: file.location\n        });\n\n        await this.aliases.storeAliases(file);\n\n        return this.getFileFieldValues(entry);\n    }\n\n    async createBatch({\n        files\n    }: FileManagerFilesStorageOperationsCreateBatchParams): Promise<File[]> {\n        return await Promise.all(\n            files.map(file => {\n                return this.create({ file });\n            })\n        );\n    }\n\n    async delete({ file }: FileManagerFilesStorageOperationsDeleteParams): Promise<void> {\n        const model = this.modelWithContext(file);\n        await this.cms.deleteEntry(model, file.id);\n\n        await this.aliases.deleteAliases(file);\n    }\n\n    async get({ where }: FileManagerFilesStorageOperationsGetParams): Promise<File | null> {\n        const { id, tenant, locale } = where;\n        const model = this.modelWithContext({ tenant, locale });\n        const entry = await this.cms.getEntry(model, { where: { entryId: id, latest: true } });\n        return entry ? this.getFileFieldValues(entry) : null;\n    }\n\n    async list(\n        params: FileManagerFilesStorageOperationsListParams\n    ): Promise<FileManagerFilesStorageOperationsListResponse> {\n        const tenant = params.where.tenant;\n        const locale = params.where.locale;\n\n        const model = this.modelWithContext({ tenant, locale });\n\n        const where = this.filesWhereProcessor.process(params.where);\n        const [entries, meta] = await this.cms.listLatestEntries(model, {\n            after: params.after,\n            limit: params.limit,\n            sort: params.sort,\n            where,\n            search: params.search\n        });\n\n        return [entries.map(entry => this.getFileFieldValues(entry)), meta];\n    }\n\n    async tags(\n        params: FileManagerFilesStorageOperationsTagsParams\n    ): Promise<FileManagerFilesStorageOperationsTagsResponse[]> {\n        const tenant = params.where.tenant;\n        const locale = params.where.locale;\n        const model = this.modelWithContext({ tenant, locale });\n        const uniqueValues = await this.cms.getUniqueFieldValues(model, {\n            fieldId: \"tags\",\n            where: {\n                ...this.tagsWhereProcessor.process(params.where),\n                latest: true\n            }\n        });\n\n        return uniqueValues\n            .map(uv => ({\n                tag: uv.value,\n                count: uv.count\n            }))\n            .sort((a, b) => {\n                return a.tag < b.tag ? -1 : 1;\n            })\n            .sort((a, b) => {\n                return a.count > b.count ? -1 : 1;\n            });\n    }\n\n    async update({ file }: FileManagerFilesStorageOperationsUpdateParams): Promise<File> {\n        const model = this.modelWithContext(file);\n\n        const entry = await this.cms.getEntry(model, {\n            where: { entryId: file.id, latest: true }\n        });\n\n        const values = omit(file, [\"id\", \"tenant\", \"locale\", \"webinyVersion\"]);\n\n        const updatedEntry = await this.cms.updateEntry(model, entry.id, {\n            ...values,\n            wbyAco_location: values.location ?? entry.location\n        });\n\n        await this.aliases.storeAliases(file);\n\n        return this.getFileFieldValues(updatedEntry);\n    }\n\n    private getFileFieldValues(entry: CmsEntry) {\n        return {\n            id: entry.entryId,\n\n            // We're safe to use entry-level meta fields because we don't use revisions with files.\n            createdBy: entry.createdBy,\n            modifiedBy: entry.modifiedBy || null,\n            savedBy: entry.savedBy,\n            createdOn: entry.createdOn,\n            modifiedOn: entry.modifiedOn || null,\n            savedOn: entry.savedOn,\n\n            locale: entry.locale,\n            tenant: entry.tenant,\n            webinyVersion: entry.webinyVersion,\n            ...entry.values\n        } as File;\n    }\n}\n"],"mappings":"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"}

package/cmsFileStorage/file.model.d.ts

@@ -2,5 +2,5 @@ export declare const FILE_MODEL_ID = "fmFile";
 interface CreateFileModelDefinitionParams {
     withPrivateFiles: boolean;
 }
-export declare const createFileModelDefinition: (params: CreateFileModelDefinitionParams) => import("@webiny/api-headless-cms").CmsPrivateModelFull;
+export declare const createFileModel: (params: CreateFileModelDefinitionParams) => import("@webiny/api-headless-cms").CmsPrivateModelFull;
 export {};

package/cmsFileStorage/file.model.js

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createFileModelDefinition = exports.FILE_MODEL_ID = void 0;
+exports.createFileModel = exports.FILE_MODEL_ID = void 0;
 var _apiHeadlessCms = require("@webiny/api-headless-cms");
-var _createModelField = require("./createModelField");
 const required = () => {
   return {
     name: "required",
@@ -13,59 +12,59 @@ const required = () => {
   };
 };
 const nameField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     label: "Name",
     type: "text",
     validation: [required()]
   });
 };
 const keyField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     label: "Key",
     type: "text",
     validation: [required()]
   });
 };
 const typeField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     label: "Type",
     type: "text",
     validation: [required()]
   });
 };
 const sizeField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     label: "Size",
     type: "number",
     validation: [required()]
   });
 };
 const metaWidthField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     label: "Width",
     type: "number"
   });
 };
 const metaHeightField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     label: "Height",
     type: "number"
   });
 };
 const metaPrivateField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     label: "Private",
     type: "boolean"
   });
 };
 const metaOriginalKeyField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     label: "Original Key",
     type: "text"
   });
 };
 const metaField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     label: "Meta",
     type: "object",
     settings: {
@@ -74,7 +73,7 @@ const metaField = () => {
   });
 };
 const accessControlTypeField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     label: "Type",
     type: "text",
     predefinedValues: {
@@ -91,7 +90,7 @@ const accessControlTypeField = () => {
   });
 };
 const accessControlField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     label: "Access Control",
     type: "object",
     tags: ["$bulk-edit"],
@@ -101,7 +100,7 @@ const accessControlField = () => {
   });
 };
 const tagsField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     label: "Tags",
     type: "text",
     tags: ["$bulk-edit"],
@@ -110,7 +109,7 @@ const tagsField = () => {
   });
 };
 const aliasesField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     label: "Aliases",
     type: "text",
     multipleValues: true,
@@ -118,12 +117,12 @@ const aliasesField = () => {
   });
 };
 const locationField = () => {
-  return (0, _createModelField.createModelField)({
+  return (0, _apiHeadlessCms.createModelField)({
     type: "object",
     label: "Location",
     fieldId: "location",
     settings: {
-      fields: [(0, _createModelField.createModelField)({
+      fields: [(0, _apiHeadlessCms.createModelField)({
         type: "text",
         fieldId: "folderId",
         label: "Folder ID",
@@ -136,18 +135,26 @@ const locationField = () => {
 };
 const FILE_MODEL_ID = "fmFile";
 exports.FILE_MODEL_ID = FILE_MODEL_ID;
-const createFileModelDefinition = params => {
+const createFileModel = params => {
   const fields = [locationField(), nameField(), keyField(), typeField(), sizeField(), metaField(), tagsField(), aliasesField()];
   if (params.withPrivateFiles) {
     fields.push(accessControlField());
   }
-  return (0, _apiHeadlessCms.createPrivateModelDefinition)({
+  return (0, _apiHeadlessCms.createPrivateModel)({
     name: "FmFile",
     modelId: FILE_MODEL_ID,
     titleFieldId: "name",
+    authorization: {
+      // Disables base permission checks, but leaves FLP checks enabled.
+      permissions: false
+
+      // We're leaving FLP enabled (no need to set `flp: true`).
+      // flp: true
+    },
+
     fields
   });
 };
-exports.createFileModelDefinition = createFileModelDefinition;
+exports.createFileModel = createFileModel;
 
 //# sourceMappingURL=file.model.js.map

package/cmsFileStorage/file.model.js.map

@@ -1 +1 @@
-{"version":3,"names":["_apiHeadlessCms","require","_createModelField","required","name","message","nameField","createModelField","label","type","validation","keyField","typeField","sizeField","metaWidthField","metaHeightField","metaPrivateField","metaOriginalKeyField","metaField","settings","fields","accessControlTypeField","predefinedValues","enabled","values","value","selected","accessControlField","tags","tagsField","multipleValues","aliasesField","locationField","fieldId","path","FILE_MODEL_ID","exports","createFileModelDefinition","params","withPrivateFiles","push","createPrivateModelDefinition","modelId","titleFieldId"],"sources":["file.model.ts"],"sourcesContent":["import { createPrivateModelDefinition } from \"@webiny/api-headless-cms\";\nimport { createModelField } from \"./createModelField\";\n\nconst required = () => {\n    return {\n        name: \"required\",\n        message: \"Value is required.\"\n    };\n};\n\nconst nameField = () => {\n    return createModelField({\n        label: \"Name\",\n        type: \"text\",\n        validation: [required()]\n    });\n};\n\nconst keyField = () => {\n    return createModelField({\n        label: \"Key\",\n        type: \"text\",\n        validation: [required()]\n    });\n};\n\nconst typeField = () => {\n    return createModelField({\n        label: \"Type\",\n        type: \"text\",\n        validation: [required()]\n    });\n};\n\nconst sizeField = () => {\n    return createModelField({\n        label: \"Size\",\n        type: \"number\",\n        validation: [required()]\n    });\n};\n\nconst metaWidthField = () => {\n    return createModelField({\n        label: \"Width\",\n        type: \"number\"\n    });\n};\n\nconst metaHeightField = () => {\n    return createModelField({\n        label: \"Height\",\n        type: \"number\"\n    });\n};\n\nconst metaPrivateField = () => {\n    return createModelField({\n        label: \"Private\",\n        type: \"boolean\"\n    });\n};\n\nconst metaOriginalKeyField = () => {\n    return createModelField({\n        label: \"Original Key\",\n        type: \"text\"\n    });\n};\n\nconst metaField = () => {\n    return createModelField({\n        label: \"Meta\",\n        type: \"object\",\n        settings: {\n            fields: [\n                metaPrivateField(),\n                metaWidthField(),\n                metaHeightField(),\n                metaOriginalKeyField()\n            ]\n        }\n    });\n};\n\nconst accessControlTypeField = () => {\n    return createModelField({\n        label: \"Type\",\n        type: \"text\",\n        predefinedValues: {\n            enabled: true,\n            values: [\n                {\n                    label: \"Public\",\n                    value: \"public\",\n                    selected: true\n                },\n                {\n                    label: \"Private\",\n                    value: \"private-authenticated\"\n                }\n            ]\n        }\n    });\n};\n\nconst accessControlField = () => {\n    return createModelField({\n        label: \"Access Control\",\n        type: \"object\",\n        tags: [\"$bulk-edit\"],\n        settings: {\n            fields: [accessControlTypeField()]\n        }\n    });\n};\n\nconst tagsField = () => {\n    return createModelField({\n        label: \"Tags\",\n        type: \"text\",\n        tags: [\"$bulk-edit\"],\n        multipleValues: true,\n        validation: [required()]\n    });\n};\n\nconst aliasesField = () => {\n    return createModelField({\n        label: \"Aliases\",\n        type: \"text\",\n        multipleValues: true,\n        validation: [required()]\n    });\n};\n\nconst locationField = () => {\n    return createModelField({\n        type: \"object\",\n        label: \"Location\",\n        fieldId: \"location\",\n        settings: {\n            fields: [\n                createModelField({\n                    type: \"text\",\n                    fieldId: \"folderId\",\n                    label: \"Folder ID\",\n                    settings: {\n                        path: \"location.folderId\"\n                    }\n                })\n            ]\n        }\n    });\n};\n\nexport const FILE_MODEL_ID = \"fmFile\";\n\ninterface CreateFileModelDefinitionParams {\n    withPrivateFiles: boolean;\n}\n\nexport const createFileModelDefinition = (params: CreateFileModelDefinitionParams) => {\n    const fields = [\n        locationField(),\n        nameField(),\n        keyField(),\n        typeField(),\n        sizeField(),\n        metaField(),\n        tagsField(),\n        aliasesField()\n    ];\n\n    if (params.withPrivateFiles) {\n        fields.push(accessControlField());\n    }\n\n    return createPrivateModelDefinition({\n        name: \"FmFile\",\n        modelId: FILE_MODEL_ID,\n        titleFieldId: \"name\",\n        fields\n    });\n};\n"],"mappings":"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"}
+{"version":3,"names":["_apiHeadlessCms","require","required","name","message","nameField","createModelField","label","type","validation","keyField","typeField","sizeField","metaWidthField","metaHeightField","metaPrivateField","metaOriginalKeyField","metaField","settings","fields","accessControlTypeField","predefinedValues","enabled","values","value","selected","accessControlField","tags","tagsField","multipleValues","aliasesField","locationField","fieldId","path","FILE_MODEL_ID","exports","createFileModel","params","withPrivateFiles","push","createPrivateModel","modelId","titleFieldId","authorization","permissions"],"sources":["file.model.ts"],"sourcesContent":["import { createPrivateModel, createModelField } from \"@webiny/api-headless-cms\";\n\nconst required = () => {\n    return {\n        name: \"required\",\n        message: \"Value is required.\"\n    };\n};\n\nconst nameField = () => {\n    return createModelField({\n        label: \"Name\",\n        type: \"text\",\n        validation: [required()]\n    });\n};\n\nconst keyField = () => {\n    return createModelField({\n        label: \"Key\",\n        type: \"text\",\n        validation: [required()]\n    });\n};\n\nconst typeField = () => {\n    return createModelField({\n        label: \"Type\",\n        type: \"text\",\n        validation: [required()]\n    });\n};\n\nconst sizeField = () => {\n    return createModelField({\n        label: \"Size\",\n        type: \"number\",\n        validation: [required()]\n    });\n};\n\nconst metaWidthField = () => {\n    return createModelField({\n        label: \"Width\",\n        type: \"number\"\n    });\n};\n\nconst metaHeightField = () => {\n    return createModelField({\n        label: \"Height\",\n        type: \"number\"\n    });\n};\n\nconst metaPrivateField = () => {\n    return createModelField({\n        label: \"Private\",\n        type: \"boolean\"\n    });\n};\n\nconst metaOriginalKeyField = () => {\n    return createModelField({\n        label: \"Original Key\",\n        type: \"text\"\n    });\n};\n\nconst metaField = () => {\n    return createModelField({\n        label: \"Meta\",\n        type: \"object\",\n        settings: {\n            fields: [\n                metaPrivateField(),\n                metaWidthField(),\n                metaHeightField(),\n                metaOriginalKeyField()\n            ]\n        }\n    });\n};\n\nconst accessControlTypeField = () => {\n    return createModelField({\n        label: \"Type\",\n        type: \"text\",\n        predefinedValues: {\n            enabled: true,\n            values: [\n                {\n                    label: \"Public\",\n                    value: \"public\",\n                    selected: true\n                },\n                {\n                    label: \"Private\",\n                    value: \"private-authenticated\"\n                }\n            ]\n        }\n    });\n};\n\nconst accessControlField = () => {\n    return createModelField({\n        label: \"Access Control\",\n        type: \"object\",\n        tags: [\"$bulk-edit\"],\n        settings: {\n            fields: [accessControlTypeField()]\n        }\n    });\n};\n\nconst tagsField = () => {\n    return createModelField({\n        label: \"Tags\",\n        type: \"text\",\n        tags: [\"$bulk-edit\"],\n        multipleValues: true,\n        validation: [required()]\n    });\n};\n\nconst aliasesField = () => {\n    return createModelField({\n        label: \"Aliases\",\n        type: \"text\",\n        multipleValues: true,\n        validation: [required()]\n    });\n};\n\nconst locationField = () => {\n    return createModelField({\n        type: \"object\",\n        label: \"Location\",\n        fieldId: \"location\",\n        settings: {\n            fields: [\n                createModelField({\n                    type: \"text\",\n                    fieldId: \"folderId\",\n                    label: \"Folder ID\",\n                    settings: {\n                        path: \"location.folderId\"\n                    }\n                })\n            ]\n        }\n    });\n};\n\nexport const FILE_MODEL_ID = \"fmFile\";\n\ninterface CreateFileModelDefinitionParams {\n    withPrivateFiles: boolean;\n}\n\nexport const createFileModel = (params: CreateFileModelDefinitionParams) => {\n    const fields = [\n        locationField(),\n        nameField(),\n        keyField(),\n        typeField(),\n        sizeField(),\n        metaField(),\n        tagsField(),\n        aliasesField()\n    ];\n\n    if (params.withPrivateFiles) {\n        fields.push(accessControlField());\n    }\n\n    return createPrivateModel({\n        name: \"FmFile\",\n        modelId: FILE_MODEL_ID,\n        titleFieldId: \"name\",\n        authorization: {\n            // Disables base permission checks, but leaves FLP checks enabled.\n            permissions: false\n\n            // We're leaving FLP enabled (no need to set `flp: true`).\n            // flp: true\n        },\n        fields\n    });\n};\n"],"mappings":"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"}

package/delivery/AssetDelivery/privateFiles/PrivateFilesAssetProcessor.d.ts

@@ -7,12 +7,6 @@ export declare class PrivateFilesAssetProcessor implements AssetProcessor {
     private assetAuthorizer;
     constructor(context: FileManagerContext, assetAuthorizer: AssetAuthorizer, assetProcessor: AssetProcessor);
     process(assetRequest: AssetRequest, asset: Asset): Promise<Asset>;
-    /**
-     * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-     * This method performs a very awkward data loading and type cast which should be removed as soon as we resolve the FLP issue!
-     * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-     */
-    private getFileById;
     private isPrivate;
     private requestedViaPrivateEndpoint;
     private requestedViaPublicEndpoint;

package/delivery/AssetDelivery/privateFiles/PrivateFilesAssetProcessor.js

@@ -4,13 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PrivateFilesAssetProcessor = void 0;
-var _handlerGraphql = require("@webiny/handler-graphql");
 var _NotAuthorizedOutputStrategy = require("./NotAuthorizedOutputStrategy");
 var _RedirectToPublicUrlOutputStrategy = require("./RedirectToPublicUrlOutputStrategy");
 var _RedirectToPrivateUrlOutputStrategy = require("./RedirectToPrivateUrlOutputStrategy");
 var _PrivateCache = require("./PrivateCache");
 var _PublicCache = require("./PublicCache");
-var _apiHeadlessCms = require("@webiny/api-headless-cms");
 class PrivateFilesAssetProcessor {
   constructor(context, assetAuthorizer, assetProcessor) {
     this.assetAuthorizer = assetAuthorizer;
@@ -19,9 +17,13 @@ class PrivateFilesAssetProcessor {
   }
   async process(assetRequest, asset) {
     const id = asset.getId();
+    const {
+      security,
+      fileManager
+    } = this.context;
 
     // Get file from File Manager by `id`.
-    const file = await this.getFileById(id);
+    const file = await security.withoutAuthorization(() => fileManager.getFile(id));
     const isPrivateFile = this.isPrivate(file);
     if (!isPrivateFile && this.requestedViaPrivateEndpoint(assetRequest)) {
       asset.setOutputStrategy(new _RedirectToPublicUrlOutputStrategy.RedirectToPublicUrlOutputStrategy(assetRequest));
@@ -44,29 +46,6 @@ class PrivateFilesAssetProcessor {
     });
     return processedAsset;
   }
-
-  /**
-   * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   * This method performs a very awkward data loading and type cast which should be removed as soon as we resolve the FLP issue!
-   * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   */
-  async getFileById(id) {
-    const model = await this.context.security.withoutAuthorization(() => {
-      return this.context.cms.getModel("fmFile");
-    });
-    if (!model) {
-      throw new _handlerGraphql.NotFoundError("File model not found!");
-    }
-    const entries = this.context.cms.storageOperations.entries;
-    const storageEntry = await entries.getLatestRevisionByEntryId(model, {
-      id
-    });
-    if (!storageEntry) {
-      throw new _handlerGraphql.NotFoundError("File not found!");
-    }
-    const file = await (0, _apiHeadlessCms.entryFromStorageTransform)(this.context, model, storageEntry);
-    return file.values;
-  }
   isPrivate(file) {
     return file.accessControl && file.accessControl.type.startsWith("private-");
   }

package/delivery/AssetDelivery/privateFiles/PrivateFilesAssetProcessor.js.map

@@ -1 +1 @@
-{"version":3,"names":["_handlerGraphql","require","_NotAuthorizedOutputStrategy","_RedirectToPublicUrlOutputStrategy","_RedirectToPrivateUrlOutputStrategy","_PrivateCache","_PublicCache","_apiHeadlessCms","PrivateFilesAssetProcessor","constructor","context","assetAuthorizer","assetProcessor","process","assetRequest","asset","id","getId","file","getFileById","isPrivateFile","isPrivate","requestedViaPrivateEndpoint","setOutputStrategy","RedirectToPublicUrlOutputStrategy","requestedViaPublicEndpoint","RedirectToPrivateUrlOutputStrategy","console","log","authorize","error","NotAuthorizedOutputStrategy","processedAsset","strategy","PrivateCache","PublicCache","model","security","withoutAuthorization","cms","getModel","NotFoundError","entries","storageOperations","storageEntry","getLatestRevisionByEntryId","entryFromStorageTransform","values","accessControl","type","startsWith","getContext","private","exports"],"sources":["PrivateFilesAssetProcessor.ts"],"sourcesContent":["import { NotFoundError } from \"@webiny/handler-graphql\";\nimport { File, FileManagerContext } from \"~/types\";\nimport { Asset, AssetProcessor, AssetRequest } from \"~/delivery\";\nimport { AssetAuthorizer } from \"./AssetAuthorizer\";\nimport { NotAuthorizedOutputStrategy } from \"./NotAuthorizedOutputStrategy\";\nimport { RedirectToPublicUrlOutputStrategy } from \"./RedirectToPublicUrlOutputStrategy\";\nimport { RedirectToPrivateUrlOutputStrategy } from \"./RedirectToPrivateUrlOutputStrategy\";\nimport { PrivateCache } from \"./PrivateCache\";\nimport { PublicCache } from \"./PublicCache\";\nimport { entryFromStorageTransform } from \"@webiny/api-headless-cms\";\n\ninterface MaybePrivate {\n    private?: boolean;\n}\n\nexport class PrivateFilesAssetProcessor implements AssetProcessor {\n    private readonly context: FileManagerContext;\n    private assetProcessor: AssetProcessor;\n    private assetAuthorizer: AssetAuthorizer;\n\n    constructor(\n        context: FileManagerContext,\n        assetAuthorizer: AssetAuthorizer,\n        assetProcessor: AssetProcessor\n    ) {\n        this.assetAuthorizer = assetAuthorizer;\n        this.context = context;\n        this.assetProcessor = assetProcessor;\n    }\n\n    async process(assetRequest: AssetRequest, asset: Asset): Promise<Asset> {\n        const id = asset.getId();\n\n        // Get file from File Manager by `id`.\n        const file = await this.getFileById(id);\n\n        const isPrivateFile = this.isPrivate(file);\n\n        if (!isPrivateFile && this.requestedViaPrivateEndpoint(assetRequest)) {\n            asset.setOutputStrategy(new RedirectToPublicUrlOutputStrategy(assetRequest));\n            return asset;\n        }\n\n        if (isPrivateFile && this.requestedViaPublicEndpoint(assetRequest)) {\n            asset.setOutputStrategy(new RedirectToPrivateUrlOutputStrategy(assetRequest));\n            return asset;\n        }\n\n        console.log(\"file\", file);\n\n        try {\n            await this.assetAuthorizer.authorize(file);\n        } catch (error) {\n            asset.setOutputStrategy(new NotAuthorizedOutputStrategy());\n\n            return asset;\n        }\n\n        const processedAsset = await this.assetProcessor.process(assetRequest, asset);\n\n        processedAsset.setOutputStrategy(strategy => {\n            return isPrivateFile ? new PrivateCache(30, strategy) : new PublicCache(365, strategy);\n        });\n\n        return processedAsset;\n    }\n\n    /**\n     * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n     * This method performs a very awkward data loading and type cast which should be removed as soon as we resolve the FLP issue!\n     * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n     */\n    private async getFileById(id: string): Promise<File> {\n        const model = await this.context.security.withoutAuthorization(() => {\n            return this.context.cms.getModel(\"fmFile\");\n        });\n\n        if (!model) {\n            throw new NotFoundError(\"File model not found!\");\n        }\n\n        const entries = this.context.cms.storageOperations.entries;\n\n        const storageEntry = await entries.getLatestRevisionByEntryId(model, {\n            id\n        });\n\n        if (!storageEntry) {\n            throw new NotFoundError(\"File not found!\");\n        }\n\n        const file = await entryFromStorageTransform(this.context, model, storageEntry);\n\n        return file.values as unknown as File;\n    }\n\n    private isPrivate(file: File) {\n        return file.accessControl && file.accessControl.type.startsWith(\"private-\");\n    }\n\n    private requestedViaPrivateEndpoint(assetRequest: AssetRequest) {\n        return assetRequest.getContext<MaybePrivate>().private;\n    }\n\n    private requestedViaPublicEndpoint(assetRequest: AssetRequest) {\n        return !this.requestedViaPrivateEndpoint(assetRequest);\n    }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_NotAuthorizedOutputStrategy","require","_RedirectToPublicUrlOutputStrategy","_RedirectToPrivateUrlOutputStrategy","_PrivateCache","_PublicCache","PrivateFilesAssetProcessor","constructor","context","assetAuthorizer","assetProcessor","process","assetRequest","asset","id","getId","security","fileManager","file","withoutAuthorization","getFile","isPrivateFile","isPrivate","requestedViaPrivateEndpoint","setOutputStrategy","RedirectToPublicUrlOutputStrategy","requestedViaPublicEndpoint","RedirectToPrivateUrlOutputStrategy","console","log","authorize","error","NotAuthorizedOutputStrategy","processedAsset","strategy","PrivateCache","PublicCache","accessControl","type","startsWith","getContext","private","exports"],"sources":["PrivateFilesAssetProcessor.ts"],"sourcesContent":["import { File, FileManagerContext } from \"~/types\";\nimport { Asset, AssetProcessor, AssetRequest } from \"~/delivery\";\nimport { AssetAuthorizer } from \"./AssetAuthorizer\";\nimport { NotAuthorizedOutputStrategy } from \"./NotAuthorizedOutputStrategy\";\nimport { RedirectToPublicUrlOutputStrategy } from \"./RedirectToPublicUrlOutputStrategy\";\nimport { RedirectToPrivateUrlOutputStrategy } from \"./RedirectToPrivateUrlOutputStrategy\";\nimport { PrivateCache } from \"./PrivateCache\";\nimport { PublicCache } from \"./PublicCache\";\n\ninterface MaybePrivate {\n    private?: boolean;\n}\n\nexport class PrivateFilesAssetProcessor implements AssetProcessor {\n    private readonly context: FileManagerContext;\n    private assetProcessor: AssetProcessor;\n    private assetAuthorizer: AssetAuthorizer;\n\n    constructor(\n        context: FileManagerContext,\n        assetAuthorizer: AssetAuthorizer,\n        assetProcessor: AssetProcessor\n    ) {\n        this.assetAuthorizer = assetAuthorizer;\n        this.context = context;\n        this.assetProcessor = assetProcessor;\n    }\n\n    async process(assetRequest: AssetRequest, asset: Asset): Promise<Asset> {\n        const id = asset.getId();\n        const { security, fileManager } = this.context;\n\n        // Get file from File Manager by `id`.\n        const file = await security.withoutAuthorization(() => fileManager.getFile(id));\n\n        const isPrivateFile = this.isPrivate(file);\n\n        if (!isPrivateFile && this.requestedViaPrivateEndpoint(assetRequest)) {\n            asset.setOutputStrategy(new RedirectToPublicUrlOutputStrategy(assetRequest));\n            return asset;\n        }\n\n        if (isPrivateFile && this.requestedViaPublicEndpoint(assetRequest)) {\n            asset.setOutputStrategy(new RedirectToPrivateUrlOutputStrategy(assetRequest));\n            return asset;\n        }\n\n        console.log(\"file\", file);\n\n        try {\n            await this.assetAuthorizer.authorize(file);\n        } catch (error) {\n            asset.setOutputStrategy(new NotAuthorizedOutputStrategy());\n\n            return asset;\n        }\n\n        const processedAsset = await this.assetProcessor.process(assetRequest, asset);\n\n        processedAsset.setOutputStrategy(strategy => {\n            return isPrivateFile ? new PrivateCache(30, strategy) : new PublicCache(365, strategy);\n        });\n\n        return processedAsset;\n    }\n\n    private isPrivate(file: File) {\n        return file.accessControl && file.accessControl.type.startsWith(\"private-\");\n    }\n\n    private requestedViaPrivateEndpoint(assetRequest: AssetRequest) {\n        return assetRequest.getContext<MaybePrivate>().private;\n    }\n\n    private requestedViaPublicEndpoint(assetRequest: AssetRequest) {\n        return !this.requestedViaPrivateEndpoint(assetRequest);\n    }\n}\n"],"mappings":";;;;;;AAGA,IAAAA,4BAAA,GAAAC,OAAA;AACA,IAAAC,kCAAA,GAAAD,OAAA;AACA,IAAAE,mCAAA,GAAAF,OAAA;AACA,IAAAG,aAAA,GAAAH,OAAA;AACA,IAAAI,YAAA,GAAAJ,OAAA;AAMO,MAAMK,0BAA0B,CAA2B;EAK9DC,WAAWA,CACPC,OAA2B,EAC3BC,eAAgC,EAChCC,cAA8B,EAChC;IACE,IAAI,CAACD,eAAe,GAAGA,eAAe;IACtC,IAAI,CAACD,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACE,cAAc,GAAGA,cAAc;EACxC;EAEA,MAAMC,OAAOA,CAACC,YAA0B,EAAEC,KAAY,EAAkB;IACpE,MAAMC,EAAE,GAAGD,KAAK,CAACE,KAAK,CAAC,CAAC;IACxB,MAAM;MAAEC,QAAQ;MAAEC;IAAY,CAAC,GAAG,IAAI,CAACT,OAAO;;IAE9C;IACA,MAAMU,IAAI,GAAG,MAAMF,QAAQ,CAACG,oBAAoB,CAAC,MAAMF,WAAW,CAACG,OAAO,CAACN,EAAE,CAAC,CAAC;IAE/E,MAAMO,aAAa,GAAG,IAAI,CAACC,SAAS,CAACJ,IAAI,CAAC;IAE1C,IAAI,CAACG,aAAa,IAAI,IAAI,CAACE,2BAA2B,CAACX,YAAY,CAAC,EAAE;MAClEC,KAAK,CAACW,iBAAiB,CAAC,IAAIC,oEAAiC,CAACb,YAAY,CAAC,CAAC;MAC5E,OAAOC,KAAK;IAChB;IAEA,IAAIQ,aAAa,IAAI,IAAI,CAACK,0BAA0B,CAACd,YAAY,CAAC,EAAE;MAChEC,KAAK,CAACW,iBAAiB,CAAC,IAAIG,sEAAkC,CAACf,YAAY,CAAC,CAAC;MAC7E,OAAOC,KAAK;IAChB;IAEAe,OAAO,CAACC,GAAG,CAAC,MAAM,EAAEX,IAAI,CAAC;IAEzB,IAAI;MACA,MAAM,IAAI,CAACT,eAAe,CAACqB,SAAS,CAACZ,IAAI,CAAC;IAC9C,CAAC,CAAC,OAAOa,KAAK,EAAE;MACZlB,KAAK,CAACW,iBAAiB,CAAC,IAAIQ,wDAA2B,CAAC,CAAC,CAAC;MAE1D,OAAOnB,KAAK;IAChB;IAEA,MAAMoB,cAAc,GAAG,MAAM,IAAI,CAACvB,cAAc,CAACC,OAAO,CAACC,YAAY,EAAEC,KAAK,CAAC;IAE7EoB,cAAc,CAACT,iBAAiB,CAACU,QAAQ,IAAI;MACzC,OAAOb,aAAa,GAAG,IAAIc,0BAAY,CAAC,EAAE,EAAED,QAAQ,CAAC,GAAG,IAAIE,wBAAW,CAAC,GAAG,EAAEF,QAAQ,CAAC;IAC1F,CAAC,CAAC;IAEF,OAAOD,cAAc;EACzB;EAEQX,SAASA,CAACJ,IAAU,EAAE;IAC1B,OAAOA,IAAI,CAACmB,aAAa,IAAInB,IAAI,CAACmB,aAAa,CAACC,IAAI,CAACC,UAAU,CAAC,UAAU,CAAC;EAC/E;EAEQhB,2BAA2BA,CAACX,YAA0B,EAAE;IAC5D,OAAOA,YAAY,CAAC4B,UAAU,CAAe,CAAC,CAACC,OAAO;EAC1D;EAEQf,0BAA0BA,CAACd,YAA0B,EAAE;IAC3D,OAAO,CAAC,IAAI,CAACW,2BAA2B,CAACX,YAAY,CAAC;EAC1D;AACJ;AAAC8B,OAAA,CAAApC,0BAAA,GAAAA,0BAAA"}

package/graphql/filesSchema.js

@@ -30,9 +30,7 @@ const createFilesSchema = params => {
           if (!identity) {
             return new _apiSecurity.NotAuthorizedResponse();
           }
-          return (0, _utils.resolve)(() => context.security.withoutAuthorization(() => {
-            return context.cms.getModel("fmFile");
-          }));
+          return (0, _utils.resolve)(() => context.cms.getModel("fmFile"));
         },
         getFile(_, args, context) {
           return (0, _utils.resolve)(() => context.fileManager.getFile(args.id));

package/graphql/filesSchema.js.map

@@ -1 +1 @@
-{"version":3,"names":["_handlerGraphql","require","_utils","_createFilesTypeDefs","_apiSecurity","createFilesSchema","params","fileManagerGraphQL","GraphQLSchemaPlugin","typeDefs","createFilesTypeDefs","resolvers","Query","fileManager","emptyResolver","Mutation","FmFile","src","file","_","context","settings","getSettings","srcPrefix","key","FmQuery","getFileModel","__","identity","security","getIdentity","NotAuthorizedResponse","resolve","withoutAuthorization","cms","getModel","getFile","args","id","listFiles","data","meta","ListResponse","e","ErrorResponse","listTags","tags","Response","error","FmMutation","createFile","createFiles","createFilesInBatch","updateFile","deleteFile","storage","delete","name","exports"],"sources":["filesSchema.ts"],"sourcesContent":["import {\n    ErrorResponse,\n    GraphQLSchemaPlugin,\n    ListResponse,\n    Response\n} from \"@webiny/handler-graphql\";\nimport { FileManagerContext, FilesListOpts } from \"~/types\";\nimport { emptyResolver, resolve } from \"./utils\";\nimport { createFilesTypeDefs, CreateFilesTypeDefsParams } from \"~/graphql/createFilesTypeDefs\";\nimport { NotAuthorizedResponse } from \"@webiny/api-security\";\n\nexport const createFilesSchema = (params: CreateFilesTypeDefsParams) => {\n    const fileManagerGraphQL = new GraphQLSchemaPlugin<FileManagerContext>({\n        typeDefs: createFilesTypeDefs(params),\n        resolvers: {\n            Query: {\n                fileManager: emptyResolver\n            },\n            Mutation: {\n                fileManager: emptyResolver\n            },\n            FmFile: {\n                async src(file, _, context: FileManagerContext) {\n                    const settings = await context.fileManager.getSettings();\n                    return (settings?.srcPrefix || \"\") + file.key;\n                }\n            },\n            FmQuery: {\n                getFileModel(_, __, context) {\n                    const identity = context.security.getIdentity();\n                    if (!identity) {\n                        return new NotAuthorizedResponse();\n                    }\n\n                    return resolve(() =>\n                        context.security.withoutAuthorization(() => {\n                            return context.cms.getModel(\"fmFile\");\n                        })\n                    );\n                },\n                getFile(_, args: any, context) {\n                    return resolve(() => context.fileManager.getFile(args.id));\n                },\n                async listFiles(_, args: FilesListOpts, context) {\n                    try {\n                        const [data, meta] = await context.fileManager.listFiles(args);\n\n                        return new ListResponse(data, meta);\n                    } catch (e) {\n                        return new ErrorResponse(e);\n                    }\n                },\n                async listTags(_, args: any, context) {\n                    try {\n                        const tags = await context.fileManager.listTags(args || {});\n\n                        return new Response(tags);\n                    } catch (error) {\n                        return new ErrorResponse(error);\n                    }\n                }\n            },\n            FmMutation: {\n                async createFile(_, args: any, context) {\n                    return resolve(() => {\n                        return context.fileManager.createFile(args.data, args.meta);\n                    });\n                },\n                async createFiles(_, args: any, context) {\n                    return resolve(() => {\n                        return context.fileManager.createFilesInBatch(args.data, args.meta);\n                    });\n                },\n                async updateFile(_, args: any, context) {\n                    return resolve(() => {\n                        return context.fileManager.updateFile(args.id, args.data);\n                    });\n                },\n                async deleteFile(_, args: any, context) {\n                    return resolve(async () => {\n                        // TODO: Ideally, this should work via a lifecycle hook; first we delete a record from DB, then from cloud storage.\n                        const file = await context.fileManager.getFile(args.id);\n                        return await context.fileManager.storage.delete({\n                            id: file.id,\n                            key: file.key\n                        });\n                    });\n                }\n            }\n        }\n    });\n    fileManagerGraphQL.name = \"fm.graphql.files\";\n\n    return fileManagerGraphQL;\n};\n"],"mappings":"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"}
+{"version":3,"names":["_handlerGraphql","require","_utils","_createFilesTypeDefs","_apiSecurity","createFilesSchema","params","fileManagerGraphQL","GraphQLSchemaPlugin","typeDefs","createFilesTypeDefs","resolvers","Query","fileManager","emptyResolver","Mutation","FmFile","src","file","_","context","settings","getSettings","srcPrefix","key","FmQuery","getFileModel","__","identity","security","getIdentity","NotAuthorizedResponse","resolve","cms","getModel","getFile","args","id","listFiles","data","meta","ListResponse","e","ErrorResponse","listTags","tags","Response","error","FmMutation","createFile","createFiles","createFilesInBatch","updateFile","deleteFile","storage","delete","name","exports"],"sources":["filesSchema.ts"],"sourcesContent":["import {\n    ErrorResponse,\n    GraphQLSchemaPlugin,\n    ListResponse,\n    Response\n} from \"@webiny/handler-graphql\";\nimport { FileManagerContext, FilesListOpts } from \"~/types\";\nimport { emptyResolver, resolve } from \"./utils\";\nimport { createFilesTypeDefs, CreateFilesTypeDefsParams } from \"~/graphql/createFilesTypeDefs\";\nimport { NotAuthorizedResponse } from \"@webiny/api-security\";\n\nexport const createFilesSchema = (params: CreateFilesTypeDefsParams) => {\n    const fileManagerGraphQL = new GraphQLSchemaPlugin<FileManagerContext>({\n        typeDefs: createFilesTypeDefs(params),\n        resolvers: {\n            Query: {\n                fileManager: emptyResolver\n            },\n            Mutation: {\n                fileManager: emptyResolver\n            },\n            FmFile: {\n                async src(file, _, context: FileManagerContext) {\n                    const settings = await context.fileManager.getSettings();\n                    return (settings?.srcPrefix || \"\") + file.key;\n                }\n            },\n            FmQuery: {\n                getFileModel(_, __, context) {\n                    const identity = context.security.getIdentity();\n                    if (!identity) {\n                        return new NotAuthorizedResponse();\n                    }\n\n                    return resolve(() => context.cms.getModel(\"fmFile\"));\n                },\n                getFile(_, args: any, context) {\n                    return resolve(() => context.fileManager.getFile(args.id));\n                },\n                async listFiles(_, args: FilesListOpts, context) {\n                    try {\n                        const [data, meta] = await context.fileManager.listFiles(args);\n\n                        return new ListResponse(data, meta);\n                    } catch (e) {\n                        return new ErrorResponse(e);\n                    }\n                },\n                async listTags(_, args: any, context) {\n                    try {\n                        const tags = await context.fileManager.listTags(args || {});\n\n                        return new Response(tags);\n                    } catch (error) {\n                        return new ErrorResponse(error);\n                    }\n                }\n            },\n            FmMutation: {\n                async createFile(_, args: any, context) {\n                    return resolve(() => {\n                        return context.fileManager.createFile(args.data, args.meta);\n                    });\n                },\n                async createFiles(_, args: any, context) {\n                    return resolve(() => {\n                        return context.fileManager.createFilesInBatch(args.data, args.meta);\n                    });\n                },\n                async updateFile(_, args: any, context) {\n                    return resolve(() => {\n                        return context.fileManager.updateFile(args.id, args.data);\n                    });\n                },\n                async deleteFile(_, args: any, context) {\n                    return resolve(async () => {\n                        // TODO: Ideally, this should work via a lifecycle hook; first we delete a record from DB, then from cloud storage.\n                        const file = await context.fileManager.getFile(args.id);\n                        return await context.fileManager.storage.delete({\n                            id: file.id,\n                            key: file.key\n                        });\n                    });\n                }\n            }\n        }\n    });\n    fileManagerGraphQL.name = \"fm.graphql.files\";\n\n    return fileManagerGraphQL;\n};\n"],"mappings":"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"}

package/graphql/index.js

@@ -4,20 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createGraphQLSchemaPlugin = void 0;
-var _baseSchema = require("./baseSchema");
 var _api = require("@webiny/api");
+var _apiHeadlessCms = require("@webiny/api-headless-cms");
 var _createFieldTypePluginRecords = require("@webiny/api-headless-cms/graphql/schema/createFieldTypePluginRecords");
 var _getSchemaFromFieldPlugins = require("@webiny/api-headless-cms/utils/getSchemaFromFieldPlugins");
+var _baseSchema = require("./baseSchema");
 var _handlerGraphql = require("@webiny/handler-graphql");
 var _filesSchema = require("./filesSchema");
-var _isInstallationPending = require("../cmsFileStorage/isInstallationPending");
 var _getFileByUrl = require("./getFileByUrl");
 const createGraphQLSchemaPlugin = () => {
   return [(0, _baseSchema.createBaseSchema)(),
   // Files schema is generated dynamically, based on a CMS model, so we need to
   // register it from a ContextPlugin, to perform additional bootstrap.
   new _api.ContextPlugin(async context => {
-    if ((0, _isInstallationPending.isInstallationPending)(context)) {
+    if (!(await (0, _apiHeadlessCms.isHeadlessCmsReady)(context))) {
       return;
     }
     await context.security.withoutAuthorization(async () => {

package/graphql/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_baseSchema","require","_api","_createFieldTypePluginRecords","_getSchemaFromFieldPlugins","_handlerGraphql","_filesSchema","_isInstallationPending","_getFileByUrl","createGraphQLSchemaPlugin","createBaseSchema","ContextPlugin","context","isInstallationPending","security","withoutAuthorization","fileModel","cms","getModel","models","listModels","fieldPlugins","createFieldTypePluginRecords","plugins","createGraphQLSchemaPluginFromFieldPlugins","type","fieldTypePlugins","createPlugin","schema","fieldType","plugin","GraphQLSchemaPlugin","name","graphQlPlugin","createFilesSchema","model","register","getFileByUrl","exports"],"sources":["index.ts"],"sourcesContent":["import { createBaseSchema } from \"~/graphql/baseSchema\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport { createFieldTypePluginRecords } from \"@webiny/api-headless-cms/graphql/schema/createFieldTypePluginRecords\";\nimport { createGraphQLSchemaPluginFromFieldPlugins } from \"@webiny/api-headless-cms/utils/getSchemaFromFieldPlugins\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { createFilesSchema } from \"~/graphql/filesSchema\";\nimport { isInstallationPending } from \"~/cmsFileStorage/isInstallationPending\";\nimport { getFileByUrl } from \"~/graphql/getFileByUrl\";\nimport { FileManagerContext } from \"~/types\";\n\nexport const createGraphQLSchemaPlugin = () => {\n    return [\n        createBaseSchema(),\n        // Files schema is generated dynamically, based on a CMS model, so we need to\n        // register it from a ContextPlugin, to perform additional bootstrap.\n        new ContextPlugin<FileManagerContext>(async context => {\n            if (isInstallationPending(context)) {\n                return;\n            }\n\n            await context.security.withoutAuthorization(async () => {\n                const fileModel = (await context.cms.getModel(\"fmFile\")) as CmsModel;\n                const models = await context.cms.listModels();\n                const fieldPlugins = createFieldTypePluginRecords(context.plugins);\n                /**\n                 * We need to register all plugins for all the CMS fields.\n                 */\n                const plugins = createGraphQLSchemaPluginFromFieldPlugins({\n                    models,\n                    type: \"manage\",\n                    fieldTypePlugins: fieldPlugins,\n                    createPlugin: ({ schema, type, fieldType }) => {\n                        const plugin = new GraphQLSchemaPlugin(schema);\n                        plugin.name = `fm.graphql.schema.${type}.field.${fieldType}`;\n                        return plugin;\n                    }\n                });\n\n                const graphQlPlugin = createFilesSchema({\n                    model: fileModel,\n                    models,\n                    plugins: fieldPlugins\n                });\n\n                context.plugins.register([...plugins, graphQlPlugin, getFileByUrl()]);\n            });\n        })\n    ];\n};\n"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AAEA,IAAAE,6BAAA,GAAAF,OAAA;AACA,IAAAG,0BAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,YAAA,GAAAL,OAAA;AACA,IAAAM,sBAAA,GAAAN,OAAA;AACA,IAAAO,aAAA,GAAAP,OAAA;AAGO,MAAMQ,yBAAyB,GAAGA,CAAA,KAAM;EAC3C,OAAO,CACH,IAAAC,4BAAgB,EAAC,CAAC;EAClB;EACA;EACA,IAAIC,kBAAa,CAAqB,MAAMC,OAAO,IAAI;IACnD,IAAI,IAAAC,4CAAqB,EAACD,OAAO,CAAC,EAAE;MAChC;IACJ;IAEA,MAAMA,OAAO,CAACE,QAAQ,CAACC,oBAAoB,CAAC,YAAY;MACpD,MAAMC,SAAS,GAAI,MAAMJ,OAAO,CAACK,GAAG,CAACC,QAAQ,CAAC,QAAQ,CAAc;MACpE,MAAMC,MAAM,GAAG,MAAMP,OAAO,CAACK,GAAG,CAACG,UAAU,CAAC,CAAC;MAC7C,MAAMC,YAAY,GAAG,IAAAC,0DAA4B,EAACV,OAAO,CAACW,OAAO,CAAC;MAClE;AAChB;AACA;MACgB,MAAMA,OAAO,GAAG,IAAAC,oEAAyC,EAAC;QACtDL,MAAM;QACNM,IAAI,EAAE,QAAQ;QACdC,gBAAgB,EAAEL,YAAY;QAC9BM,YAAY,EAAEA,CAAC;UAAEC,MAAM;UAAEH,IAAI;UAAEI;QAAU,CAAC,KAAK;UAC3C,MAAMC,MAAM,GAAG,IAAIC,mCAAmB,CAACH,MAAM,CAAC;UAC9CE,MAAM,CAACE,IAAI,GAAI,qBAAoBP,IAAK,UAASI,SAAU,EAAC;UAC5D,OAAOC,MAAM;QACjB;MACJ,CAAC,CAAC;MAEF,MAAMG,aAAa,GAAG,IAAAC,8BAAiB,EAAC;QACpCC,KAAK,EAAEnB,SAAS;QAChBG,MAAM;QACNI,OAAO,EAAEF;MACb,CAAC,CAAC;MAEFT,OAAO,CAACW,OAAO,CAACa,QAAQ,CAAC,CAAC,GAAGb,OAAO,EAAEU,aAAa,EAAE,IAAAI,0BAAY,EAAC,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC;EACN,CAAC,CAAC,CACL;AACL,CAAC;AAACC,OAAA,CAAA7B,yBAAA,GAAAA,yBAAA"}
+{"version":3,"names":["_api","require","_apiHeadlessCms","_createFieldTypePluginRecords","_getSchemaFromFieldPlugins","_baseSchema","_handlerGraphql","_filesSchema","_getFileByUrl","createGraphQLSchemaPlugin","createBaseSchema","ContextPlugin","context","isHeadlessCmsReady","security","withoutAuthorization","fileModel","cms","getModel","models","listModels","fieldPlugins","createFieldTypePluginRecords","plugins","createGraphQLSchemaPluginFromFieldPlugins","type","fieldTypePlugins","createPlugin","schema","fieldType","plugin","GraphQLSchemaPlugin","name","graphQlPlugin","createFilesSchema","model","register","getFileByUrl","exports"],"sources":["index.ts"],"sourcesContent":["import { ContextPlugin } from \"@webiny/api\";\nimport { isHeadlessCmsReady } from \"@webiny/api-headless-cms\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport { createFieldTypePluginRecords } from \"@webiny/api-headless-cms/graphql/schema/createFieldTypePluginRecords\";\nimport { createGraphQLSchemaPluginFromFieldPlugins } from \"@webiny/api-headless-cms/utils/getSchemaFromFieldPlugins\";\nimport { createBaseSchema } from \"~/graphql/baseSchema\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { createFilesSchema } from \"~/graphql/filesSchema\";\nimport { getFileByUrl } from \"~/graphql/getFileByUrl\";\nimport { FileManagerContext } from \"~/types\";\n\nexport const createGraphQLSchemaPlugin = () => {\n    return [\n        createBaseSchema(),\n        // Files schema is generated dynamically, based on a CMS model, so we need to\n        // register it from a ContextPlugin, to perform additional bootstrap.\n        new ContextPlugin<FileManagerContext>(async context => {\n            if (!(await isHeadlessCmsReady(context))) {\n                return;\n            }\n\n            await context.security.withoutAuthorization(async () => {\n                const fileModel = (await context.cms.getModel(\"fmFile\")) as CmsModel;\n                const models = await context.cms.listModels();\n                const fieldPlugins = createFieldTypePluginRecords(context.plugins);\n                /**\n                 * We need to register all plugins for all the CMS fields.\n                 */\n                const plugins = createGraphQLSchemaPluginFromFieldPlugins({\n                    models,\n                    type: \"manage\",\n                    fieldTypePlugins: fieldPlugins,\n                    createPlugin: ({ schema, type, fieldType }) => {\n                        const plugin = new GraphQLSchemaPlugin(schema);\n                        plugin.name = `fm.graphql.schema.${type}.field.${fieldType}`;\n                        return plugin;\n                    }\n                });\n\n                const graphQlPlugin = createFilesSchema({\n                    model: fileModel,\n                    models,\n                    plugins: fieldPlugins\n                });\n\n                context.plugins.register([...plugins, graphQlPlugin, getFileByUrl()]);\n            });\n        })\n    ];\n};\n"],"mappings":";;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAEA,IAAAE,6BAAA,GAAAF,OAAA;AACA,IAAAG,0BAAA,GAAAH,OAAA;AACA,IAAAI,WAAA,GAAAJ,OAAA;AACA,IAAAK,eAAA,GAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AACA,IAAAO,aAAA,GAAAP,OAAA;AAGO,MAAMQ,yBAAyB,GAAGA,CAAA,KAAM;EAC3C,OAAO,CACH,IAAAC,4BAAgB,EAAC,CAAC;EAClB;EACA;EACA,IAAIC,kBAAa,CAAqB,MAAMC,OAAO,IAAI;IACnD,IAAI,EAAE,MAAM,IAAAC,kCAAkB,EAACD,OAAO,CAAC,CAAC,EAAE;MACtC;IACJ;IAEA,MAAMA,OAAO,CAACE,QAAQ,CAACC,oBAAoB,CAAC,YAAY;MACpD,MAAMC,SAAS,GAAI,MAAMJ,OAAO,CAACK,GAAG,CAACC,QAAQ,CAAC,QAAQ,CAAc;MACpE,MAAMC,MAAM,GAAG,MAAMP,OAAO,CAACK,GAAG,CAACG,UAAU,CAAC,CAAC;MAC7C,MAAMC,YAAY,GAAG,IAAAC,0DAA4B,EAACV,OAAO,CAACW,OAAO,CAAC;MAClE;AAChB;AACA;MACgB,MAAMA,OAAO,GAAG,IAAAC,oEAAyC,EAAC;QACtDL,MAAM;QACNM,IAAI,EAAE,QAAQ;QACdC,gBAAgB,EAAEL,YAAY;QAC9BM,YAAY,EAAEA,CAAC;UAAEC,MAAM;UAAEH,IAAI;UAAEI;QAAU,CAAC,KAAK;UAC3C,MAAMC,MAAM,GAAG,IAAIC,mCAAmB,CAACH,MAAM,CAAC;UAC9CE,MAAM,CAACE,IAAI,GAAI,qBAAoBP,IAAK,UAASI,SAAU,EAAC;UAC5D,OAAOC,MAAM;QACjB;MACJ,CAAC,CAAC;MAEF,MAAMG,aAAa,GAAG,IAAAC,8BAAiB,EAAC;QACpCC,KAAK,EAAEnB,SAAS;QAChBG,MAAM;QACNI,OAAO,EAAEF;MACb,CAAC,CAAC;MAEFT,OAAO,CAACW,OAAO,CAACa,QAAQ,CAAC,CAAC,GAAGb,OAAO,EAAEU,aAAa,EAAE,IAAAI,0BAAY,EAAC,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC;EACN,CAAC,CAAC,CACL;AACL,CAAC;AAACC,OAAA,CAAA7B,yBAAA,GAAAA,yBAAA"}

package/modelModifier/CmsModelModifier.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createFileModelModifier = exports.CmsModelModifierPlugin = void 0;
 var _plugins = require("@webiny/plugins");
+var _apiHeadlessCms = require("@webiny/api-headless-cms");
 var _file = require("../cmsFileStorage/file.model");
-var _createModelField = require("../cmsFileStorage/createModelField");
 class CmsModelFieldsModifier {
   constructor(fields) {
     this.fields = fields;
@@ -37,7 +37,7 @@ class CmsModelModifierPlugin extends _plugins.Plugin {
     }
     let extensionsField = model.fields.find(field => field.fieldId === "extensions");
     if (!extensionsField) {
-      extensionsField = (0, _createModelField.createModelField)({
+      extensionsField = (0, _apiHeadlessCms.createModelField)({
         label: "Extensions",
         type: "object",
         settings: {

package/modelModifier/CmsModelModifier.js.map

@@ -1 +1 @@
-{"version":3,"names":["_plugins","require","_file","_createModelField","CmsModelFieldsModifier","constructor","fields","addField","field","bulkEdit","tags","rest","push","concat","storageId","type","id","CmsModelModifierPlugin","Plugin","modelId","cb","modifyModel","model","extensionsField","find","fieldId","createModelField","label","settings","layout","modifier","exports","createFileModelModifier","FILE_MODEL_ID"],"sources":["CmsModelModifier.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins\";\nimport { CmsModelField as BaseModelField } from \"@webiny/api-headless-cms/types\";\nimport { FILE_MODEL_ID } from \"~/cmsFileStorage/file.model\";\nimport { createModelField } from \"~/cmsFileStorage/createModelField\";\nimport { CmsPrivateModelFull } from \"@webiny/api-headless-cms\";\n\ntype CmsModelField = Omit<BaseModelField, \"storageId\"> & { bulkEdit?: boolean };\n\nclass CmsModelFieldsModifier {\n    private fields: BaseModelField[];\n\n    constructor(fields: BaseModelField[]) {\n        this.fields = fields;\n    }\n\n    addField(field: CmsModelField) {\n        const { bulkEdit, tags, ...rest } = field;\n\n        this.fields.push({\n            ...rest,\n            tags: (tags ?? []).concat(bulkEdit ? [\"$bulk-edit\"] : []),\n            storageId: `${field.type}@${field.id}`\n        });\n    }\n}\n\ninterface CmsModelModifierCallableParams {\n    modifier: CmsModelFieldsModifier;\n}\n\ninterface CmsModelModifierCallable {\n    (params: CmsModelModifierCallableParams): Promise<void> | void;\n}\n\nexport class CmsModelModifierPlugin extends Plugin {\n    public static override type = \"fm.cms-model-modifier\";\n    private readonly modelId: string;\n    private readonly cb: CmsModelModifierCallable;\n\n    constructor(modelId: string, cb: CmsModelModifierCallable) {\n        super();\n        this.modelId = modelId;\n        this.cb = cb;\n    }\n\n    async modifyModel(model: CmsPrivateModelFull): Promise<void> {\n        if (model.modelId !== this.modelId) {\n            return;\n        }\n\n        let extensionsField = model.fields.find(field => field.fieldId === \"extensions\");\n        if (!extensionsField) {\n            extensionsField = createModelField({\n                label: \"Extensions\",\n                type: \"object\",\n                settings: {\n                    layout: [],\n                    fields: []\n                }\n            });\n            model.fields.push(extensionsField);\n        }\n\n        const modifier = new CmsModelFieldsModifier(extensionsField.settings!.fields!);\n        await this.cb({ modifier });\n    }\n}\n\nexport const createFileModelModifier = (cb: CmsModelModifierCallable) => {\n    return new CmsModelModifierPlugin(FILE_MODEL_ID, cb);\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAEA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAF,OAAA;AAKA,MAAMG,sBAAsB,CAAC;EAGzBC,WAAWA,CAACC,MAAwB,EAAE;IAClC,IAAI,CAACA,MAAM,GAAGA,MAAM;EACxB;EAEAC,QAAQA,CAACC,KAAoB,EAAE;IAC3B,MAAM;MAAEC,QAAQ;MAAEC,IAAI;MAAE,GAAGC;IAAK,CAAC,GAAGH,KAAK;IAEzC,IAAI,CAACF,MAAM,CAACM,IAAI,CAAC;MACb,GAAGD,IAAI;MACPD,IAAI,EAAE,CAACA,IAAI,IAAI,EAAE,EAAEG,MAAM,CAACJ,QAAQ,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;MACzDK,SAAS,EAAG,GAAEN,KAAK,CAACO,IAAK,IAAGP,KAAK,CAACQ,EAAG;IACzC,CAAC,CAAC;EACN;AACJ;AAUO,MAAMC,sBAAsB,SAASC,eAAM,CAAC;EAC/C,OAAuBH,IAAI,GAAG,uBAAuB;EAIrDV,WAAWA,CAACc,OAAe,EAAEC,EAA4B,EAAE;IACvD,KAAK,CAAC,CAAC;IACP,IAAI,CAACD,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,EAAE,GAAGA,EAAE;EAChB;EAEA,MAAMC,WAAWA,CAACC,KAA0B,EAAiB;IACzD,IAAIA,KAAK,CAACH,OAAO,KAAK,IAAI,CAACA,OAAO,EAAE;MAChC;IACJ;IAEA,IAAII,eAAe,GAAGD,KAAK,CAAChB,MAAM,CAACkB,IAAI,CAAChB,KAAK,IAAIA,KAAK,CAACiB,OAAO,KAAK,YAAY,CAAC;IAChF,IAAI,CAACF,eAAe,EAAE;MAClBA,eAAe,GAAG,IAAAG,kCAAgB,EAAC;QAC/BC,KAAK,EAAE,YAAY;QACnBZ,IAAI,EAAE,QAAQ;QACda,QAAQ,EAAE;UACNC,MAAM,EAAE,EAAE;UACVvB,MAAM,EAAE;QACZ;MACJ,CAAC,CAAC;MACFgB,KAAK,CAAChB,MAAM,CAACM,IAAI,CAACW,eAAe,CAAC;IACtC;IAEA,MAAMO,QAAQ,GAAG,IAAI1B,sBAAsB,CAACmB,eAAe,CAACK,QAAQ,CAAEtB,MAAO,CAAC;IAC9E,MAAM,IAAI,CAACc,EAAE,CAAC;MAAEU;IAAS,CAAC,CAAC;EAC/B;AACJ;AAACC,OAAA,CAAAd,sBAAA,GAAAA,sBAAA;AAEM,MAAMe,uBAAuB,GAAIZ,EAA4B,IAAK;EACrE,OAAO,IAAIH,sBAAsB,CAACgB,mBAAa,EAAEb,EAAE,CAAC;AACxD,CAAC;AAACW,OAAA,CAAAC,uBAAA,GAAAA,uBAAA"}
+{"version":3,"names":["_plugins","require","_apiHeadlessCms","_file","CmsModelFieldsModifier","constructor","fields","addField","field","bulkEdit","tags","rest","push","concat","storageId","type","id","CmsModelModifierPlugin","Plugin","modelId","cb","modifyModel","model","extensionsField","find","fieldId","createModelField","label","settings","layout","modifier","exports","createFileModelModifier","FILE_MODEL_ID"],"sources":["CmsModelModifier.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins\";\nimport { CmsModelField as BaseModelField } from \"@webiny/api-headless-cms/types\";\nimport { CmsPrivateModelFull, createModelField } from \"@webiny/api-headless-cms\";\nimport { FILE_MODEL_ID } from \"~/cmsFileStorage/file.model\";\n\ntype CmsModelField = Omit<BaseModelField, \"storageId\"> & { bulkEdit?: boolean };\n\nclass CmsModelFieldsModifier {\n    private fields: BaseModelField[];\n\n    constructor(fields: BaseModelField[]) {\n        this.fields = fields;\n    }\n\n    addField(field: CmsModelField) {\n        const { bulkEdit, tags, ...rest } = field;\n\n        this.fields.push({\n            ...rest,\n            tags: (tags ?? []).concat(bulkEdit ? [\"$bulk-edit\"] : []),\n            storageId: `${field.type}@${field.id}`\n        });\n    }\n}\n\ninterface CmsModelModifierCallableParams {\n    modifier: CmsModelFieldsModifier;\n}\n\ninterface CmsModelModifierCallable {\n    (params: CmsModelModifierCallableParams): Promise<void> | void;\n}\n\nexport class CmsModelModifierPlugin extends Plugin {\n    public static override type = \"fm.cms-model-modifier\";\n    private readonly modelId: string;\n    private readonly cb: CmsModelModifierCallable;\n\n    constructor(modelId: string, cb: CmsModelModifierCallable) {\n        super();\n        this.modelId = modelId;\n        this.cb = cb;\n    }\n\n    async modifyModel(model: CmsPrivateModelFull): Promise<void> {\n        if (model.modelId !== this.modelId) {\n            return;\n        }\n\n        let extensionsField = model.fields.find(field => field.fieldId === \"extensions\");\n        if (!extensionsField) {\n            extensionsField = createModelField({\n                label: \"Extensions\",\n                type: \"object\",\n                settings: {\n                    layout: [],\n                    fields: []\n                }\n            });\n            model.fields.push(extensionsField);\n        }\n\n        const modifier = new CmsModelFieldsModifier(extensionsField.settings!.fields!);\n        await this.cb({ modifier });\n    }\n}\n\nexport const createFileModelModifier = (cb: CmsModelModifierCallable) => {\n    return new CmsModelModifierPlugin(FILE_MODEL_ID, cb);\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAEA,IAAAC,eAAA,GAAAD,OAAA;AACA,IAAAE,KAAA,GAAAF,OAAA;AAIA,MAAMG,sBAAsB,CAAC;EAGzBC,WAAWA,CAACC,MAAwB,EAAE;IAClC,IAAI,CAACA,MAAM,GAAGA,MAAM;EACxB;EAEAC,QAAQA,CAACC,KAAoB,EAAE;IAC3B,MAAM;MAAEC,QAAQ;MAAEC,IAAI;MAAE,GAAGC;IAAK,CAAC,GAAGH,KAAK;IAEzC,IAAI,CAACF,MAAM,CAACM,IAAI,CAAC;MACb,GAAGD,IAAI;MACPD,IAAI,EAAE,CAACA,IAAI,IAAI,EAAE,EAAEG,MAAM,CAACJ,QAAQ,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;MACzDK,SAAS,EAAG,GAAEN,KAAK,CAACO,IAAK,IAAGP,KAAK,CAACQ,EAAG;IACzC,CAAC,CAAC;EACN;AACJ;AAUO,MAAMC,sBAAsB,SAASC,eAAM,CAAC;EAC/C,OAAuBH,IAAI,GAAG,uBAAuB;EAIrDV,WAAWA,CAACc,OAAe,EAAEC,EAA4B,EAAE;IACvD,KAAK,CAAC,CAAC;IACP,IAAI,CAACD,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,EAAE,GAAGA,EAAE;EAChB;EAEA,MAAMC,WAAWA,CAACC,KAA0B,EAAiB;IACzD,IAAIA,KAAK,CAACH,OAAO,KAAK,IAAI,CAACA,OAAO,EAAE;MAChC;IACJ;IAEA,IAAII,eAAe,GAAGD,KAAK,CAAChB,MAAM,CAACkB,IAAI,CAAChB,KAAK,IAAIA,KAAK,CAACiB,OAAO,KAAK,YAAY,CAAC;IAChF,IAAI,CAACF,eAAe,EAAE;MAClBA,eAAe,GAAG,IAAAG,gCAAgB,EAAC;QAC/BC,KAAK,EAAE,YAAY;QACnBZ,IAAI,EAAE,QAAQ;QACda,QAAQ,EAAE;UACNC,MAAM,EAAE,EAAE;UACVvB,MAAM,EAAE;QACZ;MACJ,CAAC,CAAC;MACFgB,KAAK,CAAChB,MAAM,CAACM,IAAI,CAACW,eAAe,CAAC;IACtC;IAEA,MAAMO,QAAQ,GAAG,IAAI1B,sBAAsB,CAACmB,eAAe,CAACK,QAAQ,CAAEtB,MAAO,CAAC;IAC9E,MAAM,IAAI,CAACc,EAAE,CAAC;MAAEU;IAAS,CAAC,CAAC;EAC/B;AACJ;AAACC,OAAA,CAAAd,sBAAA,GAAAA,sBAAA;AAEM,MAAMe,uBAAuB,GAAIZ,EAA4B,IAAK;EACrE,OAAO,IAAIH,sBAAsB,CAACgB,mBAAa,EAAEb,EAAE,CAAC;AACxD,CAAC;AAACW,OAAA,CAAAC,uBAAA,GAAAA,uBAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-file-manager",
-	"version": "5.39.1",
+	"version": "5.39.2-beta.0",
 	"main": "index.js",
 	"keywords": [
 		"fm:base"
@@ -20,20 +20,20 @@
 	"dependencies": {
 		"@babel/runtime": "7.22.6",
 		"@commodo/fields": "1.1.2-beta.20",
-		"@webiny/api": "5.39.1",
-		"@webiny/api-headless-cms": "5.39.1",
-		"@webiny/api-security": "5.39.1",
-		"@webiny/api-tenancy": "5.39.1",
-		"@webiny/aws-sdk": "5.39.1",
-		"@webiny/error": "5.39.1",
-		"@webiny/handler": "5.39.1",
-		"@webiny/handler-aws": "5.39.1",
-		"@webiny/handler-graphql": "5.39.1",
-		"@webiny/plugins": "5.39.1",
-		"@webiny/project-utils": "5.39.1",
-		"@webiny/pubsub": "5.39.1",
-		"@webiny/tasks": "5.39.1",
-		"@webiny/validation": "5.39.1",
+		"@webiny/api": "5.39.2-beta.0",
+		"@webiny/api-headless-cms": "5.39.2-beta.0",
+		"@webiny/api-security": "5.39.2-beta.0",
+		"@webiny/api-tenancy": "5.39.2-beta.0",
+		"@webiny/aws-sdk": "5.39.2-beta.0",
+		"@webiny/error": "5.39.2-beta.0",
+		"@webiny/handler": "5.39.2-beta.0",
+		"@webiny/handler-aws": "5.39.2-beta.0",
+		"@webiny/handler-graphql": "5.39.2-beta.0",
+		"@webiny/plugins": "5.39.2-beta.0",
+		"@webiny/project-utils": "5.39.2-beta.0",
+		"@webiny/pubsub": "5.39.2-beta.0",
+		"@webiny/tasks": "5.39.2-beta.0",
+		"@webiny/validation": "5.39.2-beta.0",
 		"lodash": "4.17.21",
 		"object-hash": "2.2.0"
 	},
@@ -45,9 +45,9 @@
 		"@babel/preset-env": "7.22.7",
 		"@babel/preset-typescript": "7.22.5",
 		"@types/sharp": "0.32.0",
-		"@webiny/api-i18n": "5.39.1",
-		"@webiny/cli": "5.39.1",
-		"@webiny/utils": "5.39.1",
+		"@webiny/api-i18n": "5.39.2-beta.0",
+		"@webiny/cli": "5.39.2-beta.0",
+		"@webiny/utils": "5.39.2-beta.0",
 		"jest": "29.5.0",
 		"rimraf": "3.0.2",
 		"ttypescript": "1.5.15",
@@ -71,5 +71,5 @@
 			]
 		}
 	},
-	"gitHead": "6fc74b45740bd4123dcf9b5890bfacee594208bf"
+	"gitHead": "3ceff3406ff490e6d7503b35733a09c1cee8ff12"
 }

package/cmsFileStorage/createFileManagerPlugins.d.ts

@@ -1,7 +0,0 @@
-interface CreateFileManagerPluginsParams {
-    withPrivateFiles: boolean;
-}
-export declare const createFileModel: (params: CreateFileManagerPluginsParams) => {
-    fileModelDefinition: import("@webiny/api-headless-cms").CmsPrivateModelFull;
-};
-export {};

package/cmsFileStorage/createFileManagerPlugins.js

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createFileModel = void 0;
-var _file = require("./file.model");
-const createFileModel = params => {
-  return {
-    fileModelDefinition: (0, _file.createFileModelDefinition)({
-      withPrivateFiles: params.withPrivateFiles
-    })
-  };
-};
-exports.createFileModel = createFileModel;
-
-//# sourceMappingURL=createFileManagerPlugins.js.map

package/cmsFileStorage/createFileManagerPlugins.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_file","require","createFileModel","params","fileModelDefinition","createFileModelDefinition","withPrivateFiles","exports"],"sources":["createFileManagerPlugins.ts"],"sourcesContent":["import { createFileModelDefinition } from \"~/cmsFileStorage/file.model\";\n\ninterface CreateFileManagerPluginsParams {\n    withPrivateFiles: boolean;\n}\n\nexport const createFileModel = (params: CreateFileManagerPluginsParams) => {\n    return {\n        fileModelDefinition: createFileModelDefinition({\n            withPrivateFiles: params.withPrivateFiles\n        })\n    };\n};\n"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAMO,MAAMC,eAAe,GAAIC,MAAsC,IAAK;EACvE,OAAO;IACHC,mBAAmB,EAAE,IAAAC,+BAAyB,EAAC;MAC3CC,gBAAgB,EAAEH,MAAM,CAACG;IAC7B,CAAC;EACL,CAAC;AACL,CAAC;AAACC,OAAA,CAAAL,eAAA,GAAAA,eAAA"}

package/cmsFileStorage/createModelField.d.ts

@@ -1,5 +0,0 @@
-import { CmsModelField } from "@webiny/api-headless-cms/types";
-export interface CreateModelFieldParams extends Omit<CmsModelField, "id" | "storageId" | "fieldId"> {
-    fieldId?: string;
-}
-export declare const createModelField: (params: CreateModelFieldParams) => CmsModelField;

package/cmsFileStorage/createModelField.js

@@ -1,41 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createModelField = void 0;
-var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
-const createModelField = params => {
-  const {
-    label,
-    fieldId: initialFieldId,
-    type,
-    tags,
-    settings = {},
-    listValidation = [],
-    validation = [],
-    multipleValues = false,
-    predefinedValues = {
-      values: [],
-      enabled: false
-    }
-  } = params;
-  const fieldId = initialFieldId ? (0, _camelCase.default)(initialFieldId) : (0, _camelCase.default)(label);
-  return {
-    id: fieldId,
-    storageId: `${type}@${fieldId}`,
-    fieldId,
-    label,
-    type,
-    settings,
-    tags,
-    listValidation,
-    validation,
-    multipleValues,
-    predefinedValues
-  };
-};
-exports.createModelField = createModelField;
-
-//# sourceMappingURL=createModelField.js.map

package/cmsFileStorage/createModelField.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_camelCase","_interopRequireDefault","require","createModelField","params","label","fieldId","initialFieldId","type","tags","settings","listValidation","validation","multipleValues","predefinedValues","values","enabled","camelCase","id","storageId","exports"],"sources":["createModelField.ts"],"sourcesContent":["import { CmsModelField } from \"@webiny/api-headless-cms/types\";\nimport camelCase from \"lodash/camelCase\";\n\nexport interface CreateModelFieldParams\n    extends Omit<CmsModelField, \"id\" | \"storageId\" | \"fieldId\"> {\n    fieldId?: string;\n}\n\nexport const createModelField = (params: CreateModelFieldParams): CmsModelField => {\n    const {\n        label,\n        fieldId: initialFieldId,\n        type,\n        tags,\n        settings = {},\n        listValidation = [],\n        validation = [],\n        multipleValues = false,\n        predefinedValues = {\n            values: [],\n            enabled: false\n        }\n    } = params;\n\n    const fieldId = initialFieldId ? camelCase(initialFieldId) : camelCase(label);\n\n    return {\n        id: fieldId,\n        storageId: `${type}@${fieldId}`,\n        fieldId,\n        label,\n        type,\n        settings,\n        tags,\n        listValidation,\n        validation,\n        multipleValues,\n        predefinedValues\n    };\n};\n"],"mappings":";;;;;;;AACA,IAAAA,UAAA,GAAAC,sBAAA,CAAAC,OAAA;AAOO,MAAMC,gBAAgB,GAAIC,MAA8B,IAAoB;EAC/E,MAAM;IACFC,KAAK;IACLC,OAAO,EAAEC,cAAc;IACvBC,IAAI;IACJC,IAAI;IACJC,QAAQ,GAAG,CAAC,CAAC;IACbC,cAAc,GAAG,EAAE;IACnBC,UAAU,GAAG,EAAE;IACfC,cAAc,GAAG,KAAK;IACtBC,gBAAgB,GAAG;MACfC,MAAM,EAAE,EAAE;MACVC,OAAO,EAAE;IACb;EACJ,CAAC,GAAGZ,MAAM;EAEV,MAAME,OAAO,GAAGC,cAAc,GAAG,IAAAU,kBAAS,EAACV,cAAc,CAAC,GAAG,IAAAU,kBAAS,EAACZ,KAAK,CAAC;EAE7E,OAAO;IACHa,EAAE,EAAEZ,OAAO;IACXa,SAAS,EAAG,GAAEX,IAAK,IAAGF,OAAQ,EAAC;IAC/BA,OAAO;IACPD,KAAK;IACLG,IAAI;IACJE,QAAQ;IACRD,IAAI;IACJE,cAAc;IACdC,UAAU;IACVC,cAAc;IACdC;EACJ,CAAC;AACL,CAAC;AAACM,OAAA,CAAAjB,gBAAA,GAAAA,gBAAA"}

package/cmsFileStorage/isInstallationPending.d.ts

@@ -1,4 +0,0 @@
-import { FileManagerContext } from "../types";
-declare type CheckInstallationParams = Pick<FileManagerContext, "tenancy" | "i18n">;
-export declare const isInstallationPending: ({ tenancy, i18n }: CheckInstallationParams) => boolean;
-export {};

package/cmsFileStorage/isInstallationPending.js

@@ -1,23 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isInstallationPending = void 0;
-const isInstallationPending = ({
-  tenancy,
-  i18n
-}) => {
-  /**
-   * In case of a fresh webiny project "tenant" and "locale" won't be there until
-   * installation is completed. So, we need to skip "storage" creation till then.
-   */
-  const tenant = tenancy.getCurrentTenant();
-  if (!tenant) {
-    return true;
-  }
-  return !i18n.getContentLocale();
-};
-exports.isInstallationPending = isInstallationPending;
-
-//# sourceMappingURL=isInstallationPending.js.map

package/cmsFileStorage/isInstallationPending.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["isInstallationPending","tenancy","i18n","tenant","getCurrentTenant","getContentLocale","exports"],"sources":["isInstallationPending.ts"],"sourcesContent":["import { FileManagerContext } from \"~/types\";\n\ntype CheckInstallationParams = Pick<FileManagerContext, \"tenancy\" | \"i18n\">;\nexport const isInstallationPending = ({ tenancy, i18n }: CheckInstallationParams): boolean => {\n    /**\n     * In case of a fresh webiny project \"tenant\" and \"locale\" won't be there until\n     * installation is completed. So, we need to skip \"storage\" creation till then.\n     */\n    const tenant = tenancy.getCurrentTenant();\n    if (!tenant) {\n        return true;\n    }\n\n    return !i18n.getContentLocale();\n};\n"],"mappings":";;;;;;AAGO,MAAMA,qBAAqB,GAAGA,CAAC;EAAEC,OAAO;EAAEC;AAA8B,CAAC,KAAc;EAC1F;AACJ;AACA;AACA;EACI,MAAMC,MAAM,GAAGF,OAAO,CAACG,gBAAgB,CAAC,CAAC;EACzC,IAAI,CAACD,MAAM,EAAE;IACT,OAAO,IAAI;EACf;EAEA,OAAO,CAACD,IAAI,CAACG,gBAAgB,CAAC,CAAC;AACnC,CAAC;AAACC,OAAA,CAAAN,qBAAA,GAAAA,qBAAA"}