spree_auth 0.70.3 → 0.70.4

data/app/controllers/user_passwords_controller.rb

@@ -1,6 +1,8 @@
 class UserPasswordsController < Devise::PasswordsController
   include SpreeBase
   helper :users, 'spree/base'
+  
+  after_filter :associate_user, :only => :update
 
   def new
     super
@@ -32,4 +34,13 @@ class UserPasswordsController < Devise::PasswordsController
   def update
     super
   end
+  
+  private
+  
+  def associate_user
+    return unless current_user and current_order
+    current_order.associate_user!(current_user)
+    session[:guest_token] = nil
+  end
+  
 end

data/app/models/user.rb

@@ -39,7 +39,7 @@ class User < ActiveRecord::Base
   end
 
   def send_reset_password_instructions
-    reset_perishable_token!
+    generate_reset_password_token!
     UserMailer.reset_password_instructions(self).deliver
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_auth
 version: !ruby/object:Gem::Version 
-  hash: 257
+  hash: 271
   prerelease: 
   segments: 
   - 0
   - 70
-  - 3
-  version: 0.70.3
+  - 4
+  version: 0.70.4
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 Z
+date: 2012-03-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -23,12 +23,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 257
+        hash: 271
         segments: 
         - 0
         - 70
-        - 3
-        version: 0.70.3
+        - 4
+        version: 0.70.4
   requirement: *id001
   type: :runtime
   prerelease: false