Merge pull request #224 from korun/master

Fix error: undefined local variable or method `user_model' for CASServer...
rubycas · Sep 15, 2014 · 73b89bb · 73b89bb
2 parents d297422 + 873bfbd
commit 73b89bb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/casserver/authenticators/sql_encrypted.rb b/lib/casserver/authenticators/sql_encrypted.rb
@@ -40,14 +40,14 @@ def generate_encryption_salt
 
   def self.setup(options)
     super(options)
-    user_model.__send__(:include, EncryptedPassword)
+    user_models.each { |auth_index, model| model.__send__(:include, EncryptedPassword) }
   end
 
   def validate(credentials)
     read_standard_credentials(credentials)
     raise_if_not_configured
 
-    user_model = self.class.user_model
+    user_model = self.user_model
 
     username_column = @options[:username_column] || "username"
     encrypt_function = @options[:encrypt_function] || 'user.encrypted_password == Digest::SHA256.hexdigest("#{user.encryption_salt}::#{@password}")'