@webiny/api-aco 6.5.2-beta.0 → 6.5.2-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (84) hide show
  1. package/createAcoContext.js +2 -0
  2. package/createAcoContext.js.map +1 -1
  3. package/features/cms/decorators/GetEntriesByIdsWithFlpDecorator.d.ts +13 -0
  4. package/features/cms/decorators/GetEntriesByIdsWithFlpDecorator.js +25 -0
  5. package/features/cms/decorators/GetEntriesByIdsWithFlpDecorator.js.map +1 -0
  6. package/features/cms/decorators/GetLatestRevisionByEntryIdWithFlpDecorator.d.ts +16 -0
  7. package/features/cms/decorators/GetLatestRevisionByEntryIdWithFlpDecorator.js +28 -0
  8. package/features/cms/decorators/GetLatestRevisionByEntryIdWithFlpDecorator.js.map +1 -0
  9. package/features/cms/decorators/GetRevisionByIdWithFlpDecorator.d.ts +17 -0
  10. package/features/cms/decorators/GetRevisionByIdWithFlpDecorator.js +28 -0
  11. package/features/cms/decorators/GetRevisionByIdWithFlpDecorator.js.map +1 -0
  12. package/features/cms/decorators/GetRevisionsByEntryIdWithFlpDecorator.d.ts +13 -0
  13. package/features/cms/decorators/GetRevisionsByEntryIdWithFlpDecorator.js +25 -0
  14. package/features/cms/decorators/GetRevisionsByEntryIdWithFlpDecorator.js.map +1 -0
  15. package/features/cms/decorators/GetUniqueFieldValuesWithFlpDecorator.d.ts +16 -0
  16. package/features/cms/decorators/GetUniqueFieldValuesWithFlpDecorator.js +55 -0
  17. package/features/cms/decorators/GetUniqueFieldValuesWithFlpDecorator.js.map +1 -0
  18. package/features/cms/decorators/PublishEntryWithFlpDecorator.d.ts +14 -0
  19. package/features/cms/decorators/PublishEntryWithFlpDecorator.js +30 -0
  20. package/features/cms/decorators/PublishEntryWithFlpDecorator.js.map +1 -0
  21. package/features/cms/decorators/RepublishEntryWithFlpDecorator.d.ts +14 -0
  22. package/features/cms/decorators/RepublishEntryWithFlpDecorator.js +30 -0
  23. package/features/cms/decorators/RepublishEntryWithFlpDecorator.js.map +1 -0
  24. package/features/cms/decorators/RestoreEntryFromBinWithFlpDecorator.d.ts +17 -0
  25. package/features/cms/decorators/RestoreEntryFromBinWithFlpDecorator.js +38 -0
  26. package/features/cms/decorators/RestoreEntryFromBinWithFlpDecorator.js.map +1 -0
  27. package/features/cms/decorators/UnpublishEntryWithFlpDecorator.d.ts +14 -0
  28. package/features/cms/decorators/UnpublishEntryWithFlpDecorator.js +30 -0
  29. package/features/cms/decorators/UnpublishEntryWithFlpDecorator.js.map +1 -0
  30. package/features/cms/decorators/UpdateEntryWithFlpDecorator.d.ts +1 -0
  31. package/features/cms/decorators/UpdateEntryWithFlpDecorator.js +9 -5
  32. package/features/cms/decorators/UpdateEntryWithFlpDecorator.js.map +1 -1
  33. package/features/cms/decorators/UpdateRevisionDescriptionWithFlpDecorator.d.ts +14 -0
  34. package/features/cms/decorators/UpdateRevisionDescriptionWithFlpDecorator.js +30 -0
  35. package/features/cms/decorators/UpdateRevisionDescriptionWithFlpDecorator.js.map +1 -0
  36. package/features/cms/decorators/canAccessEntryFolder.d.ts +21 -0
  37. package/features/cms/decorators/canAccessEntryFolder.js +25 -0
  38. package/features/cms/decorators/canAccessEntryFolder.js.map +1 -0
  39. package/features/cms/feature.js +20 -0
  40. package/features/cms/feature.js.map +1 -1
  41. package/features/flp/CreateFlpOnFolderCreated/CreateFlpOnFolderCreatedHandler.js +4 -1
  42. package/features/flp/CreateFlpOnFolderCreated/CreateFlpOnFolderCreatedHandler.js.map +1 -1
  43. package/features/flp/FolderLevelPermissions/FolderLevelPermissions.js +1 -1
  44. package/features/flp/FolderLevelPermissions/FolderLevelPermissions.js.map +1 -1
  45. package/features/flp/FolderLevelPermissions/useCases/GetDefaultPermissions/GetDefaultPermissionsWithTeams.js +2 -1
  46. package/features/flp/FolderLevelPermissions/useCases/GetDefaultPermissions/GetDefaultPermissionsWithTeams.js.map +1 -1
  47. package/features/folder/CreateFolder/CreateFolderRepository.js +3 -1
  48. package/features/folder/CreateFolder/CreateFolderRepository.js.map +1 -1
  49. package/features/folder/CreateFolder/decorators/CreateFolderWithFolderLevelPermissions.d.ts +1 -1
  50. package/features/folder/CreateFolder/decorators/CreateFolderWithFolderLevelPermissions.js +20 -2
  51. package/features/folder/CreateFolder/decorators/CreateFolderWithFolderLevelPermissions.js.map +1 -1
  52. package/features/folder/EnsureFolderIsEmpty/EnsureFolderIsEmpty.d.ts +1 -3
  53. package/features/folder/EnsureFolderIsEmpty/EnsureFolderIsEmpty.js +1 -5
  54. package/features/folder/EnsureFolderIsEmpty/EnsureFolderIsEmpty.js.map +1 -1
  55. package/features/folder/FolderTypePermissions/FolderTypeAccess.d.ts +11 -0
  56. package/features/folder/FolderTypePermissions/FolderTypeAccess.js +28 -0
  57. package/features/folder/FolderTypePermissions/FolderTypeAccess.js.map +1 -0
  58. package/features/folder/FolderTypePermissions/abstractions.d.ts +23 -0
  59. package/features/folder/FolderTypePermissions/abstractions.js +6 -0
  60. package/features/folder/FolderTypePermissions/abstractions.js.map +1 -0
  61. package/features/folder/FolderTypePermissions/decorators.d.ts +67 -0
  62. package/features/folder/FolderTypePermissions/decorators.js +128 -0
  63. package/features/folder/FolderTypePermissions/decorators.js.map +1 -0
  64. package/features/folder/FolderTypePermissions/feature.d.ts +4 -0
  65. package/features/folder/FolderTypePermissions/feature.js +18 -0
  66. package/features/folder/FolderTypePermissions/feature.js.map +1 -0
  67. package/features/folder/FolderTypePermissions/index.d.ts +2 -0
  68. package/features/folder/FolderTypePermissions/index.js +2 -0
  69. package/features/folder/GetFolderHierarchy/GetFolderHierarchyRepository.js +8 -2
  70. package/features/folder/GetFolderHierarchy/GetFolderHierarchyRepository.js.map +1 -1
  71. package/features/folder/GetFolderHierarchy/abstractions.d.ts +3 -1
  72. package/features/folder/GetFolderHierarchy/abstractions.js.map +1 -1
  73. package/features/folder/UpdateFolder/UpdateFolderRepository.d.ts +5 -0
  74. package/features/folder/UpdateFolder/UpdateFolderRepository.js +33 -5
  75. package/features/folder/UpdateFolder/UpdateFolderRepository.js.map +1 -1
  76. package/features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.d.ts +1 -1
  77. package/features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.js +21 -5
  78. package/features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.js.map +1 -1
  79. package/features/folder/shared/validatePermissionsInput.d.ts +7 -0
  80. package/features/folder/shared/validatePermissionsInput.js +12 -0
  81. package/features/folder/shared/validatePermissionsInput.js.map +1 -0
  82. package/filter/filter.so.js +12 -5
  83. package/filter/filter.so.js.map +1 -1
  84. package/package.json +21 -21
@@ -1 +1 @@
1
- {"version":3,"file":"features/folder/UpdateFolder/UpdateFolderRepository.js","sources":["../../../../src/features/folder/UpdateFolder/UpdateFolderRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n type IUpdateFolderRepository,\n UpdateFolderRepository as RepositoryAbstraction\n} from \"./abstractions.js\";\nimport { UpdateEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/UpdateEntry\";\nimport { GetEntryByIdUseCase } from \"@webiny/api-headless-cms/features/contentEntry/GetEntryById\";\nimport { ListLatestEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries\";\nimport { FolderModel } from \"~/domain/folder/abstractions.js\";\nimport type { CmsEntryFolder, Folder, UpdateFolderParams } from \"~/folder/folder.types.js\";\nimport { EntryToFolderMapper } from \"../shared/EntryToFolderMapper.js\";\nimport { FolderPersistenceError, FolderValidationError } from \"~/domain/folder/errors.js\";\nimport { Path } from \"~/utils/Path.js\";\nimport { EntryId } from \"@webiny/api-headless-cms/exports/api/cms/entry.js\";\n\nclass UpdateFolderRepositoryImpl implements IUpdateFolderRepository {\n constructor(\n private updateEntry: UpdateEntryUseCase.Interface,\n private getEntryById: GetEntryByIdUseCase.Interface,\n private listLatestEntries: ListLatestEntriesUseCase.Interface,\n private folderModel: FolderModel.Interface\n ) {}\n\n async execute(\n id: string,\n data: UpdateFolderParams\n ): Promise<Result<Folder, RepositoryAbstraction.Error>> {\n const entryId = EntryId.from(id);\n\n // Get the original folder\n const originalResult = await this.getEntryById.execute<CmsEntryFolder>(\n this.folderModel,\n entryId.toString()\n );\n\n if (originalResult.isFail()) {\n return Result.fail(new FolderPersistenceError(originalResult.error));\n }\n\n const original = EntryToFolderMapper.toFolder(originalResult.value);\n\n // Check if folder with new slug already exists\n const checkResult = await this.checkExistingFolder({\n id,\n type: original.type,\n slug: data.slug || original.slug,\n parentId: data.parentId !== undefined ? data.parentId : original.parentId\n });\n\n if (checkResult.isFail()) {\n return Result.fail(checkResult.error);\n }\n\n // Create new path if slug or parentId changed\n const pathResult = await this.createFolderPath({\n slug: data.slug || original.slug,\n parentId: data.parentId !== undefined ? data.parentId : original.parentId\n });\n\n if (pathResult.isFail()) {\n return Result.fail(pathResult.error);\n }\n\n const result = await this.updateEntry.execute<CmsEntryFolder>(\n this.folderModel,\n entryId.toString(),\n {\n values: {\n ...data,\n path: pathResult.value\n }\n }\n );\n\n if (result.isFail()) {\n return Result.fail(new FolderPersistenceError(result.error));\n }\n\n const updatedFolder = EntryToFolderMapper.toFolder(result.value);\n return Result.ok(updatedFolder);\n }\n\n private async checkExistingFolder(params: {\n id: string;\n type: string;\n slug: string;\n parentId?: string | null;\n }): Promise<Result<void, RepositoryAbstraction.Error>> {\n const { id, type, slug, parentId } = params;\n\n const result = await this.listLatestEntries.execute<CmsEntryFolder>(this.folderModel, {\n where: {\n latest: true,\n entryId_not: id,\n values: {\n type,\n slug,\n parentId\n }\n },\n limit: 1\n });\n\n if (result.isFail()) {\n return Result.fail(new FolderPersistenceError(result.error));\n }\n\n const { entries } = result.value;\n\n if (entries.length > 0) {\n return Result.fail(\n new FolderValidationError(\n `Folder with slug \"${slug}\" already exists at this level.`\n )\n );\n }\n\n return Result.ok();\n }\n\n private async createFolderPath(params: {\n slug: string;\n parentId?: string | null;\n }): Promise<Result<string, RepositoryAbstraction.Error>> {\n const { slug, parentId } = params;\n\n if (!parentId) {\n return Result.ok(Path.create(slug));\n }\n\n const parentResult = await this.getEntryById.execute<CmsEntryFolder>(\n this.folderModel,\n EntryId.from(parentId).toString()\n );\n\n if (parentResult.isFail()) {\n return Result.fail(\n new FolderPersistenceError(\n new Error(\"Parent folder not found. Unable to create the folder path\")\n )\n );\n }\n\n const parentFolder = EntryToFolderMapper.toFolder(parentResult.value);\n return Result.ok(Path.create(slug, parentFolder.path));\n }\n}\n\nexport const UpdateFolderRepository = RepositoryAbstraction.createImplementation({\n implementation: UpdateFolderRepositoryImpl,\n dependencies: [UpdateEntryUseCase, GetEntryByIdUseCase, ListLatestEntriesUseCase, FolderModel]\n});\n"],"names":["UpdateFolderRepositoryImpl","updateEntry","getEntryById","listLatestEntries","folderModel","id","data","entryId","EntryId","originalResult","Result","FolderPersistenceError","original","EntryToFolderMapper","checkResult","undefined","pathResult","result","updatedFolder","params","type","slug","parentId","entries","FolderValidationError","Path","parentResult","Error","parentFolder","UpdateFolderRepository","RepositoryAbstraction","UpdateEntryUseCase","GetEntryByIdUseCase","ListLatestEntriesUseCase","FolderModel"],"mappings":"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"}
1
+ {"version":3,"file":"features/folder/UpdateFolder/UpdateFolderRepository.js","sources":["../../../../src/features/folder/UpdateFolder/UpdateFolderRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n type IUpdateFolderRepository,\n UpdateFolderRepository as RepositoryAbstraction\n} from \"./abstractions.js\";\nimport { UpdateEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/UpdateEntry\";\nimport { GetEntryByIdUseCase } from \"@webiny/api-headless-cms/features/contentEntry/GetEntryById\";\nimport { ListLatestEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries\";\nimport { FolderModel } from \"~/domain/folder/abstractions.js\";\nimport type { CmsEntryFolder, Folder, UpdateFolderParams } from \"~/folder/folder.types.js\";\nimport { EntryToFolderMapper } from \"../shared/EntryToFolderMapper.js\";\nimport { FolderPersistenceError, FolderValidationError } from \"~/domain/folder/errors.js\";\nimport { Path } from \"~/utils/Path.js\";\nimport { EntryId } from \"@webiny/api-headless-cms/exports/api/cms/entry.js\";\n\nclass UpdateFolderRepositoryImpl implements IUpdateFolderRepository {\n constructor(\n private updateEntry: UpdateEntryUseCase.Interface,\n private getEntryById: GetEntryByIdUseCase.Interface,\n private listLatestEntries: ListLatestEntriesUseCase.Interface,\n private folderModel: FolderModel.Interface\n ) {}\n\n async execute(\n id: string,\n data: UpdateFolderParams\n ): Promise<Result<Folder, RepositoryAbstraction.Error>> {\n const entryId = EntryId.from(id);\n\n // Get the original folder\n const originalResult = await this.getEntryById.execute<CmsEntryFolder>(\n this.folderModel,\n entryId.toString()\n );\n\n if (originalResult.isFail()) {\n return Result.fail(new FolderPersistenceError(originalResult.error));\n }\n\n const original = EntryToFolderMapper.toFolder(originalResult.value);\n\n // Security: `type` and `path` are never taken from the input. The GraphQL input accepts\n // them, but changing them would move the folder into another app or corrupt the tree.\n const input: UpdateFolderParams & Partial<Pick<Folder, \"type\" | \"path\">> = { ...data };\n delete input.type;\n delete input.path;\n\n if (input.parentId && input.parentId !== original.parentId) {\n const parentResult = await this.validateNewParent(original, input.parentId);\n if (parentResult.isFail()) {\n return Result.fail(parentResult.error);\n }\n }\n\n // Check if folder with new slug already exists\n const checkResult = await this.checkExistingFolder({\n id,\n type: original.type,\n slug: input.slug || original.slug,\n parentId: input.parentId !== undefined ? input.parentId : original.parentId\n });\n\n if (checkResult.isFail()) {\n return Result.fail(checkResult.error);\n }\n\n // Create new path if slug or parentId changed\n const pathResult = await this.createFolderPath({\n slug: input.slug || original.slug,\n parentId: input.parentId !== undefined ? input.parentId : original.parentId\n });\n\n if (pathResult.isFail()) {\n return Result.fail(pathResult.error);\n }\n\n const result = await this.updateEntry.execute<CmsEntryFolder>(\n this.folderModel,\n entryId.toString(),\n {\n values: {\n ...input,\n path: pathResult.value\n }\n }\n );\n\n if (result.isFail()) {\n return Result.fail(new FolderPersistenceError(result.error));\n }\n\n const updatedFolder = EntryToFolderMapper.toFolder(result.value);\n return Result.ok(updatedFolder);\n }\n\n /**\n * Security: the new parent must be a folder of the same type, and must not be the folder\n * itself or one of its descendants (that would create a cycle in the tree).\n */\n private async validateNewParent(\n folder: Folder,\n parentId: string\n ): Promise<Result<void, RepositoryAbstraction.Error>> {\n if (parentId === folder.id) {\n return Result.fail(new FolderValidationError(\"A folder cannot be its own parent.\"));\n }\n\n const parentResult = await this.getEntryById.execute<CmsEntryFolder>(\n this.folderModel,\n EntryId.from(parentId).toString()\n );\n if (parentResult.isFail()) {\n return Result.fail(new FolderValidationError(\"Parent folder not found.\"));\n }\n\n const parent = EntryToFolderMapper.toFolder(parentResult.value);\n if (parent.type !== folder.type) {\n return Result.fail(\n new FolderValidationError(\"Parent folder must be of the same type as the folder.\")\n );\n }\n\n // Walk up from the new parent: reaching the folder itself means a cycle.\n const visited = new Set<string>([parent.id]);\n let ancestorId = parent.parentId;\n while (ancestorId && !visited.has(ancestorId)) {\n if (ancestorId === folder.id) {\n return Result.fail(\n new FolderValidationError(\n \"A folder cannot be moved into one of its own subfolders.\"\n )\n );\n }\n visited.add(ancestorId);\n\n const ancestorResult = await this.getEntryById.execute<CmsEntryFolder>(\n this.folderModel,\n EntryId.from(ancestorId).toString()\n );\n if (ancestorResult.isFail()) {\n break;\n }\n ancestorId = ancestorResult.value.values.parentId ?? null;\n }\n\n return Result.ok();\n }\n\n private async checkExistingFolder(params: {\n id: string;\n type: string;\n slug: string;\n parentId?: string | null;\n }): Promise<Result<void, RepositoryAbstraction.Error>> {\n const { id, type, slug, parentId } = params;\n\n const result = await this.listLatestEntries.execute<CmsEntryFolder>(this.folderModel, {\n where: {\n latest: true,\n entryId_not: id,\n values: {\n type,\n slug,\n parentId\n }\n },\n limit: 1\n });\n\n if (result.isFail()) {\n return Result.fail(new FolderPersistenceError(result.error));\n }\n\n const { entries } = result.value;\n\n if (entries.length > 0) {\n return Result.fail(\n new FolderValidationError(\n `Folder with slug \"${slug}\" already exists at this level.`\n )\n );\n }\n\n return Result.ok();\n }\n\n private async createFolderPath(params: {\n slug: string;\n parentId?: string | null;\n }): Promise<Result<string, RepositoryAbstraction.Error>> {\n const { slug, parentId } = params;\n\n if (!parentId) {\n return Result.ok(Path.create(slug));\n }\n\n const parentResult = await this.getEntryById.execute<CmsEntryFolder>(\n this.folderModel,\n EntryId.from(parentId).toString()\n );\n\n if (parentResult.isFail()) {\n return Result.fail(\n new FolderPersistenceError(\n new Error(\"Parent folder not found. Unable to create the folder path\")\n )\n );\n }\n\n const parentFolder = EntryToFolderMapper.toFolder(parentResult.value);\n return Result.ok(Path.create(slug, parentFolder.path));\n }\n}\n\nexport const UpdateFolderRepository = RepositoryAbstraction.createImplementation({\n implementation: UpdateFolderRepositoryImpl,\n dependencies: [UpdateEntryUseCase, GetEntryByIdUseCase, ListLatestEntriesUseCase, FolderModel]\n});\n"],"names":["UpdateFolderRepositoryImpl","updateEntry","getEntryById","listLatestEntries","folderModel","id","data","entryId","EntryId","originalResult","Result","FolderPersistenceError","original","EntryToFolderMapper","input","parentResult","checkResult","undefined","pathResult","result","updatedFolder","folder","parentId","FolderValidationError","parent","visited","Set","ancestorId","ancestorResult","params","type","slug","entries","Path","Error","parentFolder","UpdateFolderRepository","RepositoryAbstraction","UpdateEntryUseCase","GetEntryByIdUseCase","ListLatestEntriesUseCase","FolderModel"],"mappings":"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"}
@@ -7,7 +7,7 @@ declare class UpdateFolderWithFolderLevelPermissionsImpl implements UpdateFolder
7
7
  private folderLevelPermissions;
