Download as
Browse Code »

Commit ad265b9610b474132752da43cf845d82ddf5fd8c

Authored by Jakub Jirutka
1 parent fa5a53f5
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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
  Diff comments   View file @ad265b9
... ... @@ -95,8 +95,13 @@ class User < ActiveRecord::Base
95 95  
96 96 if @user = User.find_by_extern_uid_and_provider(uid, provider)
97 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 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 105 password = Devise.friendly_token[0, 8].downcase
101 106 @user = User.create(
102 107 :extern_uid => uid,
... ...