Commit ad265b9610b474132752da43cf845d82ddf5fd8c
1 parent
fa5a53f5
Exists in
master
and in
4 other branches
Adding workaround for backward compatibility with legacy LDAP users
Showing
1 changed file
with
6 additions
and
1 deletions
Show diff stats
app/models/user.rb
| @@ -95,8 +95,13 @@ class User < ActiveRecord::Base | @@ -95,8 +95,13 @@ class User < ActiveRecord::Base | ||
| 95 | 95 | ||
| 96 | if @user = User.find_by_extern_uid_and_provider(uid, provider) | 96 | if @user = User.find_by_extern_uid_and_provider(uid, provider) |
| 97 | @user | 97 | @user |
| 98 | + # workaround for backward compatibility | ||
| 99 | + elsif @user = User.find_by_email(email) | ||
| 100 | + logger.info "Updating legacy LDAP user #{email} with extern_uid => #{uid}" | ||
| 101 | + @user.update_attributes(:extern_uid => uid, :provider => provider) | ||
| 102 | + @user | ||
| 98 | else | 103 | else |
| 99 | - logger.info "Creating user from LDAP login; uid = #{uid}, name = #{name}, email = #{email}" | 104 | + logger.info "Creating user from LDAP login {uid => #{uid}, name => #{name}, email => #{email}}" |
| 100 | password = Devise.friendly_token[0, 8].downcase | 105 | password = Devise.friendly_token[0, 8].downcase |
| 101 | @user = User.create( | 106 | @user = User.create( |
| 102 | :extern_uid => uid, | 107 | :extern_uid => uid, |