Merge branch 'jej/group-saml-cleans-up-identity' into 'master'

Group SAML identities cleaned up when leaving a group

Closes #5565

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

ee/app/services/ee/members/destroy_service.rb

@@ -7,6 +7,8 @@ module EE
         super
 
         log_audit_event(member: member)
+
+        cleanup_group_identity(member)
       end
 
       private
@@ -18,6 +20,14 @@ module EE
           action: :destroy
         ).for_member(member).security_event
       end
+
+      def cleanup_group_identity(member)
+        saml_provider = member.source.try(:saml_provider)
+
+        return unless saml_provider
+
+        saml_provider.identities.for_user(member.user).delete_all
+      end
     end
   end
 end

ee/changelogs/unreleased/jej-group-saml-cleans-up-identity.yml

+---
+title: Group SAML identities cleaned up when leaving a group
+merge_request: 5817
+author:
+type: fixed

ee/spec/services/ee/members/destroy_service_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Members::DestroyService do
+  let(:current_user) { create(:user) }
+  let(:member_user) { create(:user) }
+  let(:group) { create(:group) }
+  let(:member) { group.members.find_by(user_id: member_user.id) }
+
+  subject { described_class.new(current_user) }
+
+  before do
+    group.add_owner(current_user)
+    group.add_developer(member_user)
+  end
+
+  context 'with group membership via Group SAML' do
+    let!(:saml_provider) { create(:saml_provider, group: group) }
+
+    context 'with a SAML identity' do
+      before do
+        create(:group_saml_identity, user: member_user, saml_provider: saml_provider)
+      end
+
+      it 'cleans up linked SAML identity' do
+        expect { subject.execute(member, {}) }.to change { member_user.reload.identities.count }.by(-1)
+      end
+    end
+
+    context 'without a SAML identity' do
+      it 'does not attempt to destroy unrelated identities' do
+        create(:identity, user: member_user)
+
+        expect { subject.execute(member, {}) }.not_to change(Identity, :count)
+      end
+    end
+  end
+end