Skip to content

Commit f73d114

Browse files
committed
remove requesting account in accountspace_nb
Signed-off-by: shirady <57721533+shirady@users.noreply.github.com> (cherry picked from commit e58b242f97d0e4dc6a598cb2bf2305b71a3c20a9)
1 parent 580066d commit f73d114

File tree

1 file changed

+20
-36
lines changed

1 file changed

+20
-36
lines changed

src/sdk/accountspace_nb.js

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ class AccountSpaceNB {
3636
async create_user(params, account_sdk) {
3737

3838
const requesting_account = account_sdk.requesting_account;
39-
const account_email_wrapped = account_util.get_account_email_from_username(params.username, requesting_account._id.toString());
39+
const account_email_wrapped = account_util.get_account_email_from_username(params.username, requesting_account._id);
4040
const req = {
4141
name: params.username, // actual username saved
4242
email: account_email_wrapped, // unique email generated from username lowercase and root account id
4343
has_login: false,
4444
s3_access: true,
4545
allow_bucket_creation: true,
46-
owner: requesting_account._id.toString(),
46+
owner: requesting_account._id,
4747
iam_path: params.iam_path,
4848
roles: ['admin'],
4949
// TODO: default_resource remove
50-
default_resource: requesting_account.default_resource.name,
50+
default_resource: requesting_account.default_resource,
5151
};
52-
const iam_account = await account_sdk.rpc_client.account.create_user(req, requesting_account);
52+
const iam_account = await account_sdk.rpc_client.account.create_user(req);
5353
// TODO : Clean account cache
5454
// TODO : Send Event
5555
return {
@@ -62,27 +62,23 @@ class AccountSpaceNB {
6262
}
6363

6464
async get_user(params, account_sdk) {
65-
const requesting_account = account_sdk.requesting_account;
66-
return await account_sdk.rpc_client.account.get_user(params, requesting_account);
65+
return await account_sdk.rpc_client.account.get_user(params);
6766
}
6867

6968
async update_user(params, account_sdk) {
70-
const requesting_account = account_sdk.requesting_account;
71-
return await account_sdk.rpc_client.account.update_user(params, requesting_account);
69+
return await account_sdk.rpc_client.account.update_user(params);
7270
// TODO : Clean account cache
7371
// TODO : Send Event
7472
}
7573

7674
async delete_user(params, account_sdk) {
77-
const requesting_account = account_sdk.requesting_account;
78-
return await account_sdk.rpc_client.account.delete_user(params, requesting_account);
75+
return await account_sdk.rpc_client.account.delete_user(params);
7976
// TODO : clean account cache
8077

8178
}
8279

8380
async list_users(params, account_sdk) {
84-
const requesting_account = account_sdk.requesting_account;
85-
return await account_sdk.rpc_client.account.list_users(params, requesting_account);
81+
return await account_sdk.rpc_client.account.list_users(params);
8682

8783
}
8884

@@ -91,73 +87,61 @@ class AccountSpaceNB {
9187
/////////////////////////////////
9288

9389
async create_access_key(params, account_sdk) {
94-
const requesting_account = account_sdk.requesting_account;
95-
return await account_sdk.rpc_client.account.create_access_key(params, requesting_account);
90+
return await account_sdk.rpc_client.account.create_access_key(params);
9691
}
9792

9893
async get_access_key_last_used(params, account_sdk) {
99-
const requesting_account = account_sdk.requesting_account;
100-
return await account_sdk.rpc_client.account.get_access_key_last_used(params, requesting_account);
94+
return await account_sdk.rpc_client.account.get_access_key_last_used(params);
10195
}
10296

10397
async update_access_key(params, account_sdk) {
104-
const requesting_account = account_sdk.requesting_account;
105-
return await account_sdk.rpc_client.account.update_access_key(params, requesting_account);
98+
return await account_sdk.rpc_client.account.update_access_key(params);
10699
// TODO : clean account cache
107100
}
108101

109102
async delete_access_key(params, account_sdk) {
110-
const requesting_account = account_sdk.requesting_account;
111-
return await account_sdk.rpc_client.account.delete_access_key(params, requesting_account);
103+
return await account_sdk.rpc_client.account.delete_access_key(params);
112104
// TODO : clean account cache
113105
}
114106

115107
async list_access_keys(params, account_sdk) {
116-
const requesting_account = account_sdk.requesting_account;
117-
return await account_sdk.rpc_client.account.list_access_keys(params, requesting_account);
108+
return await account_sdk.rpc_client.account.list_access_keys(params);
118109
}
119110

120111
///////////////////////////
121112
// ACCOUNT TAGS METHODS //
122113
///////////////////////////
123114

124115
async tag_user(params, account_sdk) {
125-
const requesting_account = account_sdk.requesting_account;
126-
return await account_sdk.rpc_client.account.tag_user(params, requesting_account);
116+
return await account_sdk.rpc_client.account.tag_user(params);
127117
}
128118

129119
async untag_user(params, account_sdk) {
130-
const requesting_account = account_sdk.requesting_account;
131-
return await account_sdk.rpc_client.account.untag_user(params, requesting_account);
120+
return await account_sdk.rpc_client.account.untag_user(params);
132121
}
133122

134123
async list_user_tags(params, account_sdk) {
135-
const requesting_account = account_sdk.requesting_account;
136-
return await account_sdk.rpc_client.account.list_user_tags(params, requesting_account);
124+
return await account_sdk.rpc_client.account.list_user_tags(params);
137125
}
138126

139127
////////////////////
140128
// POLICY METHODS //
141129
////////////////////
142130

143131
async put_user_policy(params, account_sdk) {
144-
const requesting_account = account_sdk.requesting_account;
145-
return await account_sdk.rpc_client.account.put_user_policy(params, requesting_account);
132+
return await account_sdk.rpc_client.account.put_user_policy(params);
146133
}
147134

148135
async get_user_policy(params, account_sdk) {
149-
const requesting_account = account_sdk.requesting_account;
150-
return await account_sdk.rpc_client.account.get_user_policy(params, requesting_account);
136+
return await account_sdk.rpc_client.account.get_user_policy(params);
151137
}
152138

153139
async delete_user_policy(params, account_sdk) {
154-
const requesting_account = account_sdk.requesting_account;
155-
return await account_sdk.rpc_client.account.delete_user_policy(params, requesting_account);
140+
return await account_sdk.rpc_client.account.delete_user_policy(params);
156141
}
157142

158143
async list_user_policies(params, account_sdk) {
159-
const requesting_account = account_sdk.requesting_account;
160-
return await account_sdk.rpc_client.account.list_user_policies(params, requesting_account);
144+
return await account_sdk.rpc_client.account.list_user_policies(params);
161145
}
162146
}
163147

0 commit comments

Comments
 (0)