Backport Identity.uniqueness_scope from EE

Originates in 'SamlProvider has many linked Identities' from EE

Backport Identity.uniqueness_scope from EE
d14851f9 · James Edwards-Jones · b51f6e2c · d14851f9
Commit d14851f9 authored Apr 22, 2018 by James Edwards-Jones
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

identity.rb app/models/identity.rb +6 -2

No files found.
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
 class Identity < ActiveRecord::Base
+  def self.uniqueness_scope
+    :provider
+  end
+
  include Sortable
  include CaseSensitivity

  belongs_to :user

  validates :provider, presence: true
-  validates :extern_uid, allow_blank: true, uniqueness: { scope: :provider, case_sensitive: false }
-  validates :user_id, uniqueness: { scope: :provider }
+  validates :extern_uid, allow_blank: true, uniqueness: { scope: uniqueness_scope, case_sensitive: false }
+  validates :user_id, uniqueness: { scope: uniqueness_scope }

  before_save :ensure_normalized_extern_uid, if: :extern_uid_changed?
  after_destroy :clear_user_synced_attributes, if: :user_synced_attributes_metadata_from_provider?