Make AEM Permissions email based

Author: auniverseaway

nx/blocks/permissions/utils/utils.js

@@ -133,7 +133,7 @@ function compareRoles(aemUser, daUser) {
 export function combineUsers(daUsers, aemUsers) {
   // Combine up all the existing AEM users that have new requests
   const combined = aemUsers.reduce((acc, aemUser) => {
-    const foundUser = daUsers.find((daUser) => daUser.id === aemUser.email);
+    const foundUser = daUsers.find((daUser) => daUser.email === aemUser.email);
 
     // If user wasn't found in DA users, push them to aemUsers.
     if (!foundUser) {
@@ -149,8 +149,8 @@ export function combineUsers(daUsers, aemUsers) {
   }, { daUsers: [], aemUsers: [] });
 
   const onlyRequests = daUsers.filter((daUser) => {
-    const inDaCombined = combined.daUsers.find((user) => daUser.id === user.id);
-    const inAemCombined = combined.aemUsers.find((user) => daUser.id === user.id);
+    const inDaCombined = combined.daUsers.find((user) => daUser.email === user.email);
+    const inAemCombined = combined.aemUsers.find((user) => daUser.email === user.email);
     return !inDaCombined && !inAemCombined && daUser.requested.length > 0;
   });
 
@@ -201,16 +201,18 @@ async function approveSiteUser(org, site, path, user) {
 
     if (found) {
       // If found, check to see if the user is already in the list.
-      const exists = existingRoleUsers.some((existingUser) => existingUser === user.id);
+      const exists = existingRoleUsers.some((existingUser) => existingUser === user.email);
 
       // It's possible there's nothing in the role, so set it if the user isn't already there
-      if (!exists) json.admin.role[role] = [...existingRoleUsers, user.id];
+      if (!exists) json.admin.role[role] = [...existingRoleUsers, user.email];
     } else {
       // Check to see if there are existing users in the current role
       if (!existingRoleUsers.length) return;
 
       // Ensure this user is removed if they've had the role taken away from them
-      json.admin.role[role] = existingRoleUsers.filter((existingUser) => existingUser !== user.id);
+      json.admin.role[role] = existingRoleUsers.filter(
+        (existingUser) => existingUser !== user.email,
+      );
     }
   });
 
@@ -223,13 +225,13 @@ async function approveSiteUser(org, site, path, user) {
 }
 
 async function approveOrgUser(org, path, user) {
-  const { id, aemId, requested = [], roles = [] } = user;
+  const { email, aemId, requested = [], roles = [] } = user;
   const approvedRoles = [...new Set([...requested, ...roles])];
 
   const pathBase = `/config/${org}/users`;
   const aemPath = aemId ? `${pathBase}/${aemId}.json` : `${pathBase}.json`;
 
-  const json = { email: id, roles: approvedRoles };
+  const json = { email, roles: approvedRoles };
   if (aemId) json.id = aemId;
 
   await clearRequests(path, user);