spree_auth_devise 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8eddd8197da8076ad27f516495417f5db97fb024bd395fd84adc4e29cc8b9e1
-  data.tar.gz: bb02bca1dd99bd5225e8ab53951ee51546f3ec712ca0bf0810a0cd33ed15d723
+  metadata.gz: 45307062e764620c14c90a2e46698079e68fcc2cf4a275c9b68b4dd7c440e235
+  data.tar.gz: 51a0e596192d24d194635e319ae70894d3d7ff9dcb098c7783c0b70f865f3a53
 SHA512:
-  metadata.gz: 618444c8f4066f26facd651392d70a933cdfe8c0aafb19e06b64513039cf0192bd488bfece8a5958fbd54baf8968ba91423d3a667b173e41cd873c40ba0e17f7
-  data.tar.gz: fa39c0d3d19b048413ae6c13943779f3a26016bbe7bd68959f256363526219f0cb7c304e874b8b25b5f6c251681d13f064765b511a90b106c8bb84a953b80c3f
+  metadata.gz: 0467202177d333b27390f4f6fd025e54d8600dfa514419a93d8f9d836740928d7226f8f89a841c215cd5b7e7a83e266bd04f06af4bddd0e961c4faf12d7d944e
+  data.tar.gz: 9d362bd0a46360b6907526dfb50c193b2399551bcd64e7804a65521cc893fc50e49adaf01a7ac981530677dfab3db5345ae65a8f48eb835bd82d6a54378f9327

data/config/initializers/warden.rb

@@ -1,18 +1,14 @@
 # Merges users orders to their account after sign in and sign up.
 Warden::Manager.after_set_user except: :fetch do |user, auth, _opts|
-  guest_token = auth.cookies.signed[:guest_token]
-  token       = auth.cookies.signed[:token]
+  token = auth.cookies.signed[:guest_token] || auth.cookies.signed[:token]
+  token_attr = Spree::Order.has_attribute?(:token) ? :token : :guest_token
 
   if token.present? && user.is_a?(Spree::User)
-    Spree::Order.incomplete.where(token: token, user_id: nil).each do |order|
-      order.associate_user!(user)
-    end
-  elsif guest_token.present? && user.is_a?(Spree::User)
-    Spree::Order.incomplete.where(guest_token: guest_token, user_id: nil).each do |order|
+    Spree::Order.incomplete.where(token_attr => token, user_id: nil).each do |order|
       order.associate_user!(user)
     end
   end
-end
+end 
 
 Warden::Manager.before_logout do |_user, auth, _opts|
   auth.cookies.delete(:guest_token)

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -106,6 +106,26 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
         end
       end
 
+      context 'with a guest_token from a pre-3.7 version of Spree present' do
+        before do
+          request.cookie_jar.signed[:guest_token] = 'ABC'
+          request.cookie_jar.signed[:token] = 'DEF'
+        end
+          
+        it 'assigns the correct token attribute for the order' do 
+          if Spree.version.to_f > 3.6
+            order = create(:order, email: user.email, token: 'ABC', user_id: nil, created_by_id: nil)
+          else
+            order = create(:order, email: user.email, guest_token: 'ABC', user_id: nil, created_by_id: nil)
+          end
+          spree_post :create, spree_user: { email: user.email, password: 'secret' }
+
+          order.reload
+          expect(order.user_id).to eq user.id
+          expect(order.created_by_id).to eq user.id
+        end 
+      end
+
       context "and html format is used" do
         it "redirects to default after signing in" do
           spree_post :create, spree_user: { email: user.email, password: 'secret' }

data/spree_auth_devise.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_auth_devise'
-  s.version     = '3.5.1'
+  s.version     = '3.5.2'
   s.summary     = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
   s.description = s.summary
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise