From 610ab9b1bb312d2ad3fe80145fa215555d6c753d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Sanz=20Garc=C3=ADa?= Date: Fri, 26 Apr 2024 10:14:16 +0200 Subject: [PATCH] Complete clean up of the group_user_saml FF In https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149815+we forgot to remove a few uses of the `group_user_saml`. We are cleaning that now. --- app/assets/javascripts/api/user_api.js | 20 ------------------- .../components/invite_members_modal.vue | 1 - .../components/members_token_select.vue | 12 +---------- spec/frontend/api/user_api_spec.js | 14 ------------- .../components/members_token_select_spec.js | 2 -- 5 files changed, 1 insertion(+), 48 deletions(-) diff --git a/app/assets/javascripts/api/user_api.js b/app/assets/javascripts/api/user_api.js index 302de9760800c1..c056b42b5b6df4 100644 --- a/app/assets/javascripts/api/user_api.js +++ b/app/assets/javascripts/api/user_api.js @@ -4,7 +4,6 @@ import { buildApiUrl } from './api_utils'; const USER_COUNTS_PATH = '/api/:version/user_counts'; const USERS_PATH = '/api/:version/users.json'; -const USERS_SAML_PATH = '/api/:version/groups/:id/users.json'; const USER_PATH = '/api/:version/users/:id'; const USER_STATUS_PATH = '/api/:version/users/:id/status'; const USER_PROJECTS_PATH = '/api/:version/users/:id/projects'; @@ -26,25 +25,6 @@ export function getUsers(query, options) { }); } -/** - * Returns a list of SAML users and service accounts that contains the query string. - * If the query string is less than 3 characters it returns an empty list. - * - * @param {string} query - query string to search - * @param {string} groupId -- top-level group id - * @param {object} options - */ -export function getGroupUsers(query, groupId, options) { - const url = buildApiUrl(USERS_SAML_PATH).replace(':id', groupId); - return axios.get(url, { - params: { - search: query, - per_page: DEFAULT_PER_PAGE, - ...options, - }, - }); -} - export function getUser(id, options) { const url = buildApiUrl(USER_PATH).replace(':id', encodeURIComponent(id)); return axios.get(url, { 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 2314268f4b2589..91264709cdbde8 100644 --- a/app/assets/javascripts/invite_members/components/invite_members_modal.vue +++ b/app/assets/javascripts/invite_members/components/invite_members_modal.vue @@ -474,7 +474,6 @@ export default { :exception-state="exceptionState" :users-filter="usersFilter" :filter-id="filterId" - :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 a1d7b7fed8c97a..8ca913cebd87ae 100644 --- a/app/assets/javascripts/invite_members/components/members_token_select.vue +++ b/app/assets/javascripts/invite_members/components/members_token_select.vue @@ -2,9 +2,8 @@ import { GlTokenSelector, GlAvatar, GlAvatarLabeled, GlIcon, GlSprintf } from '@gitlab/ui'; import { debounce, isEmpty } from 'lodash'; import { __ } from '~/locale'; -import { getUsers, getGroupUsers } from '~/rest_api'; +import { getUsers } from '~/rest_api'; import * as Sentry from '~/sentry/sentry_browser_wrapper'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { memberName } from '../utils/member_utils'; import { SEARCH_DELAY, @@ -22,7 +21,6 @@ export default { GlIcon, GlSprintf, }, - mixins: [glFeatureFlagsMixin()], props: { placeholder: { type: String, @@ -57,10 +55,6 @@ export default { required: false, default: '', }, - groupId: { - type: String, - required: true, - }, }, data() { return { @@ -132,10 +126,6 @@ export default { })); }, retrieveUsersRequest() { - if (this.usersFilter === USERS_FILTER_SAML_PROVIDER_ID && this.glFeatures.groupUserSaml) { - return getGroupUsers(this.query, this.groupId, this.queryOptions); - } - return getUsers(this.query, this.queryOptions); }, retrieveUsers: debounce(async function debouncedRetrieveUsers() { diff --git a/spec/frontend/api/user_api_spec.js b/spec/frontend/api/user_api_spec.js index aeddf6b9ae135f..eb527c8b40fe5e 100644 --- a/spec/frontend/api/user_api_spec.js +++ b/spec/frontend/api/user_api_spec.js @@ -5,7 +5,6 @@ import followers from 'test_fixtures/api/users/followers/get.json'; import following from 'test_fixtures/api/users/following/get.json'; import { getUsers, - getGroupUsers, followUser, unfollowUser, associationsCount, @@ -51,19 +50,6 @@ describe('~/api/user_api', () => { }); }); - describe('getSAMLUsers', () => { - it('calls correct URL with expected query parameters', async () => { - const expectedUrl = '/api/v4/groups/34/users.json'; - axiosMock.onGet(expectedUrl).replyOnce(HTTP_STATUS_OK); - - await getGroupUsers('den', '34', { include_service_accounts: true }); - - const { url, params } = axiosMock.history.get[0]; - expect(url).toBe(expectedUrl); - expect(params).toMatchObject({ search: 'den', include_service_accounts: true }); - }); - }); - describe('followUser', () => { it('calls correct URL and returns expected response', async () => { const expectedUrl = '/api/v4/users/1/follow'; 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 9233d89e5c1828..06a1405c8a1284 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,6 @@ import * as Sentry from '~/sentry/sentry_browser_wrapper'; const label = 'testgroup'; const placeholder = 'Search for a member'; -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 +21,6 @@ const createComponent = (props = {}, glFeatures = {}) => { ariaLabelledby: label, invalidMembers: {}, placeholder, - groupId, ...props, }, provide: { glFeatures }, -- GitLab