remove system_store use in account_nb

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

Author: shirady

src/sdk/accountspace_nb.js

@@ -2,7 +2,6 @@
 'use strict';
 
 const account_util = require('../util/account_util');
-const system_store = require('..//server/system_services/system_store').get_instance();
 const { IAM_DEFAULT_PATH} = require('../endpoint/iam/iam_constants');
 
 /* 
@@ -36,7 +35,7 @@ class AccountSpaceNB {
 
     async create_user(params, account_sdk) {
 
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         const account_name = account_util.get_account_name_from_username(params.username, requesting_account._id.toString());
         const req = {
                 name: account_name,
@@ -63,27 +62,26 @@ class AccountSpaceNB {
     }
 
     async get_user(params, account_sdk) {
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.get_user(params, requesting_account);
     }
 
     async update_user(params, account_sdk) {
-
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.update_user(params, requesting_account);
         // TODO : Clean account cache
         // TODO : Send Event
     }
 
     async delete_user(params, account_sdk) {
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.delete_user(params, requesting_account);
         // TODO : clean account cache
 
     }
 
     async list_users(params, account_sdk) {
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.list_users(params, requesting_account);
 
     }
@@ -93,33 +91,29 @@ class AccountSpaceNB {
     /////////////////////////////////
 
     async create_access_key(params, account_sdk) {
-
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.create_access_key(params, requesting_account);
     }
 
     async get_access_key_last_used(params, account_sdk) {
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.get_access_key_last_used(params, requesting_account);
     }
 
     async update_access_key(params, account_sdk) {
-
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.update_access_key(params, requesting_account);
         // TODO : clean account cache
     }
 
     async delete_access_key(params, account_sdk) {
-
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.delete_access_key(params, requesting_account);
         // TODO : clean account cache
     }
 
     async list_access_keys(params, account_sdk) {
-
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.list_access_keys(params, requesting_account);
     }
 
@@ -128,44 +122,41 @@ class AccountSpaceNB {
     ///////////////////////////
 
     async tag_user(params, account_sdk) {
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.tag_user(params, requesting_account);
     }
 
     async untag_user(params, account_sdk) {
-
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.untag_user(params, requesting_account);
     }
 
     async list_user_tags(params, account_sdk) {
-
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.list_user_tags(params, requesting_account);
-
     }
 
     ////////////////////
     // POLICY METHODS //
     ////////////////////
 
     async put_user_policy(params, account_sdk) {
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.put_user_policy(params, requesting_account);
     }
 
     async get_user_policy(params, account_sdk) {
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.get_user_policy(params, requesting_account);
     }
 
     async delete_user_policy(params, account_sdk) {
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.delete_user_policy(params, requesting_account);
     }
 
     async list_user_policies(params, account_sdk) {
-        const requesting_account = system_store.get_account_by_email(account_sdk.requesting_account.email);
+        const requesting_account = account_sdk.requesting_account;
         return await account_sdk.rpc_client.account.list_user_policies(params, requesting_account);
     }
 }