encrypting user password whenever password exists and user is saved s…

…o it works on user edit - closes ryanb#2
bemurphy · May 5, 2009 · 7b5f755 · 7b5f755
1 parent de06e99
commit 7b5f755
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/rails_generators/nifty_authentication/templates/user.rb b/rails_generators/nifty_authentication/templates/user.rb
@@ -3,7 +3,7 @@ class <%= user_class_name %> < ActiveRecord::Base
   attr_accessible :username, :email, :password, :password_confirmation
   
   attr_accessor :password
-  before_create :prepare_password
+  before_save :prepare_password
   
   validates_presence_of :username
   validates_uniqueness_of :username, :email, :allow_blank => true
@@ -26,8 +26,10 @@ def matching_password?(pass)
   private
 
   def prepare_password
-    self.password_salt = Digest::SHA1.hexdigest([Time.now, rand].join)
-    self.password_hash = encrypt_password(password)
+    unless password.blank?
+      self.password_salt = Digest::SHA1.hexdigest([Time.now, rand].join)
+      self.password_hash = encrypt_password(password)
+    end
   end
 
   def encrypt_password(pass)