Merge branch '11540-support-emails-as-id-in-scim' into 'master'

Resolve "Support emails as ID in SCIM"

Closes #11540

See merge request gitlab-org/gitlab-ee!14625

ee/changelogs/unreleased/11540-support-emails-as-id-in-scim.yml

+---
+title: Support emails as ID in SCIM
+merge_request: 14625
+author:
+type: fixed

ee/lib/api/scim.rb

@@ -5,6 +5,7 @@ module API
     prefix 'api/scim'
     version 'v2'
     content_type :json, 'application/scim+json'
+    USER_ID_REQUIREMENTS = { id: /.+/ }.freeze
 
     namespace 'groups/:group' do
       params do
@@ -107,7 +108,7 @@ module API
         desc 'Get a SAML user' do
           detail 'This feature was introduced in GitLab 11.10.'
         end
-        get ':id' do
+        get ':id', requirements: USER_ID_REQUIREMENTS do
           group = find_and_authenticate_group!(params[:group])
 
           identity = GroupSamlIdentityFinder.find_by_group_and_uid(group: group, uid: params[:id])
@@ -142,7 +143,7 @@ module API
         desc 'Updates a SAML user' do
           detail 'This feature was introduced in GitLab 11.10.'
         end
-        patch ':id' do
+        patch ':id', requirements: USER_ID_REQUIREMENTS do
           scim_error!(message: 'Missing ID') unless params[:id]
 
           group = find_and_authenticate_group!(params[:group])
@@ -164,7 +165,7 @@ module API
         desc 'Removes a SAML user' do
           detail 'This feature was introduced in GitLab 11.10.'
         end
-        delete ":id" do
+        delete ':id', requirements: USER_ID_REQUIREMENTS do
           scim_error!(message: 'Missing ID') unless params[:id]
 
           group = find_and_authenticate_group!(params[:group])