Merge branch 'jej/remove-group-scim-feature-flag' into 'master'

Remove feature flag for group_scim

Closes #11289

See merge request gitlab-org/gitlab!19329

doc/api/scim.md

@@ -5,8 +5,7 @@
 The SCIM API implements the [the RFC7644 protocol](https://tools.ietf.org/html/rfc7644).
 
 NOTE: **Note:**
-[Group SSO](../user/group/saml_sso/index.md) and the feature
-flag `:group_scim` must be enabled for the group. For more information, see [SCIM setup documentation](../user/group/saml_sso/scim_setup.md#requirements).
+[Group SSO](../user/group/saml_sso/index.md) must be enabled for the group. For more information, see [SCIM setup documentation](../user/group/saml_sso/scim_setup.md#requirements).
 
 ## Get a list of SAML users
 

doc/user/group/saml_sso/scim_setup.md

@@ -25,25 +25,6 @@ The following identity providers are supported:
 ## Requirements
 
 - [Group SSO](index.md) needs to be configured.
-- The `scim_group` feature flag must be enabled:
-
-  Run the following commands in a Rails console:
-
-  ```sh
-  # Omnibus GitLab
-  gitlab-rails console
-
-  # Installation from source
-  cd /home/git/gitlab
-  sudo -u git -H bin/rails console RAILS_ENV=production
-  ```
-
-  To enable SCIM for a group named `group_name`:
-
-  ```ruby
-  group = Group.find_by_full_path('group_name')
-  Feature.enable(:group_scim, group)
-  ```
 
 ## GitLab configuration
 

ee/app/assets/javascripts/pages/groups/saml_providers/shared/init_saml.js

@@ -4,13 +4,11 @@ import SCIMTokenToggleArea from 'ee/saml_providers/scim_token_toggle_area';
 export default function initSAML() {
   const groupPath = document.querySelector('#issuer').value;
 
-  if (gon.features.groupScim) {
-    // eslint-disable-next-line no-new
-    new SCIMTokenToggleArea(
-      '.js-generate-scim-token-container',
-      '.js-scim-token-container',
-      groupPath,
-    );
-  }
+  // eslint-disable-next-line no-new
+  new SCIMTokenToggleArea(
+    '.js-generate-scim-token-container',
+    '.js-scim-token-container',
+    groupPath,
+  );
   new SamlSettingsForm('#js-saml-settings-form').init();
 }

ee/app/controllers/groups/saml_providers_controller.rb

@@ -7,9 +7,6 @@ class Groups::SamlProvidersController < Groups::ApplicationController
   before_action :authorize_manage_saml!
   before_action :check_group_saml_available!
   before_action :check_group_saml_configured
-  before_action do
-    push_frontend_feature_flag(:group_scim)
-  end
 
   def show
     @saml_provider = @group.saml_provider || @group.build_saml_provider

ee/app/controllers/groups/scim_oauth_controller.rb

@@ -7,7 +7,6 @@ class Groups::ScimOauthController < Groups::ApplicationController
   before_action :authorize_manage_saml!
   before_action :check_group_saml_available!
   before_action :check_group_saml_configured
-  before_action :check_group_scim_enabled
 
   def show
     scim_token = ScimOauthAccessToken.find_by_group_id(@group.id)
@@ -44,10 +43,4 @@ class Groups::ScimOauthController < Groups::ApplicationController
     end
   end
   # rubocop: enable CodeReuse/ActiveRecord
-
-  private
-
-  def check_group_scim_enabled
-    route_not_found unless Feature.enabled?(:group_scim, @group)
-  end
 end

ee/app/views/groups/saml_providers/show.html.haml

@@ -16,11 +16,9 @@
       = s_('GroupSAML|Configuration')
   .col-lg-9
     = render 'form', group: @group, saml_provider: @saml_provider
-- if Feature.enabled?(:group_scim, @group)
-  %section.row.border-top.mt-4
-    .col-lg-3.append-bottom-default
-      %h4.page-title
-        = s_('GroupSAML|SCIM Token')
-    .col-lg-9
-      = render 'scim_token'
-
+%section.row.border-top.mt-4
+  .col-lg-3.append-bottom-default
+    %h4.page-title
+      = s_('GroupSAML|SCIM Token')
+  .col-lg-9
+    = render 'scim_token'

ee/changelogs/unreleased/jej-remove-group-scim-feature-flag.yml

+---
+title: SCIM can be used to manage group membership
+merge_request: 19329
+author:
+type: added

ee/lib/api/scim.rb

@@ -88,7 +88,6 @@ module API
 
       resource :Users do
         before do
-          check_group_scim_enabled(find_group(params[:group]))
           check_group_saml_configured
         end
 

ee/lib/ee/api/helpers.rb

@@ -165,10 +165,6 @@ module EE
         unauthorized! unless can?(current_user, :admin_group_saml, group)
       end
 
-      def check_group_scim_enabled(group)
-        forbidden!('Group SCIM not enabled.') unless ::Feature.enabled?(:group_scim, group)
-      end
-
       def check_group_saml_configured
         forbidden!('Group SAML not enabled.') unless ::Gitlab::Auth::GroupSaml::Config.enabled?
       end

ee/spec/controllers/groups/scim_oauth_controller_spec.rb

@@ -16,11 +16,10 @@ describe Groups::ScimOauthController do
     allow(Devise).to receive(:omniauth_providers).and_return(providers)
   end
 
-  context 'when the feature is enabled' do
+  context 'when the feature is configured' do
     before do
       stub_saml_config(enabled: true)
       stub_licensed_features(group_saml: true)
-      stub_feature_flags(group_scim: true)
     end
 
     describe 'GET #show' do