CR changes

Signed-off-by: shirady <57721533+shirady@users.noreply.github.com>

Author: shirady

src/server/system_services/account_server.js

@@ -1264,15 +1264,13 @@ async function update_user(req) {
         }
     });
 
-    const sys_id = req.rpc_params.new_system_parameters ?
-        system_store.parse_system_store_id(req.rpc_params.new_system_parameters.new_system_id) :
-        req.system._id;
+    const sys_id = account_util.get_system_id_for_events(req);
     Dispatcher.instance().activity({
         event: 'account.update',
         level: 'info',
         system: (req.system && req.system._id) || sys_id,
         actor: requesting_account._id,
-        account: requesting_account._id,
+        account: requested_account._id,
         desc: `${requested_account.email.unwrap()} was updated by ${requesting_account.email.unwrap()}`,
     });
 
@@ -1396,15 +1394,13 @@ async function update_access_key(req) {
         }
     });
 
-    const sys_id = req.rpc_params.new_system_parameters ?
-        system_store.parse_system_store_id(req.rpc_params.new_system_parameters.new_system_id) :
-        req.system._id;
+    const sys_id = account_util.get_system_id_for_events(req);
     Dispatcher.instance().activity({
         event: 'account.update_credentials',
         level: 'info',
         system: (req.system && req.system._id) || sys_id,
         actor: requesting_account._id,
-        account: requesting_account._id,
+        account: requested_account._id,
         desc: `Credentials for ${requested_account.email.unwrap()} were updated by ${requesting_account.email.unwrap()}`,
     });
 }
@@ -1447,15 +1443,13 @@ async function delete_access_key(req) {
         }
     });
 
-    const sys_id = req.rpc_params.new_system_parameters ?
-        system_store.parse_system_store_id(req.rpc_params.new_system_parameters.new_system_id) :
-        req.system._id;
+    const sys_id = account_util.get_system_id_for_events(req);
     Dispatcher.instance().activity({
         event: 'account.delete_credentials',
         level: 'info',
-        system: (req.system && req.system._id) || sys_id,
+        system: sys_id,
         actor: requesting_account._id,
-        account: requesting_account._id,
+        account: requested_account._id,
         desc: `Credentials for ${requested_account.email.unwrap()} were deleted by ${requesting_account.email.unwrap()}`,
     });
 }

src/util/account_util.js

@@ -773,6 +773,12 @@ function get_sorted_list_tags_for_user(user_tagging) {
     }));
 }
 
+function get_system_id_for_events(req) {
+        const sys_id = req.rpc_params.new_system_parameters ?
+        system_store.parse_system_store_id(req.rpc_params.new_system_parameters.new_system_id) :
+        req.system && req.system._id;
+        return sys_id;
+}
 
 exports.delete_account = delete_account;
 exports.create_account = create_account;
@@ -801,3 +807,4 @@ exports.return_list_member = return_list_member;
 exports.get_owner_account_id = get_owner_account_id;
 exports.get_sorted_list_tags_for_user = get_sorted_list_tags_for_user;
 exports._check_if_iam_user_belongs_to_account_owner_by_access_key = _check_if_iam_user_belongs_to_account_owner_by_access_key;
+exports.get_system_id_for_events = get_system_id_for_events;