devise 3.2.2, secret key compatiblity

cschiewek · Dec 20, 2013 · 9886a7c · 9886a7c
1 parent 1c4a14d
commit 9886a7c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/devise_ldap_authenticatable.rb b/lib/devise_ldap_authenticatable.rb
@@ -36,7 +36,7 @@ module Devise
   @@ldap_auth_username_builder = Proc.new() {|attribute, login, ldap| "#{attribute}=#{login},#{ldap.base}" }
 
   mattr_accessor :ldap_auth_password_builder
-  @@ldap_auth_password_builder = Proc.new() {|new_password| Net::LDAP::Password.generate(:ssha, new_password) }
+  @@ldap_auth_password_builder = Proc.new() {|new_password| Net::LDAP::Password.generate(:sha, new_password) }
 
   mattr_accessor :ldap_ad_group_check
   @@ldap_ad_group_check = false

diff --git a/spec/rails_app/config/initializers/devise.rb b/spec/rails_app/config/initializers/devise.rb
@@ -16,6 +16,11 @@
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
   config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
 
+
+  if ::Devise.respond_to?(:secret_key)
+    ::Devise.secret_key = '012a16191a7f61e84e55704e34b73db991a23ba396b6b7760596a3e80073e4464c55421c42a1a34327dee44828bec6745c48eba10cc0866799ec95c09ea27ada'
+  end
+
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"