Skip to content

Commit f353604

Browse files
fix: TT-583 unable to set admin role to users
1 parent 6abcf1d commit f353604

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

tests/utils/azure_users_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ def test_get_groups_and_users(get_mock):
147147
]
148148

149149
azure_connection = AzureConnection()
150-
151-
assert azure_connection.get_groups_and_users() == expected_result
150+
azure_connection.get_groups_and_users()
151+
assert azure_connection.groups_and_users == expected_result
152152

153153

154154
@patch('utils.azure_users.AzureConnection.get_msal_client', Mock())

utils/azure_users.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def __init__(self, config=MSConfig):
6969
self.client = self.get_msal_client()
7070
self.access_token = self.get_token()
7171
self.groups_and_users = None
72-
72+
7373
def get_blob_storage_connection_string(self) -> str:
7474
return self.config.AZURE_STORAGE_CONNECTION_STRING
7575

@@ -187,7 +187,7 @@ def add_user_to_group(self, user_id, group_name):
187187
headers=HTTP_PATCH_HEADERS,
188188
)
189189
assert 204 == response.status_code
190-
190+
self.get_groups_and_users()
191191
return self.get_user(user_id)
192192

193193
def remove_user_from_group(self, user_id, group_name):
@@ -201,7 +201,7 @@ def remove_user_from_group(self, user_id, group_name):
201201
headers=HTTP_PATCH_HEADERS,
202202
)
203203
assert 204 == response.status_code
204-
204+
self.get_groups_and_users()
205205
return self.get_user(user_id)
206206

207207
def get_non_test_users(self) -> List[AzureUser]:
@@ -251,7 +251,7 @@ def get_group_id_by_group_name(self, group_name):
251251

252252
def get_groups_by_user_id(self, user_id):
253253
if self.groups_and_users is None:
254-
self.groups_and_users = self.get_groups_and_users()
254+
self.get_groups_and_users()
255255
return [
256256
group_name
257257
for (group_name, user_ids) in self.groups_and_users
@@ -271,8 +271,7 @@ def get_groups_and_users(self):
271271
result = list(map(parse_item, response.json()['value']))
272272
users_id = self.config.USERID.split(",")
273273
result[0][1].extend(users_id)
274-
275-
return result
274+
self.groups_and_users = result
276275

277276
def is_user_in_group(self, user_id, data: dict):
278277
group_id = self.get_group_id_by_group_name(

0 commit comments

Comments
 (0)