diff options
author | ThibG <thib@sitedethib.com> | 2019-12-01 13:13:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-01 13:13:28 +0100 |
commit | 7d59e25fbd7a0209c11cbe6aac4400bbca4de82b (patch) | |
tree | fc21c09cd6e0e8a666655df8b7f6802745a7e473 /app/models/concerns/ldap_authenticable.rb | |
parent | 7f6315841c98a1eee6cb57171a91a88f5c5343df (diff) | |
parent | fae7e0cacec60094dc1ce78d9f63b19b1cacde2d (diff) |
Merge pull request #1250 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns/ldap_authenticable.rb')
-rw-r--r-- | app/models/concerns/ldap_authenticable.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/models/concerns/ldap_authenticable.rb b/app/models/concerns/ldap_authenticable.rb index 117993947..2d2e1edbb 100644 --- a/app/models/concerns/ldap_authenticable.rb +++ b/app/models/concerns/ldap_authenticable.rb @@ -14,10 +14,18 @@ module LdapAuthenticable end def ldap_get_user(attributes = {}) - resource = joins(:account).find_by(accounts: { username: attributes[Devise.ldap_uid.to_sym].first }) + safe_username = attributes[Devise.ldap_uid.to_sym].first + if Devise.ldap_uid_conversion_enabled + keys = Regexp.union(Devise.ldap_uid_conversion_search.chars) + replacement = Devise.ldap_uid_conversion_replace + + safe_username = safe_username.gsub(keys, replacement) + end + + resource = joins(:account).find_by(accounts: { username: safe_username }) if resource.blank? - resource = new(email: attributes[:mail].first, agreement: true, account_attributes: { username: attributes[Devise.ldap_uid.to_sym].first }, admin: false, external: true, confirmed_at: Time.now.utc) + resource = new(email: attributes[:mail].first, agreement: true, account_attributes: { username: safe_username }, admin: false, external: true, confirmed_at: Time.now.utc) resource.save! end |