8
8
  private readonly decoretee;
9
9
  constructor(getFolder: GetFolderUseCase.Interface, folderLevelPermissions: FolderLevelPermissions.Interface, decoretee: UpdateFolderUseCase.Interface);
10
- execute(id: string, params: UpdateFolderParams): UpdateFolderUseCase.Return;
10
+ execute(id: string, input: UpdateFolderParams): UpdateFolderUseCase.Return;
11
11
  }
12
12
  export declare const UpdateFolderWithFolderLevelPermissions: typeof UpdateFolderWithFolderLevelPermissionsImpl;
13
13
  export {};
@@ -3,13 +3,22 @@ import { FolderLevelPermissions } from "../../../flp/FolderLevelPermissions/inde
3
3
  import { UpdateFolderUseCase } from "../abstractions.js";
4
4
  import { GetFolderUseCase } from "../../GetFolder/index.js";
5
5
  import { FolderCannotMoveToNewParent, FolderValidationError } from "../../../../domain/folder/errors.js";
6
+ import { validatePermissionsInput } from "../../shared/validatePermissionsInput.js";
7
+ const permissionsChanged = (original, updated)=>{
8
+ const normalize = (permissions)=>permissions.map((permission)=>`${permission.target}=${permission.level}`).sort().join(",");
9
+ return normalize(original.filter((permission)=>!permission.inheritedFrom)) !== normalize(updated);
10
+ };
6
11
  class UpdateFolderWithFolderLevelPermissionsImpl {
7
12
  constructor(getFolder, folderLevelPermissions, decoretee){
8
13
  this.getFolder = getFolder;
9
14
  this.folderLevelPermissions = folderLevelPermissions;
10
15
  this.decoretee = decoretee;
11
16
  }
12
- async execute(id, params) {
17
+ async execute(id, input) {
18
+ const params = null === input.permissions ? {
19
+ ...input,
20
+ permissions: []
21
+ } : input;
13
22
  const originalResult = await this.getFolder.execute(id);
14
23
  if (originalResult.isFail()) return Result.fail(originalResult.error);
15
24
  const original = originalResult.value;
@@ -18,16 +27,23 @@ class UpdateFolderWithFolderLevelPermissionsImpl {
18
27
  permissions: originalPermissions,
19
28
  rwd: "w"
20
29
  });
30
+ if (Array.isArray(params.permissions) && permissionsChanged(originalPermissions, params.permissions) && !await this.folderLevelPermissions.canManageFolderPermissions({
31
+ id: original.id,
32
+ parentId: original.parentId ?? "",
33
+ slug: original.slug,
34
+ path: original.path,
35
+ type: original.type,
36
+ permissions: originalPermissions
37
+ })) return Result.fail(new FolderValidationError("Not allowed to change the folder permissions."));
21
38
  const permissions = await this.folderLevelPermissions.getDefaultPermissions(params.permissions ?? []);
22
39
  const stillHasAccess = await this.folderLevelPermissions.canAccessFolder({
23
40
  permissions,
24
41
  rwd: "w"
25
42
  });
26
43
  if (!stillHasAccess) return Result.fail(new FolderValidationError("Cannot continue because you would loose access to this folder."));
27
- if (Array.isArray(params.permissions)) for (const permission of params.permissions){
28
- const targetIsValid = permission.target.startsWith("admin:") || permission.target.startsWith("team:");
29
- if (!targetIsValid) return Result.fail(new FolderValidationError(`Permission target "${permission.target}" is not valid.`));
30
- if (permission.inheritedFrom) return Result.fail(new FolderValidationError('Permission "inheritedFrom" cannot be set manually.'));
44
+ if (Array.isArray(params.permissions)) {
45
+ const validationError = validatePermissionsInput(params.permissions);
46
+ if (validationError) return Result.fail(validationError);
31
47
  }
32
48
  if (params.parentId && params.parentId !== original.parentId) {
33
49
  const parentPermissions = await this.folderLevelPermissions.getFolderLevelPermissions(params.parentId);
@@ -1 +1 @@
1
- {"version":3,"file":"features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.js","sources":["../../../../../src/features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.ts"],"sourcesContent":["import { createDecorator, Result } from \"@webiny/feature/api\";\nimport type { UpdateFolderParams } from \"~/folder/folder.types.js\";\nimport { FolderLevelPermissions } from \"~/features/flp/FolderLevelPermissions/index.js\";\nimport { UpdateFolderUseCase } from \"../abstractions.js\";\nimport { GetFolderUseCase } from \"~/features/folder/GetFolder/index.js\";\nimport { FolderCannotMoveToNewParent, FolderValidationError } from \"~/domain/folder/errors.js\";\n\nclass UpdateFolderWithFolderLevelPermissionsImpl implements UpdateFolderUseCase.Interface {\n private folderLevelPermissions: FolderLevelPermissions.Interface;\n private readonly decoretee: UpdateFolderUseCase.Interface;\n\n constructor(\n private getFolder: GetFolderUseCase.Interface,\n folderLevelPermissions: FolderLevelPermissions.Interface,\n decoretee: UpdateFolderUseCase.Interface\n ) {\n this.folderLevelPermissions = folderLevelPermissions;\n this.decoretee = decoretee;\n }\n\n async execute(id: string, params: UpdateFolderParams): UpdateFolderUseCase.Return {\n const originalResult = await this.getFolder.execute(id);\n\n if (originalResult.isFail()) {\n return Result.fail(originalResult.error);\n }\n\n const original = originalResult.value;\n\n const originalPermissions = await this.folderLevelPermissions.getFolderLevelPermissions(id);\n\n // Let's ensure current identity's permission allows the update operation.\n await this.folderLevelPermissions.ensureCanAccessFolder({\n permissions: originalPermissions,\n rwd: \"w\"\n });\n\n const permissions = await this.folderLevelPermissions.getDefaultPermissions(\n params.permissions ?? []\n );\n\n // Check if the user still has access to the folder with the provided permissions.\n const stillHasAccess = await this.folderLevelPermissions.canAccessFolder({\n permissions,\n rwd: \"w\"\n });\n\n if (!stillHasAccess) {\n return Result.fail(\n new FolderValidationError(\n `Cannot continue because you would loose access to this folder.`\n )\n );\n }\n\n // Validate data.\n if (Array.isArray(params.permissions)) {\n for (const permission of params.permissions) {\n const targetIsValid =\n permission.target.startsWith(\"admin:\") || permission.target.startsWith(\"team:\");\n if (!targetIsValid) {\n return Result.fail(\n new FolderValidationError(\n `Permission target \"${permission.target}\" is not valid.`\n )\n );\n }\n\n if (permission.inheritedFrom) {\n return Result.fail(\n new FolderValidationError(\n `Permission \"inheritedFrom\" cannot be set manually.`\n )\n );\n }\n }\n }\n\n // Parent change is not allowed if the user doesn't have access to the new parent.\n if (params.parentId && params.parentId !== original.parentId) {\n // Getting the parent folder permissions will throw an error if the user doesn't have access.\n const parentPermissions = await this.folderLevelPermissions.getFolderLevelPermissions(\n params.parentId\n );\n\n const canAccessFolder = await this.folderLevelPermissions.canAccessFolder({\n permissions: parentPermissions,\n rwd: \"w\"\n });\n\n if (!canAccessFolder) {\n return Result.fail(new FolderCannotMoveToNewParent());\n }\n }\n\n const result = await this.decoretee.execute(id, params);\n\n if (result.isFail()) {\n return Result.fail(result.error);\n }\n\n return Result.ok({\n ...result.value,\n permissions\n });\n }\n}\n\nexport const UpdateFolderWithFolderLevelPermissions = createDecorator({\n abstraction: UpdateFolderUseCase,\n decorator: UpdateFolderWithFolderLevelPermissionsImpl,\n dependencies: [GetFolderUseCase, FolderLevelPermissions]\n});\n"],"names":["UpdateFolderWithFolderLevelPermissionsImpl","getFolder","folderLevelPermissions","decoretee","id","params","originalResult","Result","original","originalPermissions","permissions","stillHasAccess","FolderValidationError","Array","permission","targetIsValid","parentPermissions","canAccessFolder","FolderCannotMoveToNewParent","result","UpdateFolderWithFolderLevelPermissions","createDecorator","UpdateFolderUseCase","GetFolderUseCase","FolderLevelPermissions"],"mappings":";;;;;AAOA,MAAMA;IAIF,YACYC,SAAqC,EAC7CC,sBAAwD,EACxDC,SAAwC,CAC1C;aAHUF,SAAS,GAATA;QAIR,IAAI,CAAC,sBAAsB,GAAGC;QAC9B,IAAI,CAAC,SAAS,GAAGC;IACrB;IAEA,MAAM,QAAQC,EAAU,EAAEC,MAA0B,EAA8B;QAC9E,MAAMC,iBAAiB,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACF;QAEpD,IAAIE,eAAe,MAAM,IACrB,OAAOC,OAAO,IAAI,CAACD,eAAe,KAAK;QAG3C,MAAME,WAAWF,eAAe,KAAK;QAErC,MAAMG,sBAAsB,MAAM,IAAI,CAAC,sBAAsB,CAAC,yBAAyB,CAACL;QAGxF,MAAM,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,CAAC;YACpD,aAAaK;YACb,KAAK;QACT;QAEA,MAAMC,cAAc,MAAM,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,CACvEL,OAAO,WAAW,IAAI,EAAE;QAI5B,MAAMM,iBAAiB,MAAM,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC;YACrED;YACA,KAAK;QACT;QAEA,IAAI,CAACC,gBACD,OAAOJ,OAAO,IAAI,CACd,IAAIK,sBACA;QAMZ,IAAIC,MAAM,OAAO,CAACR,OAAO,WAAW,GAChC,KAAK,MAAMS,cAAcT,OAAO,WAAW,CAAE;YACzC,MAAMU,gBACFD,WAAW,MAAM,CAAC,UAAU,CAAC,aAAaA,WAAW,MAAM,CAAC,UAAU,CAAC;YAC3E,IAAI,CAACC,eACD,OAAOR,OAAO,IAAI,CACd,IAAIK,sBACA,CAAC,mBAAmB,EAAEE,WAAW,MAAM,CAAC,eAAe,CAAC;YAKpE,IAAIA,WAAW,aAAa,EACxB,OAAOP,OAAO,IAAI,CACd,IAAIK,sBACA;QAIhB;QAIJ,IAAIP,OAAO,QAAQ,IAAIA,OAAO,QAAQ,KAAKG,SAAS,QAAQ,EAAE;YAE1D,MAAMQ,oBAAoB,MAAM,IAAI,CAAC,sBAAsB,CAAC,yBAAyB,CACjFX,OAAO,QAAQ;YAGnB,MAAMY,kBAAkB,MAAM,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC;gBACtE,aAAaD;gBACb,KAAK;YACT;YAEA,IAAI,CAACC,iBACD,OAAOV,OAAO,IAAI,CAAC,IAAIW;QAE/B;QAEA,MAAMC,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACf,IAAIC;QAEhD,IAAIc,OAAO,MAAM,IACb,OAAOZ,OAAO,IAAI,CAACY,OAAO,KAAK;QAGnC,OAAOZ,OAAO,EAAE,CAAC;YACb,GAAGY,OAAO,KAAK;YACfT;QACJ;IACJ;AACJ;AAEO,MAAMU,yCAAyCC,gBAAgB;IAClE,aAAaC;IACb,WAAWtB;IACX,cAAc;QAACuB;QAAkBC;KAAuB;AAC5D"}
1
+ {"version":3,"file":"features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.js","sources":["../../../../../src/features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.ts"],"sourcesContent":["import { createDecorator, Result } from \"@webiny/feature/api\";\nimport type { UpdateFolderParams } from \"~/folder/folder.types.js\";\nimport type { FolderPermission } from \"~/types.js\";\nimport { FolderLevelPermissions } from \"~/features/flp/FolderLevelPermissions/index.js\";\nimport { UpdateFolderUseCase } from \"../abstractions.js\";\nimport { GetFolderUseCase } from \"~/features/folder/GetFolder/index.js\";\nimport { FolderCannotMoveToNewParent, FolderValidationError } from \"~/domain/folder/errors.js\";\nimport { validatePermissionsInput } from \"~/features/folder/shared/validatePermissionsInput.js\";\n\n/**\n * Compares the folder's own (non-inherited) permissions. The admin app sends the current\n * permissions with every update, e.g. a rename.\n */\nconst permissionsChanged = (\n original: FolderPermission[],\n updated: Pick<FolderPermission, \"target\" | \"level\">[]\n) => {\n const normalize = (permissions: Pick<FolderPermission, \"target\" | \"level\">[]) => {\n return permissions\n .map(permission => `${permission.target}=${permission.level}`)\n .sort()\n .join(\",\");\n };\n return (\n normalize(original.filter(permission => !permission.inheritedFrom)) !== normalize(updated)\n );\n};\n\nclass UpdateFolderWithFolderLevelPermissionsImpl implements UpdateFolderUseCase.Interface {\n private folderLevelPermissions: FolderLevelPermissions.Interface;\n private readonly decoretee: UpdateFolderUseCase.Interface;\n\n constructor(\n private getFolder: GetFolderUseCase.Interface,\n folderLevelPermissions: FolderLevelPermissions.Interface,\n decoretee: UpdateFolderUseCase.Interface\n ) {\n this.folderLevelPermissions = folderLevelPermissions;\n this.decoretee = decoretee;\n }\n\n async execute(id: string, input: UpdateFolderParams): UpdateFolderUseCase.Return {\n /* GraphQL accepts `permissions: null`. Treat it as \"no own permissions\" so it goes\n through the same owner check as an empty list, instead of skipping the check and\n wiping the folder's permissions. */\n const params: UpdateFolderParams =\n input.permissions === null ? { ...input, permissions: [] } : input;\n\n const originalResult = await this.getFolder.execute(id);\n\n if (originalResult.isFail()) {\n return Result.fail(originalResult.error);\n }\n\n const original = originalResult.value;\n\n const originalPermissions = await this.folderLevelPermissions.getFolderLevelPermissions(id);\n\n // Let's ensure current identity's permission allows the update operation.\n await this.folderLevelPermissions.ensureCanAccessFolder({\n permissions: originalPermissions,\n rwd: \"w\"\n });\n\n // Changing who has access to the folder requires the \"owner\" level.\n if (\n Array.isArray(params.permissions) &&\n permissionsChanged(originalPermissions, params.permissions) &&\n !(await this.folderLevelPermissions.canManageFolderPermissions({\n id: original.id,\n parentId: original.parentId ?? \"\",\n slug: original.slug,\n path: original.path,\n type: original.type,\n permissions: originalPermissions\n }))\n ) {\n return Result.fail(\n new FolderValidationError(`Not allowed to change the folder permissions.`)\n );\n }\n\n const permissions = await this.folderLevelPermissions.getDefaultPermissions(\n params.permissions ?? []\n );\n\n // Check if the user still has access to the folder with the provided permissions.\n const stillHasAccess = await this.folderLevelPermissions.canAccessFolder({\n permissions,\n rwd: \"w\"\n });\n\n if (!stillHasAccess) {\n return Result.fail(\n new FolderValidationError(\n `Cannot continue because you would loose access to this folder.`\n )\n );\n }\n\n // Validate data.\n if (Array.isArray(params.permissions)) {\n const validationError = validatePermissionsInput(params.permissions);\n if (validationError) {\n return Result.fail(validationError);\n }\n }\n\n // Parent change is not allowed if the user doesn't have access to the new parent.\n if (params.parentId && params.parentId !== original.parentId) {\n // Getting the parent folder permissions will throw an error if the user doesn't have access.\n const parentPermissions = await this.folderLevelPermissions.getFolderLevelPermissions(\n params.parentId\n );\n\n const canAccessFolder = await this.folderLevelPermissions.canAccessFolder({\n permissions: parentPermissions,\n rwd: \"w\"\n });\n\n if (!canAccessFolder) {\n return Result.fail(new FolderCannotMoveToNewParent());\n }\n }\n\n const result = await this.decoretee.execute(id, params);\n\n if (result.isFail()) {\n return Result.fail(result.error);\n }\n\n return Result.ok({\n ...result.value,\n permissions\n });\n }\n}\n\nexport const UpdateFolderWithFolderLevelPermissions = createDecorator({\n abstraction: UpdateFolderUseCase,\n decorator: UpdateFolderWithFolderLevelPermissionsImpl,\n dependencies: [GetFolderUseCase, FolderLevelPermissions]\n});\n"],"names":["permissionsChanged","original","updated","normalize","permissions","permission","UpdateFolderWithFolderLevelPermissionsImpl","getFolder","folderLevelPermissions","decoretee","id","input","params","originalResult","Result","originalPermissions","Array","FolderValidationError","stillHasAccess","validationError","validatePermissionsInput","parentPermissions","canAccessFolder","FolderCannotMoveToNewParent","result","UpdateFolderWithFolderLevelPermissions","createDecorator","UpdateFolderUseCase","GetFolderUseCase","FolderLevelPermissions"],"mappings":";;;;;;AAaA,MAAMA,qBAAqB,CACvBC,UACAC;IAEA,MAAMC,YAAY,CAACC,cACRA,YACF,GAAG,CAACC,CAAAA,aAAc,GAAGA,WAAW,MAAM,CAAC,CAAC,EAAEA,WAAW,KAAK,EAAE,EAC5D,IAAI,GACJ,IAAI,CAAC;IAEd,OACIF,UAAUF,SAAS,MAAM,CAACI,CAAAA,aAAc,CAACA,WAAW,aAAa,OAAOF,UAAUD;AAE1F;AAEA,MAAMI;IAIF,YACYC,SAAqC,EAC7CC,sBAAwD,EACxDC,SAAwC,CAC1C;aAHUF,SAAS,GAATA;QAIR,IAAI,CAAC,sBAAsB,GAAGC;QAC9B,IAAI,CAAC,SAAS,GAAGC;IACrB;IAEA,MAAM,QAAQC,EAAU,EAAEC,KAAyB,EAA8B;QAI7E,MAAMC,SACFD,AAAsB,SAAtBA,MAAM,WAAW,GAAY;YAAE,GAAGA,KAAK;YAAE,aAAa,EAAE;QAAC,IAAIA;QAEjE,MAAME,iBAAiB,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACH;QAEpD,IAAIG,eAAe,MAAM,IACrB,OAAOC,OAAO,IAAI,CAACD,eAAe,KAAK;QAG3C,MAAMZ,WAAWY,eAAe,KAAK;QAErC,MAAME,sBAAsB,MAAM,IAAI,CAAC,sBAAsB,CAAC,yBAAyB,CAACL;QAGxF,MAAM,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,CAAC;YACpD,aAAaK;YACb,KAAK;QACT;QAGA,IACIC,MAAM,OAAO,CAACJ,OAAO,WAAW,KAChCZ,mBAAmBe,qBAAqBH,OAAO,WAAW,KAC1D,CAAE,MAAM,IAAI,CAAC,sBAAsB,CAAC,0BAA0B,CAAC;YAC3D,IAAIX,SAAS,EAAE;YACf,UAAUA,SAAS,QAAQ,IAAI;YAC/B,MAAMA,SAAS,IAAI;YACnB,MAAMA,SAAS,IAAI;YACnB,MAAMA,SAAS,IAAI;YACnB,aAAac;QACjB,IAEA,OAAOD,OAAO,IAAI,CACd,IAAIG,sBAAsB;QAIlC,MAAMb,cAAc,MAAM,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,CACvEQ,OAAO,WAAW,IAAI,EAAE;QAI5B,MAAMM,iBAAiB,MAAM,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC;YACrEd;YACA,KAAK;QACT;QAEA,IAAI,CAACc,gBACD,OAAOJ,OAAO,IAAI,CACd,IAAIG,sBACA;QAMZ,IAAID,MAAM,OAAO,CAACJ,OAAO,WAAW,GAAG;YACnC,MAAMO,kBAAkBC,yBAAyBR,OAAO,WAAW;YACnE,IAAIO,iBACA,OAAOL,OAAO,IAAI,CAACK;QAE3B;QAGA,IAAIP,OAAO,QAAQ,IAAIA,OAAO,QAAQ,KAAKX,SAAS,QAAQ,EAAE;YAE1D,MAAMoB,oBAAoB,MAAM,IAAI,CAAC,sBAAsB,CAAC,yBAAyB,CACjFT,OAAO,QAAQ;YAGnB,MAAMU,kBAAkB,MAAM,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC;gBACtE,aAAaD;gBACb,KAAK;YACT;YAEA,IAAI,CAACC,iBACD,OAAOR,OAAO,IAAI,CAAC,IAAIS;QAE/B;QAEA,MAAMC,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACd,IAAIE;QAEhD,IAAIY,OAAO,MAAM,IACb,OAAOV,OAAO,IAAI,CAACU,OAAO,KAAK;QAGnC,OAAOV,OAAO,EAAE,CAAC;YACb,GAAGU,OAAO,KAAK;YACfpB;QACJ;IACJ;AACJ;AAEO,MAAMqB,yCAAyCC,gBAAgB;IAClE,aAAaC;IACb,WAAWrB;IACX,cAAc;QAACsB;QAAkBC;KAAuB;AAC5D"}
@@ -0,0 +1,7 @@
1
+ import type { FolderPermission } from "../../../flp/flp.types.js";
2
+ import { FolderValidationError } from "../../../domain/folder/errors.js";
3
+ /**
4
+ * Validates folder permissions sent by the client (create and update).
5
+ * Only user and team targets are allowed, and inherited permissions cannot be set manually.
6
+ */
7
+ export declare const validatePermissionsInput: (permissions: Pick<FolderPermission, "target" | "inheritedFrom">[]) => FolderValidationError | null;
@@ -0,0 +1,12 @@
1
+ import { FolderValidationError } from "../../../domain/folder/errors.js";
2
+ const validatePermissionsInput = (permissions)=>{
3
+ for (const permission of permissions){
4
+ const targetIsValid = "string" == typeof permission.target && (permission.target.startsWith("admin:") || permission.target.startsWith("team:"));
5
+ if (!targetIsValid) return new FolderValidationError(`Permission target "${permission.target}" is not valid.`);
6
+ if (permission.inheritedFrom) return new FolderValidationError('Permission "inheritedFrom" cannot be set manually.');
7
+ }
8
+ return null;
9
+ };
10
+ export { validatePermissionsInput };
11
+
12
+ //# sourceMappingURL=validatePermissionsInput.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"features/folder/shared/validatePermissionsInput.js","sources":["../../../../src/features/folder/shared/validatePermissionsInput.ts"],"sourcesContent":["import type { FolderPermission } from \"~/flp/flp.types.js\";\nimport { FolderValidationError } from \"~/domain/folder/errors.js\";\n\n/**\n * Validates folder permissions sent by the client (create and update).\n * Only user and team targets are allowed, and inherited permissions cannot be set manually.\n */\nexport const validatePermissionsInput = (\n permissions: Pick<FolderPermission, \"target\" | \"inheritedFrom\">[]\n): FolderValidationError | null => {\n for (const permission of permissions) {\n const targetIsValid =\n typeof permission.target === \"string\" &&\n (permission.target.startsWith(\"admin:\") || permission.target.startsWith(\"team:\"));\n if (!targetIsValid) {\n return new FolderValidationError(\n `Permission target \"${permission.target}\" is not valid.`\n );\n }\n\n if (permission.inheritedFrom) {\n return new FolderValidationError(`Permission \"inheritedFrom\" cannot be set manually.`);\n }\n }\n\n return null;\n};\n"],"names":["validatePermissionsInput","permissions","permission","targetIsValid","FolderValidationError"],"mappings":";AAOO,MAAMA,2BAA2B,CACpCC;IAEA,KAAK,MAAMC,cAAcD,YAAa;QAClC,MAAME,gBACF,AAA6B,YAA7B,OAAOD,WAAW,MAAM,IACvBA,CAAAA,WAAW,MAAM,CAAC,UAAU,CAAC,aAAaA,WAAW,MAAM,CAAC,UAAU,CAAC,QAAO;QACnF,IAAI,CAACC,eACD,OAAO,IAAIC,sBACP,CAAC,mBAAmB,EAAEF,WAAW,MAAM,CAAC,eAAe,CAAC;QAIhE,IAAIA,WAAW,aAAa,EACxB,OAAO,IAAIE,sBAAsB;IAEzC;IAEA,OAAO;AACX"}
@@ -14,13 +14,17 @@ const createFilterOperations = (params)=>{
14
14
  });
15
15
  const cmsWhereMapper = container.resolve(CmsWhereMapper);
16
16
  const cmsSortMapper = container.resolve(CmsSortMapper);
17
+ const getOwnFilterEntry = async (model, id)=>{
18
+ const entry = await cms.getEntryById(model, id);
19
+ if (!entry || entry.createdBy?.id !== security.getIdentity()?.id) throw new error("Could not load filter.", "GET_FILTER_ERROR", {
20
+ id
21
+ });
22
+ return entry;
23
+ };
17
24
  return {
18
25
  getFilter ({ id }) {
19
26
  return withModel(async (model)=>{
20
- const entry = await cms.getEntryById(model, id);
21
- if (!entry) throw new error("Could not load filter.", "GET_FILTER_ERROR", {
22
- id
23
- });
27
+ const entry = await getOwnFilterEntry(model, id);
24
28
  return pickEntryFieldValues(entry);
25
29
  });
26
30
  },
@@ -53,13 +57,15 @@ const createFilterOperations = (params)=>{
53
57
  const entry = await cms.createEntry(model, {
54
58
  id: data.id,
55
59
  values: data
60
+ }, {
61
+ failIfExists: true
56
62
  });
57
63
  return pickEntryFieldValues(entry);
58
64
  });
59
65
  },
60
66
  updateFilter ({ id, data }) {
61
67
  return withModel(async (model)=>{
62
- const original = await cms.getEntryById(model, id);
68
+ const original = await getOwnFilterEntry(model, id);
63
69
  const input = {
64
70
  ...omit(original, ENTRY_META_FIELDS),
65
71
  values: {
@@ -73,6 +79,7 @@ const createFilterOperations = (params)=>{
73
79
  },
74
80
  deleteFilter ({ id }) {
75
81
  return withModel(async (model)=>{
82
+ await getOwnFilterEntry(model, id);
76
83
  await cms.deleteEntry(model, id);
77
84
  return true;
78
85
  });
@@ -1 +1 @@
1
- {"version":3,"file":"filter/filter.so.js","sources":["../../src/filter/filter.so.ts"],"sourcesContent":["import omit from \"lodash/omit.js\";\nimport WebinyError from \"@webiny/error\";\nimport { FILTER_MODEL_ID } from \"./filter.model.js\";\nimport type { HeadlessCms } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { Security } from \"@webiny/api-core/types/security.js\";\nimport type { Container } from \"@webiny/di\";\n\ninterface CreateFilterOperationsParams {\n cms: HeadlessCms;\n security: Security;\n container: Container;\n}\nimport { createListSort } from \"~/utils/createListSort.js\";\nimport { createOperationsWrapper } from \"~/utils/createOperationsWrapper.js\";\nimport { pickEntryFieldValues } from \"~/utils/pickEntryFieldValues.js\";\nimport type { AcoFilterStorageOperations, Filter } from \"./filter.types.js\";\nimport { ENTRY_META_FIELDS } from \"@webiny/api-headless-cms/constants.js\";\nimport { CmsSortMapper, CmsWhereMapper } from \"@webiny/api-headless-cms\";\n\nexport const createFilterOperations = (\n params: CreateFilterOperationsParams\n): AcoFilterStorageOperations => {\n const { cms, security, container } = params;\n\n const { withModel } = createOperationsWrapper({\n ...params,\n modelName: FILTER_MODEL_ID\n });\n\n const cmsWhereMapper = container.resolve(CmsWhereMapper);\n const cmsSortMapper = container.resolve(CmsSortMapper);\n\n return {\n getFilter({ id }) {\n return withModel(async model => {\n const entry = await cms.getEntryById(model, id);\n\n if (!entry) {\n throw new WebinyError(\"Could not load filter.\", \"GET_FILTER_ERROR\", {\n id\n });\n }\n\n return pickEntryFieldValues(entry);\n });\n },\n listFilters(params) {\n return withModel(async model => {\n const { sort, where } = params;\n const createdBy = security.getIdentity().id;\n\n const [entries, meta] = await cms.listLatestEntries(model, {\n ...params,\n sort: cmsSortMapper.map({\n input: createListSort(sort),\n fields: model.fields\n }),\n where: cmsWhereMapper.map({\n input: {\n ...where,\n createdBy\n },\n fields: model.fields\n })\n });\n\n return [entries.map(pickEntryFieldValues<Filter>), meta];\n });\n },\n createFilter({ data }) {\n return withModel(async model => {\n const entry = await cms.createEntry(model, {\n id: data.id,\n values: data\n });\n return pickEntryFieldValues(entry);\n });\n },\n updateFilter({ id, data }) {\n return withModel(async model => {\n const original = await cms.getEntryById(model, id);\n\n const input = {\n /**\n * We are omitting the standard entry meta fields:\n * we don't want to override them with the ones coming from the `original` entry.\n */\n ...omit(original, ENTRY_META_FIELDS),\n values: {\n ...original.values,\n ...data\n }\n };\n\n const entry = await cms.updateEntry(model, original.id, input);\n return pickEntryFieldValues(entry);\n });\n },\n deleteFilter({ id }) {\n return withModel(async model => {\n await cms.deleteEntry(model, id);\n return true;\n });\n }\n };\n};\n"],"names":["createFilterOperations","params","cms","security","container","withModel","createOperationsWrapper","FILTER_MODEL_ID","cmsWhereMapper","CmsWhereMapper","cmsSortMapper","CmsSortMapper","id","model","entry","WebinyError","pickEntryFieldValues","sort","where","createdBy","entries","meta","createListSort","data","original","input","omit","ENTRY_META_FIELDS"],"mappings":";;;;;;;;AAmBO,MAAMA,yBAAyB,CAClCC;IAEA,MAAM,EAAEC,GAAG,EAAEC,QAAQ,EAAEC,SAAS,EAAE,GAAGH;IAErC,MAAM,EAAEI,SAAS,EAAE,GAAGC,wBAAwB;QAC1C,GAAGL,MAAM;QACT,WAAWM;IACf;IAEA,MAAMC,iBAAiBJ,UAAU,OAAO,CAACK;IACzC,MAAMC,gBAAgBN,UAAU,OAAO,CAACO;IAExC,OAAO;QACH,WAAU,EAAEC,EAAE,EAAE;YACZ,OAAOP,UAAU,OAAMQ;gBACnB,MAAMC,QAAQ,MAAMZ,IAAI,YAAY,CAACW,OAAOD;gBAE5C,IAAI,CAACE,OACD,MAAM,IAAIC,MAAY,0BAA0B,oBAAoB;oBAChEH;gBACJ;gBAGJ,OAAOI,qBAAqBF;YAChC;QACJ;QACA,aAAYb,MAAM;YACd,OAAOI,UAAU,OAAMQ;gBACnB,MAAM,EAAEI,IAAI,EAAEC,KAAK,EAAE,GAAGjB;gBACxB,MAAMkB,YAAYhB,SAAS,WAAW,GAAG,EAAE;gBAE3C,MAAM,CAACiB,SAASC,KAAK,GAAG,MAAMnB,IAAI,iBAAiB,CAACW,OAAO;oBACvD,GAAGZ,MAAM;oBACT,MAAMS,cAAc,GAAG,CAAC;wBACpB,OAAOY,eAAeL;wBACtB,QAAQJ,MAAM,MAAM;oBACxB;oBACA,OAAOL,eAAe,GAAG,CAAC;wBACtB,OAAO;4BACH,GAAGU,KAAK;4BACRC;wBACJ;wBACA,QAAQN,MAAM,MAAM;oBACxB;gBACJ;gBAEA,OAAO;oBAACO,QAAQ,GAAG,CAACJ;oBAA+BK;iBAAK;YAC5D;QACJ;QACA,cAAa,EAAEE,IAAI,EAAE;YACjB,OAAOlB,UAAU,OAAMQ;gBACnB,MAAMC,QAAQ,MAAMZ,IAAI,WAAW,CAACW,OAAO;oBACvC,IAAIU,KAAK,EAAE;oBACX,QAAQA;gBACZ;gBACA,OAAOP,qBAAqBF;YAChC;QACJ;QACA,cAAa,EAAEF,EAAE,EAAEW,IAAI,EAAE;YACrB,OAAOlB,UAAU,OAAMQ;gBACnB,MAAMW,WAAW,MAAMtB,IAAI,YAAY,CAACW,OAAOD;gBAE/C,MAAMa,QAAQ;oBAKV,GAAGC,KAAKF,UAAUG,kBAAkB;oBACpC,QAAQ;wBACJ,GAAGH,SAAS,MAAM;wBAClB,GAAGD,IAAI;oBACX;gBACJ;gBAEA,MAAMT,QAAQ,MAAMZ,IAAI,WAAW,CAACW,OAAOW,SAAS,EAAE,EAAEC;gBACxD,OAAOT,qBAAqBF;YAChC;QACJ;QACA,cAAa,EAAEF,EAAE,EAAE;YACf,OAAOP,UAAU,OAAMQ;gBACnB,MAAMX,IAAI,WAAW,CAACW,OAAOD;gBAC7B,OAAO;YACX;QACJ;IACJ;AACJ"}
1
+ {"version":3,"file":"filter/filter.so.js","sources":["../../src/filter/filter.so.ts"],"sourcesContent":["import omit from \"lodash/omit.js\";\nimport WebinyError from \"@webiny/error\";\nimport { FILTER_MODEL_ID } from \"./filter.model.js\";\nimport type { HeadlessCms } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { Security } from \"@webiny/api-core/types/security.js\";\nimport type { Container } from \"@webiny/di\";\n\ninterface CreateFilterOperationsParams {\n cms: HeadlessCms;\n security: Security;\n container: Container;\n}\nimport { createListSort } from \"~/utils/createListSort.js\";\nimport { createOperationsWrapper } from \"~/utils/createOperationsWrapper.js\";\nimport { pickEntryFieldValues } from \"~/utils/pickEntryFieldValues.js\";\nimport type { AcoFilterStorageOperations, Filter } from \"./filter.types.js\";\nimport { ENTRY_META_FIELDS } from \"@webiny/api-headless-cms/constants.js\";\nimport { CmsSortMapper, CmsWhereMapper } from \"@webiny/api-headless-cms\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\n\nexport const createFilterOperations = (\n params: CreateFilterOperationsParams\n): AcoFilterStorageOperations => {\n const { cms, security, container } = params;\n\n const { withModel } = createOperationsWrapper({\n ...params,\n modelName: FILTER_MODEL_ID\n });\n\n const cmsWhereMapper = container.resolve(CmsWhereMapper);\n const cmsSortMapper = container.resolve(CmsSortMapper);\n\n /**\n * Saved filters are personal. The filter model is private, so CMS authorization doesn't\n * apply: only the identity that created a filter may read, update or delete it.\n */\n const getOwnFilterEntry = async (model: CmsModel, id: string) => {\n const entry = await cms.getEntryById(model, id);\n if (!entry || entry.createdBy?.id !== security.getIdentity()?.id) {\n throw new WebinyError(\"Could not load filter.\", \"GET_FILTER_ERROR\", {\n id\n });\n }\n return entry;\n };\n\n return {\n getFilter({ id }) {\n return withModel(async model => {\n const entry = await getOwnFilterEntry(model, id);\n\n return pickEntryFieldValues(entry);\n });\n },\n listFilters(params) {\n return withModel(async model => {\n const { sort, where } = params;\n const createdBy = security.getIdentity().id;\n\n const [entries, meta] = await cms.listLatestEntries(model, {\n ...params,\n sort: cmsSortMapper.map({\n input: createListSort(sort),\n fields: model.fields\n }),\n where: cmsWhereMapper.map({\n input: {\n ...where,\n createdBy\n },\n fields: model.fields\n })\n });\n\n return [entries.map(pickEntryFieldValues<Filter>), meta];\n });\n },\n createFilter({ data }) {\n return withModel(async model => {\n // A client may choose the filter id; it must not replace someone else's filter.\n const entry = await cms.createEntry(\n model,\n {\n id: data.id,\n values: data\n },\n { failIfExists: true }\n );\n return pickEntryFieldValues(entry);\n });\n },\n updateFilter({ id, data }) {\n return withModel(async model => {\n const original = await getOwnFilterEntry(model, id);\n\n const input = {\n /**\n * We are omitting the standard entry meta fields:\n * we don't want to override them with the ones coming from the `original` entry.\n */\n ...omit(original, ENTRY_META_FIELDS),\n values: {\n ...original.values,\n ...data\n }\n };\n\n const entry = await cms.updateEntry(model, original.id, input);\n return pickEntryFieldValues(entry);\n });\n },\n deleteFilter({ id }) {\n return withModel(async model => {\n await getOwnFilterEntry(model, id);\n await cms.deleteEntry(model, id);\n return true;\n });\n }\n };\n};\n"],"names":["createFilterOperations","params","cms","security","container","withModel","createOperationsWrapper","FILTER_MODEL_ID","cmsWhereMapper","CmsWhereMapper","cmsSortMapper","CmsSortMapper","getOwnFilterEntry","model","id","entry","WebinyError","pickEntryFieldValues","sort","where","createdBy","entries","meta","createListSort","data","original","input","omit","ENTRY_META_FIELDS"],"mappings":";;;;;;;;AAoBO,MAAMA,yBAAyB,CAClCC;IAEA,MAAM,EAAEC,GAAG,EAAEC,QAAQ,EAAEC,SAAS,EAAE,GAAGH;IAErC,MAAM,EAAEI,SAAS,EAAE,GAAGC,wBAAwB;QAC1C,GAAGL,MAAM;QACT,WAAWM;IACf;IAEA,MAAMC,iBAAiBJ,UAAU,OAAO,CAACK;IACzC,MAAMC,gBAAgBN,UAAU,OAAO,CAACO;IAMxC,MAAMC,oBAAoB,OAAOC,OAAiBC;QAC9C,MAAMC,QAAQ,MAAMb,IAAI,YAAY,CAACW,OAAOC;QAC5C,IAAI,CAACC,SAASA,MAAM,SAAS,EAAE,OAAOZ,SAAS,WAAW,IAAI,IAC1D,MAAM,IAAIa,MAAY,0BAA0B,oBAAoB;YAChEF;QACJ;QAEJ,OAAOC;IACX;IAEA,OAAO;QACH,WAAU,EAAED,EAAE,EAAE;YACZ,OAAOT,UAAU,OAAMQ;gBACnB,MAAME,QAAQ,MAAMH,kBAAkBC,OAAOC;gBAE7C,OAAOG,qBAAqBF;YAChC;QACJ;QACA,aAAYd,MAAM;YACd,OAAOI,UAAU,OAAMQ;gBACnB,MAAM,EAAEK,IAAI,EAAEC,KAAK,EAAE,GAAGlB;gBACxB,MAAMmB,YAAYjB,SAAS,WAAW,GAAG,EAAE;gBAE3C,MAAM,CAACkB,SAASC,KAAK,GAAG,MAAMpB,IAAI,iBAAiB,CAACW,OAAO;oBACvD,GAAGZ,MAAM;oBACT,MAAMS,cAAc,GAAG,CAAC;wBACpB,OAAOa,eAAeL;wBACtB,QAAQL,MAAM,MAAM;oBACxB;oBACA,OAAOL,eAAe,GAAG,CAAC;wBACtB,OAAO;4BACH,GAAGW,KAAK;4BACRC;wBACJ;wBACA,QAAQP,MAAM,MAAM;oBACxB;gBACJ;gBAEA,OAAO;oBAACQ,QAAQ,GAAG,CAACJ;oBAA+BK;iBAAK;YAC5D;QACJ;QACA,cAAa,EAAEE,IAAI,EAAE;YACjB,OAAOnB,UAAU,OAAMQ;gBAEnB,MAAME,QAAQ,MAAMb,IAAI,WAAW,CAC/BW,OACA;oBACI,IAAIW,KAAK,EAAE;oBACX,QAAQA;gBACZ,GACA;oBAAE,cAAc;gBAAK;gBAEzB,OAAOP,qBAAqBF;YAChC;QACJ;QACA,cAAa,EAAED,EAAE,EAAEU,IAAI,EAAE;YACrB,OAAOnB,UAAU,OAAMQ;gBACnB,MAAMY,WAAW,MAAMb,kBAAkBC,OAAOC;gBAEhD,MAAMY,QAAQ;oBAKV,GAAGC,KAAKF,UAAUG,kBAAkB;oBACpC,QAAQ;wBACJ,GAAGH,SAAS,MAAM;wBAClB,GAAGD,IAAI;oBACX;gBACJ;gBAEA,MAAMT,QAAQ,MAAMb,IAAI,WAAW,CAACW,OAAOY,SAAS,EAAE,EAAEC;gBACxD,OAAOT,qBAAqBF;YAChC;QACJ;QACA,cAAa,EAAED,EAAE,EAAE;YACf,OAAOT,UAAU,OAAMQ;gBACnB,MAAMD,kBAAkBC,OAAOC;gBAC/B,MAAMZ,IAAI,WAAW,CAACW,OAAOC;gBAC7B,OAAO;YACX;QACJ;IACJ;AACJ"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webiny/api-aco",
3
- "version": "6.5.2-beta.0",
3
+ "version": "6.5.2-beta.2",
4
4
  "type": "module",
5
5
  "keywords": [
6
6
  "aco:base"
@@ -21,31 +21,31 @@
21
21
  ".": "./index.js"
22
22
  },
23
23
  "dependencies": {
24
- "@webiny/api": "6.5.2-beta.0",
25
- "@webiny/api-core": "6.5.2-beta.0",
26
- "@webiny/api-headless-cms": "6.5.2-beta.0",
27
- "@webiny/background-tasks": "6.5.2-beta.0",
24
+ "@webiny/api": "6.5.2-beta.2",
25
+ "@webiny/api-core": "6.5.2-beta.2",
26
+ "@webiny/api-headless-cms": "6.5.2-beta.2",
27
+ "@webiny/background-tasks": "6.5.2-beta.2",
28
28
  "@webiny/di": "1.1.0",
29
- "@webiny/error": "6.5.2-beta.0",
30
- "@webiny/feature": "6.5.2-beta.0",
31
- "@webiny/handler": "6.5.2-beta.0",
32
- "@webiny/handler-graphql": "6.5.2-beta.0",
33
- "@webiny/shared-aco": "6.5.2-beta.0",
34
- "@webiny/utils": "6.5.2-beta.0",
35
- "@webiny/validation": "6.5.2-beta.0",
29
+ "@webiny/error": "6.5.2-beta.2",
30
+ "@webiny/feature": "6.5.2-beta.2",
31
+ "@webiny/handler": "6.5.2-beta.2",
32
+ "@webiny/handler-graphql": "6.5.2-beta.2",
33
+ "@webiny/shared-aco": "6.5.2-beta.2",
34
+ "@webiny/utils": "6.5.2-beta.2",
35
+ "@webiny/validation": "6.5.2-beta.2",
36
36
  "lodash": "4.18.1"
37
37
  },
38
38
  "devDependencies": {
39
- "@webiny/api-file-manager": "6.5.2-beta.0",
40
- "@webiny/build-tools": "6.5.2-beta.0",
41
- "@webiny/handler-aws": "6.5.2-beta.0",
42
- "@webiny/plugins": "6.5.2-beta.0",
43
- "@webiny/project-utils": "6.5.2-beta.0",
44
- "@webiny/wcp": "6.5.2-beta.0",
45
- "graphql": "16.14.2",
46
- "rimraf": "6.1.3",
39
+ "@webiny/api-file-manager": "6.5.2-beta.2",
40
+ "@webiny/build-tools": "6.5.2-beta.2",
41
+ "@webiny/handler-aws": "6.5.2-beta.2",
42
+ "@webiny/plugins": "6.5.2-beta.2",
43
+ "@webiny/project-utils": "6.5.2-beta.2",
44
+ "@webiny/wcp": "6.5.2-beta.2",
45
+ "graphql": "16.15.0",
46
+ "rimraf": "6.1.4",
47
47
  "typescript": "7.0.2",
48
- "vitest": "5.0.5"
48
+ "vitest": "5.1.0"
49
49
  },
50
50
  "webiny": {
51
51
  "publishFrom": "dist"