continue removing calls to system stroe

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

Author: shirady

src/server/system_services/account_server.js

@@ -1225,12 +1225,11 @@ async function get_user(req) {
 async function update_user(req) {
 
     const action = IAM_ACTIONS.UPDATE_USER;
-    const requesting_account = system_store.get_account_by_email(req.account.email);
+    const requesting_account = req.account;
     const old_username = account_util.get_account_name_from_username(req.rpc_params.username, requesting_account._id.toString());
     account_util._check_if_requesting_account_is_root_account(action, requesting_account,
             { username: req.rpc_params.username, iam_path: req.rpc_params.new_iam_path });
-    account_util._check_if_account_exists(action, old_username);
-    const requested_account = system_store.get_account_by_email(old_username);
+    const requested_account = account_util._check_if_account_exists(action, old_username);
     let iam_path = requested_account.iam_path;
     let user_name = account_util.get_iam_username(requested_account.name.unwrap());
     // Change to complete user name
@@ -1270,8 +1269,7 @@ async function delete_user(req) {
     const requesting_account = req.account;
     const username = account_util.get_account_name_from_username(req.rpc_params.username, requesting_account._id.toString());
     account_util._check_if_requesting_account_is_root_account(action, requesting_account, { username: req.rpc_params.username });
-    account_util._check_if_account_exists(action, username);
-    const requested_account = system_store.get_account_by_email(username);
+    const requested_account = account_util._check_if_account_exists(action, username);
     account_util._check_if_requested_account_is_root_account_or_IAM_user(action, requesting_account, requested_account);
     account_util._check_if_requested_is_owned_by_root_account(action, requesting_account, requested_account);
     account_util._check_if_user_does_not_have_resources_before_deletion(action, requested_account);
@@ -1423,12 +1421,11 @@ async function delete_access_key(req) {
 async function tag_user(req) {
     const action = IAM_ACTIONS.TAG_USER;
     const requesting_account = req.account;
-    const username = account_util.get_account_name_from_username(req.rpc_params.username, requesting_account._id.toString());
+    const email_wrapped = account_util.get_account_name_from_username(req.rpc_params.username, requesting_account._id.toString());
 
     account_util._check_if_requesting_account_is_root_account(action, requesting_account, { username: req.rpc_params.username });
-    account_util._check_if_account_exists(action, username);
+    const requested_account = account_util._check_if_account_exists(action, email_wrapped);
 
-    const requested_account = system_store.get_account_by_email(username);
     account_util._check_if_requested_account_is_root_account_or_IAM_user(action, requesting_account, requested_account);
     account_util._check_if_requested_is_owned_by_root_account(action, requesting_account, requested_account);
 
@@ -1465,12 +1462,10 @@ async function tag_user(req) {
 async function untag_user(req) {
     const action = IAM_ACTIONS.UNTAG_USER;
     const requesting_account = req.account;
-    const username = account_util.get_account_name_from_username(req.rpc_params.username, requesting_account._id.toString());
+    const email_wrapped = account_util.get_account_name_from_username(req.rpc_params.username, requesting_account._id.toString());
 
     account_util._check_if_requesting_account_is_root_account(action, requesting_account, { username: req.rpc_params.username });
-    account_util._check_if_account_exists(action, username);
-
-    const requested_account = system_store.get_account_by_email(username);
+    const requested_account = account_util._check_if_account_exists(action, email_wrapped);
     account_util._check_if_requested_account_is_root_account_or_IAM_user(action, requesting_account, requested_account);
     account_util._check_if_requested_is_owned_by_root_account(action, requesting_account, requested_account);
 
@@ -1494,12 +1489,10 @@ async function untag_user(req) {
 async function list_user_tags(req) {
     const action = IAM_ACTIONS.LIST_USER_TAGS;
     const requesting_account = req.account;
-    const username = account_util.get_account_name_from_username(req.rpc_params.username, requesting_account._id.toString());
+    const email_wrapped = account_util.get_account_name_from_username(req.rpc_params.username, requesting_account._id.toString());
 
     account_util._check_if_requesting_account_is_root_account(action, requesting_account, { username: req.rpc_params.username });
-    account_util._check_if_account_exists(action, username);
-
-    const requested_account = system_store.get_account_by_email(username);
+    const requested_account = account_util._check_if_account_exists(action, email_wrapped);
     account_util._check_if_requested_account_is_root_account_or_IAM_user(action, requesting_account, requested_account);
     account_util._check_if_requested_is_owned_by_root_account(action, requesting_account, requested_account);
 

src/util/account_util.js

@@ -328,6 +328,7 @@ function _check_if_account_exists(action, email_wrapped) {
         const message_with_details = `The user with name ${get_iam_username(email_wrapped.unwrap())} cannot be found.`;
         throw new RpcError('NO_SUCH_ENTITY', message_with_details);
     }
+    return account;
 }
 
 function _check_root_account_owns_user(root_account, user_account) {