upgrade crypto method for user pass

MartinDueren · Jun 8, 2012 · a9acbf4 · a9acbf4
1 parent 74444c6
commit a9acbf4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,6 +4,9 @@
 * add back searching to users index
 * swap jquery for prototype
 
+
+* Upgrade to bcrybt crypto method
+
 =2.0.0.beta4
 * Replace white_list plugin with Sanitize gem (white_list.rb initizlizer format has changed)
 * Upgrade to Rails 3.2

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -15,7 +15,8 @@ class User < ActiveRecord::Base
   FEMALE  = 'F'
 
   acts_as_authentic do |c|
-    c.crypto_provider = CommunityEngineSha1CryptoMethod
+    c.transition_from_crypto_providers = CommunityEngineSha1CryptoMethod
+    c.crypto_provider = Authlogic::CryptoProviders::BCrypt  
 
     c.validates_length_of_password_field_options = { :within => 6..20, :if => :password_required? }
     c.validates_length_of_password_confirmation_field_options = { :within => 6..20, :if => :password_required? }

diff --git a/app/views/users/_user.html.haml b/app/views/users/_user.html.haml
@@ -28,4 +28,4 @@
 
         - if current_user && current_user.admin?
           %br
-          = link_to( :assume_id.l, assume_user_path(user) )
+          = link_to( :assume_id.l, assume_user_path(user), :method => :post )
diff --git a/config/routes.rb b/config/routes.rb
@@ -220,7 +220,11 @@
       end
     end
 
-    resources :comments
+    resources :comments do 
+      member do
+        get :unsubscribe
+      end
+    end
     resources :photo_manager
 
     resources :albums do