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 0f5b437bb569f8e1d8d78eb65e648dca74e6808e..a1d7b7fed8c97a98f2a93bddb1091f39eabb42b9 100644 --- a/app/assets/javascripts/invite_members/components/members_token_select.vue +++ b/app/assets/javascripts/invite_members/components/members_token_select.vue @@ -85,16 +85,9 @@ export default { }, queryOptions() { if (this.usersFilter === USERS_FILTER_SAML_PROVIDER_ID) { - if (!this.glFeatures.groupUserSaml) { - return { - saml_provider_id: this.filterId, - ...this.$options.defaultQueryOptions, - }; - } return { - active: true, - include_saml_users: true, - include_service_accounts: true, + saml_provider_id: this.filterId, + ...this.$options.defaultQueryOptions, }; } return this.$options.defaultQueryOptions; diff --git a/config/feature_flags/development/group_user_saml.yml b/config/feature_flags/development/group_user_saml.yml deleted file mode 100644 index f3a03aad18f77d30ca5648d1edfa52263fe341bb..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/group_user_saml.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: group_user_saml -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138075 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434464 -milestone: '16.7' -type: development -group: group::authentication -default_enabled: false diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index df027994742a7c385eca5d200273844138be9463..a3dd12ebabc08b855cab0896c54355ac8cd3fb26 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -78,7 +78,6 @@ def add_gon_variables push_frontend_feature_flag(:organization_switching, current_user) # To be removed with https://gitlab.com/gitlab-org/gitlab/-/issues/399248 push_frontend_feature_flag(:remove_monitor_metrics) - push_frontend_feature_flag(:group_user_saml) end # Exposes the state of a feature flag to the frontend code. 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 44f62d5904d2b9aad7fa925c238000826b19e06e..9233d89e5c18280b098b35b22f9220c0cd6b537b 100644 --- a/spec/frontend/invite_members/components/members_token_select_spec.js +++ b/spec/frontend/invite_members/components/members_token_select_spec.js @@ -222,43 +222,21 @@ describe('MembersTokenSelect', () => { describe('when component is mounted for a group using a SAML provider', () => { const searchParam = 'name'; + const samlProviderId = 123; beforeEach(() => { - jest.spyOn(UserApi, 'getGroupUsers').mockResolvedValue({ data: allUsers }); + jest.spyOn(UserApi, 'getUsers').mockResolvedValue({ data: allUsers }); - wrapper = createComponent({ usersFilter: 'saml_provider_id' }, { groupUserSaml: true }); + wrapper = createComponent({ filterId: samlProviderId, usersFilter: 'saml_provider_id' }); findTokenSelector().vm.$emit('text-input', searchParam); }); - it('calls the group API with correct parameters', () => { - expect(UserApi.getGroupUsers).toHaveBeenCalledWith(searchParam, groupId, { + it('calls the API with the saml provider ID param', () => { + expect(UserApi.getUsers).toHaveBeenCalledWith(searchParam, { active: true, - include_saml_users: true, - include_service_accounts: true, - }); - }); - }); - - describe('when group_user_saml feature flag is disabled', () => { - describe('when component is mounted for a group using a SAML provider', () => { - const searchParam = 'name'; - const samlProviderId = 123; - - beforeEach(() => { - jest.spyOn(UserApi, 'getUsers').mockResolvedValue({ data: allUsers }); - - wrapper = createComponent({ filterId: samlProviderId, usersFilter: 'saml_provider_id' }); - - findTokenSelector().vm.$emit('text-input', searchParam); - }); - - it('calls the API with the saml provider ID param', () => { - expect(UserApi.getUsers).toHaveBeenCalledWith(searchParam, { - active: true, - without_project_bots: true, - saml_provider_id: samlProviderId, - }); + without_project_bots: true, + saml_provider_id: samlProviderId, }); }); });