test: partial permission updates

api-tests/core/admin/admin-role.test.api.js

@@ -72,7 +72,7 @@ describe('Role CRUD End to End', () => {
       data.editorRole = res.body.data.find((r) => r.code === 'strapi-editor');
     });
 
-    test('Author have admin::is-creator condition for every permission', async () => {
+    test('Author has admin::is-creator condition for every permission', async () => {
       const res = await rq({
         url: `/admin/roles/${data.authorRole.id}/permissions`,
         method: 'GET',
@@ -117,14 +117,20 @@ describe('Role CRUD End to End', () => {
     ];
 
     test('Conditions of editors and author can be modified', async () => {
+      let oldPermRes = await rq({
+        url: `/admin/roles/${data.editorRole.id}/permissions`,
+        method: 'GET',
+      });
+
       let res = await rq({
         url: `/admin/roles/${data.editorRole.id}/permissions`,
         method: 'PUT',
-        body: { permissions: newPermissions },
+        body: { permissions: { connect: newPermissions } },
       });
 
       expect(res.statusCode).toBe(200);
-      expect(res.body.data).toHaveLength(2);
+      // Old permissions should be kept
+      expect(res.body.data).toHaveLength(oldPermRes.body.data.length + 2);
       expect(res.body).toEqual({
         data: expect.arrayContaining([
           expect.objectContaining({
@@ -142,14 +148,20 @@ describe('Role CRUD End to End', () => {
         ]),
       });
 
+      oldPermRes = await rq({
+        url: `/admin/roles/${data.authorRole.id}/permissions`,
+        method: 'GET',
+      });
+
       res = await rq({
         url: `/admin/roles/${data.authorRole.id}/permissions`,
         method: 'PUT',
-        body: { permissions: newPermissions },
+        body: { permissions: { connect: newPermissions } },
       });
 
       expect(res.statusCode).toBe(200);
-      expect(res.body.data).toHaveLength(2);
+      // Old permissions should be kept
+      expect(res.body.data).toHaveLength(oldPermRes.body.data.length + 2);
       expect(res.body).toEqual({
         data: expect.arrayContaining([
           expect.objectContaining({
@@ -590,12 +602,13 @@ describe('Role CRUD End to End', () => {
       });
     });
 
-    test('assign permissions on role', async () => {
+    test('connect new permissions on role', async () => {
       const res = await rq({
         url: `/admin/roles/${data.rolesWithoutUsers[0].id}/permissions`,
         method: 'PUT',
         body: {
-          permissions: [
+          permissions: {
+            connect: [
               {
                 action: 'plugin::users-permissions.roles.update',
               },
@@ -607,6 +620,7 @@ describe('Role CRUD End to End', () => {
               },
             ],
           },
+        },
       });
 
       expect(res.statusCode).toBe(200);
@@ -627,11 +641,47 @@ describe('Role CRUD End to End', () => {
       });
     });
 
-    test('assign permissions on role with an unknown condition', async () => {
+    test('connect existing permissions on role', async () => {
-      const permissions = [
+      const newPermissions = await rq({
-        {
+        url: `/admin/roles/${data.rolesWithoutUsers[0].id}/permissions`,
-          action: 'plugin::users-permissions.roles.update',
+        method: 'GET',
+      })
+        .then((res) => res.body.data)
+        .then((permissions) =>
+          // Update permissions of content-manager.explorer.create to have empty fields
+          permissions.map((p) => {
+            if (p.action === 'plugin::content-manager.explorer.create') {
+              return {
+                ...p,
+                properties: { ...p.properties, fields: [] },
+              };
+            }
+            return p;
+          })
+        );
+
+      const res = await rq({
+        url: `/admin/roles/${data.rolesWithoutUsers[0].id}/permissions`,
+        method: 'PUT',
+
+        body: {
+          permissions: {
+            connect: newPermissions,
           },
+        },
+      });
+
+      expect(res.statusCode).toBe(200);
+      expect(res.body.data).toEqual(expect.arrayContaining(newPermissions));
+    });
+
+    test('connect permissions on role with an unknown condition', async () => {
+      const oldPermissionsId = await rq({
+        url: `/admin/roles/${data.rolesWithoutUsers[0].id}/permissions`,
+        method: 'GET',
+      }).then((res) => res.body.data.map((p) => p.id));
+
+      const permissions = [
         {
           action: 'plugin::content-manager.explorer.create',
           subject: 'plugin::users-permissions.user',
@@ -639,36 +689,105 @@ describe('Role CRUD End to End', () => {
           conditions: ['admin::is-creator'],
         },
       ];
+
       const res = await rq({
         url: `/admin/roles/${data.rolesWithoutUsers[0].id}/permissions`,
         method: 'PUT',
         body: {
-          permissions: [
+          permissions: {
-            permissions[0],
+            connect: [
               {
-              ...permissions[1],
+                ...permissions[0],
-              conditions: [...permissions[1].conditions, 'unknown-condition'],
+                conditions: [...permissions[0].conditions, 'unknown-condition'],
               },
             ],
+            disconnect: oldPermissionsId.map((id) => ({ id })),
+          },
         },
       });
 
       expect(res.statusCode).toBe(200);
       expect(res.body.data).toHaveLength(1);
-      expect(res.body.data[0]).toMatchObject(permissions[1]);
+      expect(res.body.data[0]).toMatchObject(permissions[0]);
     });
 
-    test("can't assign non-existing permissions on role", async () => {
+    describe('connect non valid permissions on role', () => {
+      test("can't connect permissions on role with invalid id", async () => {
         const res = await rq({
           url: `/admin/roles/${data.rolesWithoutUsers[0].id}/permissions`,
           method: 'PUT',
           body: {
-          permissions: [
+            permissions: {
+              connect: [
+                {
+                  id: 99999999,
+                  action: 'plugin::users-permissions.roles.update',
+                },
+              ],
+            },
+          },
+        });
+
+        expect(res.statusCode).toBe(400);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {},
+            message: 'Some permissions to update do not exist',
+            name: 'ApplicationError',
+            status: 400,
+          },
+        });
+      });
+
+      test("can't connect content manager permission without subject", async () => {
+        const res = await rq({
+          url: `/admin/roles/${data.rolesWithoutUsers[0].id}/permissions`,
+          method: 'PUT',
+          body: {
+            permissions: {
+              connect: [
+                {
+                  action: 'plugin::content-manager.explorer.create',
+                },
+              ],
+            },
+          },
+        });
+
+        expect(res.statusCode).toBe(400);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {
+              errors: [
+                {
+                  message: 'Invalid subject submitted',
+                  name: 'ValidationError',
+                  path: ['permissions', 'connect', '0', 'subject'],
+                },
+              ],
+            },
+            message: 'Invalid subject submitted',
+            name: 'ValidationError',
+            status: 400,
+          },
+        });
+      });
+
+      test("can't connect non-existing permissions on role", async () => {
+        const res = await rq({
+          url: `/admin/roles/${data.rolesWithoutUsers[0].id}/permissions`,
+          method: 'PUT',
+          body: {
+            permissions: {
+              connect: [
                 {
                   action: 'non.existing.action',
                 },
               ],
             },
+          },
         });
 
         expect(res.statusCode).toBe(400);
@@ -680,7 +799,7 @@ describe('Role CRUD End to End', () => {
                 {
                   message: 'action is not an existing permission action',
                   name: 'ValidationError',
-                path: ['permissions', '0', 'action'],
+                  path: ['permissions', 'connect', '0', 'action'],
                 },
               ],
             },
@@ -690,6 +809,7 @@ describe('Role CRUD End to End', () => {
           },
         });
       });
+    });
 
     test('get permissions role', async () => {
       const res = await rq({
@@ -715,5 +835,43 @@ describe('Role CRUD End to End', () => {
         }
       });
     });
+
+    test('disconnect permissions on role', async () => {
+      // Connect some first, and disconnect all ids afterwards
+      const oldPermissions = await rq({
+        url: `/admin/roles/${data.rolesWithoutUsers[0].id}/permissions`,
+        method: 'PUT',
+        body: {
+          permissions: {
+            connect: [
+              {
+                action: 'plugin::users-permissions.roles.update',
+              },
+              {
+                action: 'plugin::content-manager.explorer.create',
+                subject: 'plugin::users-permissions.user',
+                properties: { fields: ['username'], locales: [] },
+                conditions: ['admin::is-creator'],
+              },
+            ],
+          },
+        },
+      }).then((res) => res.body.data);
+
+      const res = await rq({
+        url: `/admin/roles/${data.rolesWithoutUsers[0].id}/permissions`,
+        method: 'PUT',
+        body: {
+          permissions: {
+            // Disconnect all but the last one
+            disconnect: oldPermissions.slice(0, -1).map((p) => ({ id: p.id })),
+          },
+        },
+      });
+
+      expect(res.statusCode).toBe(200);
+      expect(res.body.data).toHaveLength(1);
+      expect(res.body.data[0]).toMatchObject(oldPermissions[oldPermissions.length - 1]);
+    });
   });
 });