Notification about tenant user role changes

Author: matleppa

apinf_packages/tenant/client/add/add.js

@@ -41,6 +41,7 @@ Template.tenantForm.events({
       // Get possible users in tenant
       if (Session.get('tenantUsers')) {
         tenantUsers = Session.get('tenantUsers');
+        console.log('tenant users=', tenantUsers);
         // convert user objects to a list for POST operation
         tenant.users = tenantUsers.map((userdata) => {
           const usersRow = {
@@ -53,10 +54,13 @@ Template.tenantForm.events({
         });
         // gather list of notified users email addresses
         notifyUserList = tenantUsers.filter((userdata) => {
-          if (userdata.notification === 'checked') {
-            return userdata.email;
-          }
-          return false;
+      //    if (userdata.notification === 'checked') {
+            return {
+              username: userdata.name,
+              email: userdata.email,
+            }
+      //    }
+      //    return false;
         });
       }
 
@@ -90,14 +94,21 @@ Template.tenantForm.events({
             // Close modal
             Modal.hide('tenantForm');
 
+            // Notification to users of tenant
+            console.log('Perhaps following users need to be notified=', notifyUserList);
+            Meteor.call('informTenantUser', notifyUserList, 'userRoleChange', tenant.name, (error, result) => {
+              if (error) {
+                sAlert.error('Error in notifying users', { timeout: 'none' });
+              }
+            });
+
             // Get success message translation
             let message = TAPi18n.__('tenantForm_addTenant_Success_Message');
             message = message.concat(tenant.name);
 
-            // Alert user of success
+            // Inform user about success
             sAlert.success(message);
 
-            console.log('Perhaps following users need to be notified=', notifyUserList);
           } else {
             // Operation finished, inform spinner
             Session.set('tenantUpdateOngoing', false);
@@ -194,6 +205,8 @@ Template.tenantForm.events({
        */
 
       const usersNeedChecking = [];
+      const notifyChangedUsers = [];
+      const notifyRemovedUsers = [];
 
        // Go through tenant's original user list and compare it against tenant's modified user list
        // Note! Must loop array from right to left in order to get user indexes in descending order,
@@ -233,6 +246,9 @@ Template.tenantForm.events({
           // Add user to to-be-checked list
           usersNeedChecking.push(checkUser);
 
+          // Add user to list for notification about removal
+          notifyRemovedUsers.push(origUser);
+
           // If user data is modified, set user to be replaced
         } else if (origUser.consumer !== sameUserInModified[0].consumer ||
                    origUser.provider !== sameUserInModified[0].provider) {
@@ -270,6 +286,9 @@ Template.tenantForm.events({
           // Add user to to-be-checked list
           usersNeedChecking.push(checkUser);
 
+          // Add user to notification about modification list
+          notifyChangedUsers.push(sameUserInModified[0]);
+
           // User data is changed, remove from modified list
           modifiedTenant.users.splice(modifiedUserIndex, 1);
         } else {
@@ -288,6 +307,9 @@ Template.tenantForm.events({
 
       // If there are any modified users left, they are to be added into request
       const newUsers = modifiedTenant.users.map((user) => {
+        // Add user to notification about modification list
+        notifyChangedUsers.push(user);
+
         // collect roles
         const tenantRoles = [];
         if (user.provider) {
@@ -345,6 +367,26 @@ Template.tenantForm.events({
                     // Close modal
                     Modal.hide('tenantForm');
 
+                    // if there are modified users, send notifications
+                    if (notifyChangedUsers.length > 0) {
+                      console.log('Perhaps following users need to be notified about change=', notifyChangedUsers);
+                      Meteor.call('informTenantUser', notifyChangedUsers, 'userRoleChange', modifiedTenant.name, (notifyModifyError, notifyModifyResult) => {
+                        if (notifyModifyError) {
+                          sAlert.error('Error in notifying users', { timeout: 'none' });
+                        }
+                      });
+                    }
+
+                    if (notifyRemovedUsers.length > 0) {
+                      // if there are removed users, send notifications
+                      console.log('Perhaps following users need to be notified about removal=', notifyRemovedUsers);
+                      Meteor.call('informTenantUser', notifyRemovedUsers, 'userRemoval', modifiedTenant.name, (notifyRemoveError, notifyRemoveResult) => {
+                        if (notifyRemoveError) {
+                          sAlert.error('Error in notifying users', { timeout: 'none' });
+                        }
+                      });
+                    }
+
                     // Get success message translation
                     let message = TAPi18n.__('tenantForm_update_Success_Message');
                     // Alert user of success

apinf_packages/tenant/client/add/form/form.js

@@ -17,11 +17,24 @@ Template.tenantUserForm.events({
       // Alert user of error
       sAlert.error(errorMmessage, { timeout: 'none' });
     } else {
+      // get the selected user's email address from complete user list
+      const userId = $('#completeUserList option:selected').val();
+      const completeUserList = Session.get('completeUserList');
+      const thisUser = completeUserList.filter((userdata) => {
+        if (userdata.id === userId) {
+          return {
+            userdata,
+          }
+        }
+        return false;
+      });
+
       const newUser = {
         id: $('#completeUserList option:selected').val(),
         name: $('#completeUserList option:selected').text(),
         provider: false,
         consumer: false,
+        email: thisUser[0].email,
       };
 
       let tenantUsers = [];
@@ -46,12 +59,14 @@ Template.tenantUserForm.events({
         // Add new user object to array
         tenantUsers.push(newUser);
 
+        console.log('new userlist on tenant=', tenantUsers);
         // Save to localStorage to be used while listing users of tenant
         Session.set('tenantUsers', tenantUsers);
 
         // unselect username
         $('#completeUserList option:selected').prop('selected', false);
-        $('#addUserToTenant').prop('disabled', true);
+        // Disable add button, when no user is selected
+        // $('#addUserToTenant').prop('disabled', true);
       }
     }
   },

apinf_packages/tenant/client/remove_tenant/remove_tenant.js

@@ -39,7 +39,16 @@ Template.ensureTenantRemovalForm.events({
     Meteor.call('deleteTenant', tenantToRemove, (error, result) => {
       if (result) {
         if (result.status === 204) {
-          // New tenant successfully added on manager side, empty local list
+          // Tenant successfully removed from manager side, empty local list
+          const notifyUserList = Session.get('tenantUsers');
+          // Notification to users of tenant
+          console.log('Perhaps following users need to be notified about removal=', notifyUserList);
+          Meteor.call('informTenantUser', notifyUserList, 'userRemoval', tenantToRemove.name, (notifyError, notifyResult) => {
+            if (notifyError) {
+              sAlert.error('Error in notifying users', { timeout: 'none' });
+            }
+          });
+
           tenantList = [];
           // Save to sessionStorage to be used while adding users to tenant
           Session.set('tenantList', tenantList);

apinf_packages/tenant/server/methods.js

@@ -63,7 +63,6 @@ Meteor.methods({
       // eslint-disable-next-line new-cap
       check(tenantUrl, Match.Maybe(String));
       tenantUrl = tenantUrl.concat('tenant');
-      console.log(+new Date(), ' 2 send GET tenant request to = ', tenantUrl);
 
       // Get user's tenant access token
       const accessToken = getTenantToken();
@@ -78,10 +77,6 @@ Meteor.methods({
             },
           }
         );
-        // Create a monitoring data
-
-        console.log('3 tenant GET a ok, result=', result.content);
-
         // deserialize JSON
         const tenantList = JSON.parse(result.content);
 
@@ -112,7 +107,6 @@ Meteor.methods({
 
         response.status = result.statusCode;
       } catch (err) {
-        console.log('3 tenant b nok, err=\n', err);
 
         // Return error object
         let errorMessage = TAPi18n.__('tenantRequest_missingTenantList');
@@ -283,50 +277,6 @@ Meteor.methods({
         let errorMessage = TAPi18n.__('tenantRequest_missingUserlist');
         errorMessage = errorMessage.concat(err);
         throw new Meteor.Error(errorMessage);
-        /*
-        response.status = err.response.statusCode;
-        response.content = err.response.content;
-
-        // For mock purposes we fill the list here ourself
-        response.completeUserList = [
-          {
-            id: '123456789',
-            username: 'Håkan',
-          },
-          {
-            id: '223456789',
-            username: 'Luis',
-          },
-          {
-            id: '323456789',
-            username: 'Pär',
-          },
-          {
-            id: '423456789',
-            username: 'Ivan',
-          },
-          {
-            id: '523456789',
-            username: 'Hans',
-          },
-          {
-            id: '62345689',
-            username: 'Pierre',
-          },
-          {
-            id: '723456789',
-            username: 'Väinämöinen',
-          },
-          {
-            id: '82356789',
-            username: 'Jack',
-          },
-          {
-            id: '92356789',
-            username: 'Umberto',
-          },
-        ];
-        */
       }
     } else {
       // Return error object
@@ -399,10 +349,6 @@ Meteor.methods({
         console.log('3 POST a ok, result=', result);
         console.log('3 a ok, response=', response);
       } catch (err) {
-        console.log(+new Date(), ' 3 POST b err=', err);
-      //  response.status = err.response.statusCode || 500;
-      //  response.content = err.response.content || err.error;
-
         // Return error object
         throw new Meteor.Error(err.message);
       }
@@ -573,4 +519,41 @@ Meteor.methods({
     }
     return response;
   },
+  informTenantUser (userlist, notificationType, tenantName) {
+    // Check the type of notification
+    let text;
+    if (notificationType === "userRoleChange") {
+      text = ` has changes in roles in tenant ${tenantName}.`;
+      console.log('Notify change');
+    } else if (notificationType === "userRemoval") {
+      text = ` is no more a user of tenant ${tenantName}. `;
+      console.log('Notify user removal');
+    }
+
+    // Send notification for each user in list
+    if (text) {
+      // Get settings
+      const settings = Settings.findOne();
+
+      // Check if email settings are configured
+      if (settings.mail && settings.mail.enabled) {
+        userlist.forEach( user => {
+          console.log('postia tulossa=', user);
+          // send notification
+          let message = user.name;
+          message = message.concat(text);
+          console.log('actual sending to ', user.email);
+          console.log('message=', message);
+
+          // Send the e-mail
+          Email.send({
+            to: settings.mail.toEmail,
+            from: settings.mail.fromEmail,
+            subject: `Tenant user related changes`,
+            text,
+          });
+        });
+      }
+    }
+  },
 });