Skip to content

Commit 8b4718a

Browse files
fix: TT-583 unable to set admin role to users
1 parent a29b4f7 commit 8b4718a

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

utils/azure_users.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,15 @@ def add_user_to_group(self, user_id, group_name):
187187
headers=HTTP_PATCH_HEADERS,
188188
)
189189
assert 204 == response.status_code
190-
for (cache_group_name, user_ids) in self.groups_and_users:
191-
if group_name == cache_group_name:
192-
if user_id not in user_ids:
193-
user_ids.append(user_id)
190+
if self.groups_and_users is None:
191+
self.groups_and_users = [(group_name, [user_id])]
192+
elif group_name not in [gn for (gn, ul) in self.groups_and_users]:
193+
self.groups_and_users.append((group_name, [user_id]))
194+
else:
195+
for (cache_group_name, user_ids) in self.groups_and_users:
196+
if group_name == cache_group_name:
197+
if user_id not in user_ids:
198+
user_ids.append(user_id)
194199
return self.get_user(user_id)
195200

196201
def remove_user_from_group(self, user_id, group_name):
@@ -204,10 +209,11 @@ def remove_user_from_group(self, user_id, group_name):
204209
headers=HTTP_PATCH_HEADERS,
205210
)
206211
assert 204 == response.status_code
207-
for (cache_group_name, user_ids) in self.groups_and_users:
208-
if group_name == cache_group_name:
209-
if user_id in user_ids:
210-
user_ids.remove(user_id)
212+
if self.groups_and_users is not None:
213+
for (cache_group_name, user_ids) in self.groups_and_users:
214+
if group_name == cache_group_name:
215+
if user_id in user_ids:
216+
user_ids.remove(user_id)
211217
return self.get_user(user_id)
212218

213219
def get_non_test_users(self) -> List[AzureUser]:

0 commit comments

Comments
 (0)