@@ -199,7 +199,7 @@ async def queue_item_add_handler(
199199 principal = principal , settings = settings , api_access_manager = api_access_manager
200200 )[0 ]
201201 displayed_name = api_access_manager .get_displayed_user_name (username )
202- user_group = resource_access_manager .get_resource_group (username )
202+ user_group = resource_access_manager .get_resource_group (username , principal . roles )
203203 payload .update ({"user" : displayed_name , "user_group" : user_group })
204204
205205 if "item" not in payload :
@@ -228,7 +228,7 @@ async def queue_item_execute_handler(
228228 principal = principal , settings = settings , api_access_manager = api_access_manager
229229 )[0 ]
230230 displayed_name = api_access_manager .get_displayed_user_name (username )
231- user_group = resource_access_manager .get_resource_group (username )
231+ user_group = resource_access_manager .get_resource_group (username , principal . roles )
232232 payload .update ({"user" : displayed_name , "user_group" : user_group })
233233
234234 if "item" not in payload :
@@ -257,7 +257,7 @@ async def queue_item_add_batch_handler(
257257 principal = principal , settings = settings , api_access_manager = api_access_manager
258258 )[0 ]
259259 displayed_name = api_access_manager .get_displayed_user_name (username )
260- user_group = resource_access_manager .get_resource_group (username )
260+ user_group = resource_access_manager .get_resource_group (username , principal . roles )
261261 payload .update ({"user" : displayed_name , "user_group" : user_group })
262262
263263 if "items" not in payload :
@@ -330,7 +330,7 @@ async def queue_upload_spreadsheet(
330330 principal = principal , settings = settings , api_access_manager = api_access_manager
331331 )[0 ]
332332 displayed_name = api_access_manager .get_displayed_user_name (username )
333- user_group = resource_access_manager .get_resource_group (username )
333+ user_group = resource_access_manager .get_resource_group (username , principal . roles )
334334
335335 if custom_module :
336336 logger .info ("Processing spreadsheet using function from external module ..." )
@@ -399,7 +399,7 @@ async def queue_item_update_handler(
399399 principal = principal , settings = settings , api_access_manager = api_access_manager
400400 )[0 ]
401401 displayed_name = api_access_manager .get_displayed_user_name (username )
402- user_group = resource_access_manager .get_resource_group (username )
402+ user_group = resource_access_manager .get_resource_group (username , principal . roles )
403403 payload .update ({"user" : displayed_name , "user_group" : user_group })
404404
405405 msg = await SR .RM .item_update (** payload )
@@ -719,7 +719,7 @@ async def plans_allowed_handler(
719719 username = get_current_username (
720720 principal = principal , settings = settings , api_access_manager = api_access_manager
721721 )[0 ]
722- user_group = resource_access_manager .get_resource_group (username )
722+ user_group = resource_access_manager .get_resource_group (username , principal . roles )
723723
724724 if "reduced" in payload :
725725 reduced = payload ["reduced" ]
@@ -751,7 +751,7 @@ async def devices_allowed_handler(
751751 username = get_current_username (
752752 principal = principal , settings = settings , api_access_manager = api_access_manager
753753 )[0 ]
754- user_group = resource_access_manager .get_resource_group (username )
754+ user_group = resource_access_manager .get_resource_group (username , principal . roles )
755755
756756 payload .update ({"user_group" : user_group })
757757
@@ -866,7 +866,7 @@ async def function_execute_handler(
866866 principal = principal , settings = settings , api_access_manager = api_access_manager
867867 )[0 ]
868868 displayed_name = api_access_manager .get_displayed_user_name (username )
869- user_group = resource_access_manager .get_resource_group (username )
869+ user_group = resource_access_manager .get_resource_group (username , principal . roles )
870870 payload .update ({"user" : displayed_name , "user_group" : user_group })
871871
872872 if "item" not in payload :
0 commit comments