fixes

Author: RomanBachaloSigmaSoftware

lib/admin/controllers/eg008UpdateUserProductPermissionProfile.js

@@ -28,11 +28,11 @@ eg008UpdateUserProductPermissionProfile.createController = async (req, res) => {
     req.flash("info", "Sorry, you need to re-authenticate.");
     // Save the current operation so it will be resumed after authentication
     req.dsAuth.setEg(req, eg);
-    res.redirect(mustAuthenticate);
+    return res.redirect(mustAuthenticate);
   }
 
   if(!req.session.clmEmail) {
-    res.render("pages/admin-examples/eg008UpdateUserProductPermissionProfile", {
+    return res.render("pages/admin-examples/eg008UpdateUserProductPermissionProfile", {
       eg: eg, csrfToken: req.csrfToken(),
       title: "Update user product permission profiles using an email address",
       emailOk: false,
@@ -98,12 +98,12 @@ eg008UpdateUserProductPermissionProfile.getController = async (req, res) => {
   if (!isTokenOK) {
     // Save the current operation so it will be resumed after authentication
     req.dsAuth.setEg(req, eg);
-    res.redirect(mustAuthenticate);
+    return res.redirect(mustAuthenticate);
   }
 
   const sourceFile = (path.basename(__filename))[5].toLowerCase() + (path.basename(__filename)).substr(6);
   if(!req.session.clmEmail) {
-    res.render("pages/admin-examples/eg008UpdateUserProductPermissionProfile", {
+    return res.render("pages/admin-examples/eg008UpdateUserProductPermissionProfile", {
       eg: eg, csrfToken: req.csrfToken(),
       title: "Update user product permission profiles using an email address",
       emailOk: false,

lib/admin/controllers/eg009DeleteUserProductPermissionProfile.js

@@ -28,11 +28,11 @@ eg009DeleteUserProductPermissionProfile.createController = async (req, res) => {
     req.flash("info", "Sorry, you need to re-authenticate.");
     // Save the current operation so it will be resumed after authentication
     req.dsAuth.setEg(req, eg);
-    res.redirect(mustAuthenticate);
+    return res.redirect(mustAuthenticate);
   }
 
   if(!req.session.clmEmail) {
-    res.render("pages/admin-examples/eg009DeleteUserProductPermissionProfile", {
+    return res.render("pages/admin-examples/eg009DeleteUserProductPermissionProfile", {
       eg: eg, csrfToken: req.csrfToken(),
       title: "Delete user product permission profiles using an email address",
       emailOk: false,
@@ -89,12 +89,12 @@ eg009DeleteUserProductPermissionProfile.getController = async (req, res) => {
     req.flash("info", "Sorry, you need to re-authenticate.");
     // Save the current operation so it will be resumed after authentication
     req.dsAuth.setEg(req, eg);
-    res.redirect(mustAuthenticate);
+    return res.redirect(mustAuthenticate);
   }
 
   const sourceFile = (path.basename(__filename))[5].toLowerCase() + (path.basename(__filename)).substr(6);
   if(!req.session.clmEmail) {
-    res.render("pages/admin-examples/eg009DeleteUserProductPermissionProfile", {
+    return res.render("pages/admin-examples/eg009DeleteUserProductPermissionProfile", {
       eg: eg, csrfToken: req.csrfToken(),
       title: "Delete user product permission profiles using an email address",
       emailOk: false,
@@ -117,32 +117,24 @@ eg009DeleteUserProductPermissionProfile.getController = async (req, res) => {
 
     const productPermissionProfiles = await getProductPermissionProfilesByEmail(args);
     let permissionProfileList = [];
-    let clmProductId;
-    let clmPermissionProfileName;
-    let eSignProductId;
-    let eSignPermissionProfileName;
+    let permissionName;
 
     if(productPermissionProfiles && productPermissionProfiles.length > 0) {
       productPermissionProfiles.forEach(product => {
         let permissionProfiles = product["permission_profiles"];
 
         permissionProfiles.forEach(profile => {
           if(product["product_name"].includes("CLM")) {
-            clmPermissionProfileName = profile["permission_profile_name"];
-            clmProductId = product["product_id"];
+            permissionName = `CLM - ${profile["permission_profile_name"]}`;
           } else {
-            eSignPermissionProfileName = profile["permission_profile_name"];
-            eSignProductId = product["product_id"];
+            permissionName = `eSignature - ${profile["permission_profile_name"]}`;
+          }
+
+          if(permissionProfileList.filter(prof => prof["productId"] === product["product_id"]).length === 0) {
+            permissionProfileList.push({ productId: product["product_id"], permissionName})
           }
         });
       });
-
-      if(clmProductId !== undefined) {
-        permissionProfileList.push({ productId: clmProductId, permissionName: `CLM - ${clmPermissionProfileName}`})
-      }
-      if(eSignProductId !== undefined) {
-        permissionProfileList.push({ productId: eSignProductId, permissionName: `eSignature - ${eSignPermissionProfileName}`})
-      }   
     }
 
     res.render("pages/admin-examples/eg009DeleteUserProductPermissionProfile", {

lib/admin/examples/updateUserProductPermissionProfile.js

@@ -42,6 +42,11 @@ const getProductPermissionProfiles = async (args) => {
   // Step 2 end
 
   // Step 3 start
+  let clmPermissionProfiles;
+  let eSignPermissionProfiles;
+  let clmProductId;
+  let eSignProductId;
+  
   productPermissionProfiles.product_permission_profiles.forEach(function (productPermissionProfile) {
     if (productPermissionProfile.product_name == "CLM") {
       clmPermissionProfiles = productPermissionProfile.permission_profiles;