Adding workaround for backward compatibility with legacy LDAP users

Jakub Jirutka
1 parent fa5a53f5
Showing 1 changed file with 6 additions and 1 deletions Show diff stats
app/models/user.rb
@@ -95,8 +95,13 @@ class User &lt; ActiveRecord::Base
  
     if @user = User.find_by_extern_uid_and_provider(uid, provider)
       @user
+    # workaround for backward compatibility
+    elsif @user = User.find_by_email(email)
+      logger.info "Updating legacy LDAP user #{email} with extern_uid => #{uid}"
+      @user.update_attributes(:extern_uid => uid, :provider => provider)
+      @user
     else
-      logger.info "Creating user from LDAP login; uid = #{uid}, name = #{name}, email = #{email}"
+      logger.info "Creating user from LDAP login {uid => #{uid}, name => #{name}, email => #{email}}"
       password = Devise.friendly_token[0, 8].downcase
       @user = User.create(
         :extern_uid => uid,
...	...	@@ -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,
...	...