Anthony/added permission changes for default permissions of user

src/models/userPermissionChangeLog.js

@@ -4,7 +4,6 @@ const { Schema } = mongoose;
 
 const User = require('./userProfile');
 
-
 const UserPermissionChangeLog = new Schema({
   logDateTime: { type: String, required: true },
   userId: {
@@ -14,10 +13,16 @@ const UserPermissionChangeLog = new Schema({
   },
   individualName: { type: String },
   permissions: { type: [String], required: true },
+  removedRolePermissions: { type: [String], default: [] },
   permissionsAdded: { type: [String], default: [] },
   permissionsRemoved: { type: [String], default: [] },
   requestorRole: { type: String },
   requestorEmail: { type: String, required: true },
+  reason: { type: String, default: '' },
 });
 
-module.exports = mongoose.model('UserPermissionChangeLog', UserPermissionChangeLog, 'UserPermissionChangeLogs');
+module.exports = mongoose.model(
+  'UserPermissionChangeLog',
+  UserPermissionChangeLog,
+  'UserPermissionChangeLogs',
+);

src/utilities/logUserPermissionChangeByAccount.js

@@ -18,49 +18,72 @@ const findLatestRelatedLog = (userId) =>
 
 //
 
+const checkPermissionArray = (permArray) => (Array.isArray(permArray) ? permArray : []);
+
 const logUserPermissionChangeByAccount = async (req, user) => {
-  const { permissions, requestor } = req.body;
+  const { permissions, requestor, reason } = req.body;
   const dateTime = moment().tz('America/Los_Angeles').format();
 
   try {
     if (!permissions || !requestor?.requestorId) {
       return;
     }
 
-    const Permissions = Array.isArray(permissions.frontPermissions)
-      ? permissions.frontPermissions
-      : [];
-    const { userId } = req.params;
-
     // Fetch requestor email (may be null if requestor deleted)
     const requestorDoc = await UserProfile.findById(requestor.requestorId)
       .select('email')
       .lean()
       .exec();
     const requestorEmail = requestorDoc?.email ?? 'unknown';
 
-    const { firstName, lastName } = user;
+    // const { firstName, lastName } = user;
     let permissionsAdded = [];
     let permissionsRemoved = [];
+    const roleChanged = reason.includes('Role Changed');
+    const { userId } = req.params;
+    const Permissions = checkPermissionArray(permissions.frontPermissions);
+    const removedPermissions = checkPermissionArray(permissions.removedDefaultPermissions); // removed default permissions
+    const rolePermissions = checkPermissionArray(permissions.defaultPermissions); // default permissions for user provided by their role
+    const changedPermissions = [...Permissions, ...removedPermissions];
+
+    // Use the user object passed from controller (already fetched)
+    const { firstName, lastName } = user;
 
     const document = await findLatestRelatedLog(userId);
 
     if (document) {
-      const docPermissions = Array.isArray(document.permissions) ? document.permissions : [];
-      // const sortedDoc = [...docPermissions].sort();
-      const sortedDoc = [...docPermissions].sort((a, b) => a.localeCompare(b));
-      // const sortedCurrent = [...Permissions].sort();
-      const sortedCurrent = [...Permissions].sort((a, b) => a.localeCompare(b));
-      if (JSON.stringify(sortedDoc) === JSON.stringify(sortedCurrent)) {
+      const docPermissions = checkPermissionArray(document.permissions);
+      const docRemovedRolePermissions = checkPermissionArray(document.removedRolePermissions);
+      const docSavedChanges = [...docPermissions, ...docRemovedRolePermissions];
+      const sortedSaved = [...docSavedChanges].sort((a, b) => a.localeCompare(b));
+      const sortedChanged = [...changedPermissions].sort((a, b) => a.localeCompare(b));
+      // no new changes in permissions list from last update and no role change
+      if (
+        sortedSaved.length === sortedChanged.length &&
+        sortedSaved.every((value, index) => value === sortedChanged[index]) &&
+        !roleChanged
+      ) {
         return;
       }
-      permissionsRemoved = docPermissions.filter((item) => !Permissions.includes(item));
-      permissionsAdded = Permissions.filter((item) => !docPermissions.includes(item));
+      permissionsRemoved = [
+        ...removedPermissions.filter((item) => !docRemovedRolePermissions.includes(item)), // saves new removed role defaults
+        ...docPermissions.filter(
+          (item) => !Permissions.includes(item) && !rolePermissions.includes(item),
+        ), // removed user added permissions
+      ];
+      permissionsAdded = [
+        ...Permissions.filter((item) => !docPermissions.includes(item)), // saves new added permissions
+        ...docRemovedRolePermissions.filter(
+          (item) => !removedPermissions.includes(item) && rolePermissions.includes(item),
+        ), // removed role permissions added back
+      ];
     } else {
       permissionsAdded = Permissions;
+      permissionsRemoved = removedPermissions; // adds removed default permissions to permissionsRemoved for inital log
     }
 
-    if (permissionsRemoved.length === 0 && permissionsAdded.length === 0) {
+    // no permission added nor removed nor role change
+    if (permissionsRemoved.length === 0 && permissionsAdded.length === 0 && !roleChanged) {
       return;
     }
 
@@ -69,9 +92,11 @@ const logUserPermissionChangeByAccount = async (req, user) => {
       userId,
       individualName: `INDIVIDUAL: ${firstName} ${lastName}`,
       permissions: Permissions,
+      removedRolePermissions: removedPermissions,
       permissionsAdded,
       permissionsRemoved,
       requestorRole: requestor.role,
+      reason,
       requestorEmail,
     });
 

yarn.lock

@@ -3000,7 +3000,7 @@
 
 "@standard-schema/spec@^1.1.0":
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@standard-schema/spec/-/spec-1.1.0.tgz#a79b55dbaf8604812f52d140b2c9ab41bc150bb8"
+  resolved "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz"
   integrity sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==
 
 "@streamparser/json@^0.0.6":
@@ -7401,7 +7401,7 @@ jmespath@0.16.0:
 
 joi@^18.2.1:
   version "18.2.1"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-18.2.1.tgz#a022e39496e25b010a6d4649975c160a4315bd79"
+  resolved "https://registry.npmjs.org/joi/-/joi-18.2.1.tgz"
   integrity sha512-2/OKlogiESf2Nh3TFCrRjrr9z1DRHeW0I+KReF67+4J0Ns+8hBtHRmoWAZ2OFU6I5+TWLEe6sVlSdXPjHm5UbQ==
   dependencies:
     "@hapi/address" "^5.1.1"
@@ -10363,9 +10363,9 @@ tlds@^1.234.0:
   integrity sha512-QXqwfEl9ddlGBaRFXIvNKK6OhipSiLXuRuLJX5DErz0o0Q0rYxulWLdFryTkV5PkdZct5iMInwYEGe/eR++1AA==
 
 tmp@^0.2.1:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.7.tgz#26f4db11d1601ce8012dcb8a798ece1c06a99059"
-  integrity sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==
+  version "0.2.5"
+  resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz"
+  integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==
 
 tmpl@1.0.5:
   version "1.0.5"