update

Author: Nivedithaa Mahendran

src/mas/devops/users.py

@@ -404,7 +404,7 @@ def get_or_create_user(self, payload):
 
         raise Exception(f"{response.status_code} {response.text}")
 
-    def set_user_group_reassignment_auth(self, resource_id, groupreassign, manage_api_key):
+    def set_user_group_reassignment_auth(self, user_id, resource_id, groupreassign, manage_api_key):
         """
         Set group reassignment authorization for a user via Manage API.
 
@@ -443,6 +443,7 @@ def set_user_group_reassignment_auth(self, resource_id, groupreassign, manage_ap
 
         payload = {
             "maxuser": {
+                "userid": user_id,
                 "grpreassignauth": groupreassign
             }
         }
@@ -1712,7 +1713,7 @@ def create_initial_user_for_saas(self, user, user_type, groupreassign=None):
                     self.add_user_to_manage_group(user_id, manage_security_group, maxadmin_manage_api_key)
             if Version(self.mas_version) >= Version('9.1') and user_type == "PRIMARY" and groupreassign is not None:
                 if resource_id:
-                    self.set_user_group_reassignment_auth(resource_id, groupreassign, maxadmin_manage_api_key)
+                    self.set_user_group_reassignment_auth(user_id, resource_id, groupreassign, maxadmin_manage_api_key)
                 else:
                     self.logger.warning(f"Cannot set group reassignment auth: resource_id not found for user {user_id}")
 

test/src/test_users.py

@@ -2246,10 +2246,10 @@ def test_create_initial_user_for_saas(
         else:  # 9.1
             user_utils.add_user_to_manage_group.assert_not_called()
             if user_type == "PRIMARY":
-                # For 9.1, resource_id is passed instead of user_id
+                # For 9.1, both user_id and resource_id are passed
                 actual_user_id = user_id if user_id is not None else user_email
                 resource_id = f"_{actual_user_id.replace('@', '_').replace('.', '_')}_resource_id"
-                user_utils.set_user_group_reassignment_auth.assert_called_once_with(resource_id, [{"groupname": "USERMANAGEMENT"}], manage_api_key)
+                user_utils.set_user_group_reassignment_auth.assert_called_once_with(actual_user_id, resource_id, [{"groupname": "USERMANAGEMENT"}], manage_api_key)
             else:
                 user_utils.set_user_group_reassignment_auth.assert_not_called()
     else: