Commit 604f3927 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ldap-email-match' into 'master'

Improvements to LDAP::User model

* method #changed? also tracks changes of identites (fixes issue with email mapping)
* find ldap identity before initialize one

Fixes #1946

See merge request !1452
parents d54f8098 ca701a96
...@@ -40,12 +40,16 @@ module Gitlab ...@@ -40,12 +40,16 @@ module Gitlab
def update_user_attributes def update_user_attributes
gl_user.email = auth_hash.email gl_user.email = auth_hash.email
gl_user.identities.build(provider: auth_hash.provider, extern_uid: auth_hash.uid)
# Build new identity only if we dont have have same one
gl_user.identities.find_or_initialize_by(provider: auth_hash.provider,
extern_uid: auth_hash.uid)
gl_user gl_user
end end
def changed? def changed?
gl_user.changed? gl_user.changed? || gl_user.identities.any?(&:changed?)
end end
def needs_blocking? def needs_blocking?
......
...@@ -13,6 +13,23 @@ describe Gitlab::LDAP::User do ...@@ -13,6 +13,23 @@ describe Gitlab::LDAP::User do
double(uid: 'my-uid', provider: 'ldapmain', info: double(info)) double(uid: 'my-uid', provider: 'ldapmain', info: double(info))
end end
describe :changed? do
it "marks existing ldap user as changed" do
existing_user = create(:omniauth_user, extern_uid: 'my-uid', provider: 'ldapmain')
expect(gl_user.changed?).to be_true
end
it "marks existing non-ldap user if the email matches as changed" do
existing_user = create(:user, email: 'john@example.com')
expect(gl_user.changed?).to be_true
end
it "dont marks existing ldap user as changed" do
existing_user = create(:omniauth_user, email: 'john@example.com', extern_uid: 'my-uid', provider: 'ldapmain')
expect(gl_user.changed?).to be_false
end
end
describe :find_or_create do describe :find_or_create do
it "finds the user if already existing" do it "finds the user if already existing" do
existing_user = create(:omniauth_user, extern_uid: 'my-uid', provider: 'ldapmain') existing_user = create(:omniauth_user, extern_uid: 'my-uid', provider: 'ldapmain')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment