From ab54a497360f55471ede209ffbf4831a22b5a61f Mon Sep 17 00:00:00 2001
From: Fernando Chavez <fernando.chavez@strapi.io>
Date: Wed, 21 Dec 2022 14:31:43 +0100
Subject: [PATCH] Edit in permission events' name and in roles emitting

---
 packages/core/admin/ee/server/services/audit-logs.js      | 6 +++---
 packages/core/admin/server/services/permission/queries.js | 6 +++---
 packages/core/admin/server/services/role.js               | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/core/admin/ee/server/services/audit-logs.js b/packages/core/admin/ee/server/services/audit-logs.js
index 0af08ed84e..a0969d01fb 100644
--- a/packages/core/admin/ee/server/services/audit-logs.js
+++ b/packages/core/admin/ee/server/services/audit-logs.js
@@ -23,9 +23,9 @@ const defaultEvents = [
   'role.create',
   'role.update',
   'role.delete',
-  'permissions.create',
-  'permissions.update',
-  'permissions.delete',
+  'permission.create',
+  'permission.update',
+  'permission.delete',
 ];
 
 const getEventMap = (defaultEvents) => {
diff --git a/packages/core/admin/server/services/permission/queries.js b/packages/core/admin/server/services/permission/queries.js
index 8184cbaa91..6b64367eb5 100644
--- a/packages/core/admin/server/services/permission/queries.js
+++ b/packages/core/admin/server/services/permission/queries.js
@@ -49,7 +49,7 @@ const deleteByIds = async (ids) => {
     const queryResult = await strapi.query('admin::permission').delete({ where: { id } });
     result.push(queryResult);
   }
-  strapi.eventHub.emit('permissions.delete', { permissions: result });
+  strapi.eventHub.emit('permission.delete', { permissions: result });
 };
 
 /**
@@ -65,7 +65,7 @@ const createMany = async (permissions) => {
   }
 
   const permissionsToReturn = permissionDomain.toPermission(createdPermissions);
-  strapi.eventHub.emit('permissions.create', { permissions: permissionsToReturn });
+  strapi.eventHub.emit('permission.create', { permissions: permissionsToReturn });
 
   return permissionsToReturn;
 };
@@ -82,7 +82,7 @@ const update = async (params, attributes) => {
     .update({ where: params, data: attributes });
 
   const permissionToReturn = permissionDomain.toPermission(updatedPermission);
-  strapi.eventHub.emit('permissions.update', { permissions: permissionToReturn });
+  strapi.eventHub.emit('permission.update', { permissions: permissionToReturn });
 
   return permissionToReturn;
 };
diff --git a/packages/core/admin/server/services/role.js b/packages/core/admin/server/services/role.js
index a8a5671e8d..59742bb88b 100644
--- a/packages/core/admin/server/services/role.js
+++ b/packages/core/admin/server/services/role.js
@@ -65,7 +65,7 @@ const create = async (attributes) => {
   };
 
   const result = await strapi.query('admin::role').create({ data: rolesWithCode });
-  strapi.eventHub.emit('role.create', sanitizeRole(result));
+  strapi.eventHub.emit('role.create', { role: sanitizeRole(result) });
 
   return result;
 };
@@ -143,7 +143,7 @@ const update = async (params, attributes) => {
   const result = await strapi
     .query('admin::role')
     .update({ where: params, data: sanitizedAttributes });
-  strapi.eventHub.emit('role.update', sanitizeRole(result));
+  strapi.eventHub.emit('role.update', { role: sanitizeRole(result) });
 
   return result;
 };
@@ -202,7 +202,7 @@ const deleteByIds = async (ids = []) => {
     const deletedRole = await strapi.query('admin::role').delete({ where: { id } });
 
     if (deletedRole) {
-      strapi.eventHub.emit('role.delete', deletedRole);
+      strapi.eventHub.emit('role.delete', { role: deletedRole });
       deletedRoles.push(deletedRole);
     }
   }