Skip to content

Commit f20f406

Browse files
neatbyte-vnobisneatbyte-vnobis
committed
feat: moved deleteSubmission and getSubmission into HCMS
1 parent 6e6360c commit f20f406

File tree

47 files changed

+231
-950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+231
-950
lines changed

‎packages/api-aco/__tests__/folder.flp.crud.test.ts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -522,26 +522,14 @@ describe("Folder Level Permissions", () => {
522522
{
523523
id: folderA.id,
524524
parentId: null,
525-
permissions: [
526-
{
527-
target: "admin:2",
528-
level: "public",
529-
inheritedFrom: "public"
530-
}
531-
],
525+
permissions: [],
532526
hasNonInheritedPermissions: false,
533527
canManagePermissions: false
534528
},
535529
{
536530
id: folderB.id,
537531
parentId: folderA.id,
538-
permissions: [
539-
{
540-
target: "admin:2",
541-
level: "public",
542-
inheritedFrom: `parent:${folderA.id}`
543-
}
544-
],
532+
permissions: [],
545533
hasNonInheritedPermissions: false,
546534
canManagePermissions: false
547535
}

‎packages/api-aco/__tests__/folder.flp.security.test.ts

Lines changed: 6 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -68,61 +68,25 @@ describe("Folder Level Permissions - Security Checks", () => {
6868
{
6969
id: createdFolders[0].id,
7070
parentId: null,
71-
permissions: [
72-
{
73-
inheritedFrom: "public",
74-
level: "public",
75-
target: "admin:2"
76-
}
77-
],
78-
canManageStructure: true,
79-
canManagePermissions: false,
80-
hasNonInheritedPermissions: false,
71+
permissions: [],
8172
slug: "folder-1"
8273
},
8374
{
8475
id: createdFolders[1].id,
8576
parentId: null,
86-
permissions: [
87-
{
88-
inheritedFrom: "public",
89-
level: "public",
90-
target: "admin:2"
91-
}
92-
],
93-
canManageStructure: true,
94-
canManagePermissions: false,
95-
hasNonInheritedPermissions: false,
77+
permissions: [],
9678
slug: "folder-2"
9779
},
9880
{
9981
id: createdFolders[2].id,
10082
parentId: null,
101-
permissions: [
102-
{
103-
inheritedFrom: "public",
104-
level: "public",
105-
target: "admin:2"
106-
}
107-
],
108-
canManageStructure: true,
109-
canManagePermissions: false,
110-
hasNonInheritedPermissions: false,
83+
permissions: [],
11184
slug: "folder-3"
11285
},
11386
{
11487
id: createdFolders[3].id,
11588
parentId: null,
116-
permissions: [
117-
{
118-
inheritedFrom: "public",
119-
level: "public",
120-
target: "admin:2"
121-
}
122-
],
123-
canManageStructure: true,
124-
canManagePermissions: false,
125-
hasNonInheritedPermissions: false,
89+
permissions: [],
12690
slug: "folder-4"
12791
}
12892
]);
@@ -179,11 +143,7 @@ describe("Folder Level Permissions - Security Checks", () => {
179143
acoIdentityB
180144
.updateFolder({
181145
id: folderA.id,
182-
data: {
183-
permissions: [
184-
{ level: "owner", target: `admin:${identityA.id}` } // Include previous permissions.
185-
]
186-
}
146+
data: { permissions: [] }
187147
})
188148
.then(([response]) => {
189149
return response.data.aco.updateFolder.error;
@@ -195,97 +155,6 @@ describe("Folder Level Permissions - Security Checks", () => {
195155
});
196156
});
197157

198-
it(`should reset folder access level back to "public"`, async () => {
199-
const folderA = await acoIdentityA
200-
.createFolder({
201-
data: {
202-
title: "Folder A",
203-
slug: "folder-a",
204-
type: FOLDER_TYPE
205-
}
206-
})
207-
.then(([response]) => {
208-
return response.data.aco.createFolder.data;
209-
});
210-
211-
await acoIdentityA.updateFolder({
212-
id: folderA.id,
213-
data: {
214-
permissions: [{ level: "owner", target: `admin:${identityB.id}` }]
215-
}
216-
});
217-
218-
// Should be allowed because the user is not loosing access.
219-
await expect(
220-
acoIdentityB
221-
.updateFolder({
222-
id: folderA.id,
223-
data: {
224-
permissions: [
225-
{ level: "owner", target: `admin:${identityB.id}` }, // Include previous permissions.
226-
{ level: "owner", target: `admin:random-id` } // Include new permissions.
227-
]
228-
}
229-
})
230-
.then(([response]) => {
231-
return response.data.aco.updateFolder.data;
232-
})
233-
).resolves.toMatchObject({
234-
canManagePermissions: true,
235-
hasNonInheritedPermissions: true,
236-
id: folderA.id,
237-
parentId: null,
238-
permissions: [
239-
{ inheritedFrom: null, level: "owner", target: "admin:2" },
240-
{ inheritedFrom: null, level: "owner", target: "admin:random-id" }
241-
]
242-
});
243-
244-
await expect(
245-
acoIdentityA
246-
.updateFolder({
247-
id: folderA.id,
248-
data: {
249-
permissions: []
250-
}
251-
})
252-
.then(([response]) => {
253-
return response.data.aco.updateFolder.data;
254-
})
255-
).resolves.toMatchObject({
256-
canManagePermissions: true,
257-
hasNonInheritedPermissions: false,
258-
id: folderA.id,
259-
parentId: null,
260-
permissions: [
261-
{
262-
inheritedFrom: "role:full-access",
263-
level: "owner",
264-
target: "admin:1"
265-
}
266-
]
267-
});
268-
269-
// Should not be allowed because the user is loosing access.
270-
await expect(
271-
acoIdentityB.getFolder({ id: folderA.id }).then(([response]) => {
272-
return response.data.aco.getFolder.data;
273-
})
274-
).resolves.toMatchObject({
275-
canManagePermissions: false,
276-
hasNonInheritedPermissions: false,
277-
id: folderA.id,
278-
parentId: null,
279-
permissions: [
280-
{
281-
inheritedFrom: "public",
282-
level: "public",
283-
target: "admin:2"
284-
}
285-
]
286-
});
287-
});
288-
289158
it("should not allow moving a folder to an inaccessible folder", async () => {
290159
const folderA = await acoIdentityA
291160
.createFolder({
@@ -457,13 +326,7 @@ describe("Folder Level Permissions - Security Checks", () => {
457326
canManagePermissions: false,
458327
hasNonInheritedPermissions: false,
459328
id: folderC.id,
460-
permissions: [
461-
{
462-
target: "admin:2",
463-
level: "public",
464-
inheritedFrom: "public"
465-
}
466-
]
329+
permissions: []
467330
}
468331
]);
469332
});

‎packages/api-aco/__tests__/graphql/folder.gql.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ const DATA_FIELD = /* GraphQL */ `
1212
}
1313
hasNonInheritedPermissions
1414
canManagePermissions
15-
canManageStructure
1615
createdBy {
1716
id
1817
displayName

‎packages/api-aco/src/createAcoContext.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,8 @@ const setupAcoContext = async (context: AcoContext): Promise<void> => {
123123
});
124124
}
125125

126-
const listAdminUsers = () => {
127-
return security.withoutAuthorization(async () => {
128-
return context.adminUsers.listUsers();
129-
});
130-
};
131-
const listTeams = () => {
132-
return security.withoutAuthorization(async () => {
133-
return context.security.listTeams();
134-
});
135-
};
126+
const listAdminUsers = () => context.adminUsers.listUsers();
127+
const listTeams = () => context.security.listTeams();
136128

137129
context.aco = {
138130
folder: createFolderCrudMethods({

‎packages/api-aco/src/folder/folder.model.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ const permissionsField = () =>
102102
{
103103
label: "Owner",
104104
value: "owner"
105-
},
106-
{
107-
label: "Public",
108-
value: "public"
109105
}
110106
]
111107
}

0 commit comments

Comments
 (0)