From 829e9c16334260410b03b1c122bab8b3eb64509c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20Sanz=20Garc=C3=ADa?= <esanz-garcia@gitlab.com>
Date: Fri, 26 Jan 2024 14:20:46 +0100
Subject: [PATCH] Use group ID instead of root group ID for query

In the backend counterpart MR, it has been decided to use the group ID
instead of the top-level group ID for getting the SAML users:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141040#note_1743246071

This API query is not yet been used because it is under a feature flag,
`group_users_saml`, that is currently off in all environments. So it is
safe to deploy.
---
 .../invite_members/components/invite_members_modal.vue      | 2 +-
 .../invite_members/components/members_token_select.vue      | 4 ++--
 .../invite_members/components/members_token_select_spec.js  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/invite_members/components/invite_members_modal.vue b/app/assets/javascripts/invite_members/components/invite_members_modal.vue
index 4f6ca5c5638faa..c9aa00830786d3 100644
--- a/app/assets/javascripts/invite_members/components/invite_members_modal.vue
+++ b/app/assets/javascripts/invite_members/components/invite_members_modal.vue
@@ -509,7 +509,7 @@ export default {
         :exception-state="exceptionState"
         :users-filter="usersFilter"
         :filter-id="filterId"
-        :root-group-id="rootId"
+        :group-id="id"
         :invalid-members="invalidMembers"
         @clear="clearValidation"
         @token-remove="removeToken"
diff --git a/app/assets/javascripts/invite_members/components/members_token_select.vue b/app/assets/javascripts/invite_members/components/members_token_select.vue
index 0e3f2890b29898..4e2165dec6bdab 100644
--- a/app/assets/javascripts/invite_members/components/members_token_select.vue
+++ b/app/assets/javascripts/invite_members/components/members_token_select.vue
@@ -62,7 +62,7 @@ export default {
       required: false,
       default: '',
     },
-    rootGroupId: {
+    groupId: {
       type: String,
       required: true,
     },
@@ -149,7 +149,7 @@ export default {
     },
     retrieveUsersRequest() {
       if (this.usersFilter === USERS_FILTER_SAML_PROVIDER_ID && this.glFeatures.groupUserSaml) {
-        return getGroupUsers(this.query, this.rootGroupId, this.queryOptions);
+        return getGroupUsers(this.query, this.groupId, this.queryOptions);
       }
 
       return getUsers(this.query, this.queryOptions);
diff --git a/spec/frontend/invite_members/components/members_token_select_spec.js b/spec/frontend/invite_members/components/members_token_select_spec.js
index a2b21367388884..7bfa49731080ca 100644
--- a/spec/frontend/invite_members/components/members_token_select_spec.js
+++ b/spec/frontend/invite_members/components/members_token_select_spec.js
@@ -10,7 +10,7 @@ import * as Sentry from '~/sentry/sentry_browser_wrapper';
 
 const label = 'testgroup';
 const placeholder = 'Search for a member';
-const rootGroupId = '31';
+const groupId = '31';
 const user1 = { id: 1, name: 'John Smith', username: 'one_1', avatar_url: '' };
 const user2 = { id: 2, name: 'Jane Doe', username: 'two_2', avatar_url: '' };
 const allUsers = [user1, user2];
@@ -22,7 +22,7 @@ const createComponent = (props = {}, glFeatures = {}) => {
       ariaLabelledby: label,
       invalidMembers: {},
       placeholder,
-      rootGroupId,
+      groupId,
       ...props,
     },
     provide: { glFeatures },
@@ -247,7 +247,7 @@ describe('MembersTokenSelect', () => {
     });
 
     it('calls the group API with correct parameters', () => {
-      expect(UserApi.getGroupUsers).toHaveBeenCalledWith(searchParam, rootGroupId, {
+      expect(UserApi.getGroupUsers).toHaveBeenCalledWith(searchParam, groupId, {
         active: true,
         include_saml_users: true,
         include_service_accounts: true,
-- 
GitLab