solidus_auth_devise 2.5.8 → 2.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf7ce65d0207be4a726b5b686ecab8dea697d85d4ce3cfb1813a650e50a9d861
-  data.tar.gz: 9b6873b1c4c6634abc2be1f456a8374f869069ffb748d146a75132d7af7ff252
+  metadata.gz: '098ee5c680f5383b31766bff2da29911149036a3972e740cc59731c6d05c5f56'
+  data.tar.gz: 7f6c81439ad91719dc0fe4cee7ba2995370f02d87e1f33d7169472241f50f2c7
 SHA512:
-  metadata.gz: 3c367084656a1c2b9d5e84acfb70f2c684bce4d53b98ee004f4ace6bd44f989b031cf00367f0c07bc417904bd433390ea25402eeb417098b32da04d820de04eb
-  data.tar.gz: 253c1677f24a5a34d82a0a9b93eaae6c31c30f6e9a80d562ac8cd5887451ee526b10ea9f8eaa8845e969f4eedd6a56a9450edb1b4f04932be8fbf89a8e143717
+  metadata.gz: 6044f99dbef2b8c35bd664d4a9566a7f7dab506678bed597831f5b818c969647ef72bf00e89395875c64a45f2701ac14c3e7c42d583e292e19ea93595c790bc4
+  data.tar.gz: 4a44b87bc260b095892bdc0e4477885a7aff5e119c2fac2d3e72c3373db49370b5c05da4d9b824f4d5068df62cbfeaae8d5ff21d27be7550b78f275613785743

data/.circleci/config.yml

@@ -15,7 +15,7 @@ jobs:
     parameters:
       solidus:
         type: string
-        default: master
+        default: main
       db:
         type: string
         default: "postgres"
@@ -43,7 +43,7 @@ workflows:
       - run-specs:
           name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
           matrix:
-            parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
+            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
       - run-specs:
           name: *name
           matrix:
@@ -54,19 +54,19 @@ workflows:
             parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }
       - lint-code
 
-  "Weekly run specs against master":
+  "Weekly run specs against main":
     triggers:
       - schedule:
           cron: "0 0 * * 4" # every Thursday
           filters:
             branches:
               only:
-                - master
+                - main
     jobs:
       - run-specs:
           name: *name
           matrix:
-            parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
+            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
       - run-specs:
           name: *name
           matrix:

data/.rubocop_todo.yml

@@ -105,7 +105,7 @@ RSpec/BeforeAfterAll:
 
 # Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
-RSpec/Capybara/CurrentPathExpectation:
+Capybara/CurrentPathExpectation:
   Exclude:
     - 'spec/features/admin/sign_in_spec.rb'
     - 'spec/features/sign_in_spec.rb'
@@ -221,7 +221,6 @@ RSpec/InstanceVariable:
     - 'spec/controllers/spree/admin/user_passwords_controller_spec.rb'
     - 'spec/controllers/spree/user_passwords_controller_spec.rb'
     - 'spec/controllers/spree/user_registrations_controller_spec.rb'
-    - 'spec/controllers/spree/user_sessions_controller_spec.rb'
     - 'spec/features/admin/sign_in_spec.rb'
     - 'spec/features/checkout_spec.rb'
     - 'spec/features/sign_in_spec.rb'

data/Gemfile

@@ -3,14 +3,14 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
+branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 gem 'solidus_backend', github: 'solidusio/solidus', branch: branch
 
 # The solidus_frontend gem has been pulled out since v3.2
 if branch >= 'v3.2'
   gem 'solidus_frontend'
-elsif branch == 'master'
+elsif branch == 'main'
   gem 'solidus_frontend', github: 'solidusio/solidus_frontend'
 else
   gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch

data/README.md

@@ -1,7 +1,7 @@
 # Solidus Auth Devise
 
 [![CircleCI](https://circleci.com/gh/solidusio/solidus_auth_devise.svg?style=shield)](https://circleci.com/gh/solidusio/solidus_auth_devise)
-[![codecov](https://codecov.io/gh/solidusio/solidus_auth_devise/branch/master/graph/badge.svg)](https://codecov.io/gh/solidusio/solidus_auth_devise)
+[![codecov](https://codecov.io/gh/solidusio/solidus_auth_devise/branch/main/graph/badge.svg)](https://codecov.io/gh/solidusio/solidus_auth_devise)
 
 Provides authentication services for Solidus, using the Devise gem.
 

data/bin/sandbox

@@ -32,8 +32,8 @@ if [ -n "$SOLIDUS_BRANCH" ]
 then
   BRANCH=$SOLIDUS_BRANCH
 else
-  echo "~~> Use 'export SOLIDUS_BRANCH=[master|v3.2|...]' to control the Solidus branch"
-  BRANCH="master"
+  echo "~~> Use 'export SOLIDUS_BRANCH=[main|v3.2|...]' to control the Solidus branch"
+  BRANCH="main"
 fi
 echo "~~> Using branch $BRANCH of solidus"
 

data/config/initializers/warden.rb

@@ -4,7 +4,7 @@
 Warden::Manager.after_set_user except: :fetch do |user, auth, _opts|
   if auth.cookies.signed[:guest_token].present?
     if user.is_a?(Spree::User)
-      Spree::Order.incomplete.where(guest_token: auth.cookies.signed[:guest_token], user_id: nil).each do |order|
+      Spree::Order.incomplete.where(guest_token: auth.cookies.signed[:guest_token], user_id: nil).find_each do |order|
         order.associate_user!(user)
       end
     end

data/lib/controllers/backend/spree/admin/user_sessions_controller.rb

@@ -35,6 +35,10 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
 
   private
 
+  def signed_in_root_path(_resource)
+    spree.admin_path
+  end
+
   # NOTE: as soon as this gem stops supporting Solidus 3.1 if-else should be removed and left only include
   if defined?(::Spree::Admin::SetsUserLanguageLocaleKey)
     include ::Spree::Admin::SetsUserLanguageLocaleKey

data/lib/controllers/frontend/spree/users_controller.rb

@@ -4,6 +4,8 @@ class Spree::UsersController < Spree::StoreController
   skip_before_action :set_current_order, only: :show, raise: false
   prepend_before_action :authorize_actions, only: :new
 
+  def new; end
+
   def show
     load_object
     @orders = @user.orders.complete.order('completed_at desc')

data/lib/solidus_auth_devise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusAuthDevise
-  VERSION = '2.5.8'
+  VERSION = '2.5.9'
 end

data/spec/controllers/spree/admin/user_sessions_controller_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+RSpec.describe Spree::Admin::UserSessionsController, type: :controller do
+  let(:user) { create(:user, password: 'secret') }
+
+  before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] } # rubocop:disable RSpec/InstanceVariable
+
+  it "redirects to the admin root after signing in with no stored location" do
+    get :new
+
+    post(:create, params: {
+      spree_user: {
+        email: user.email,
+        password: 'secret'
+      },
+    })
+
+    expect(response).to redirect_to spree.admin_path
+  end
+end

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -3,22 +3,20 @@
 RSpec.describe Spree::UserSessionsController, type: :controller do
   let(:user) { create(:user) }
 
-  before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }
+  before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] } # rubocop:disable RSpec/InstanceVariable
 
   context "#create" do
     let(:format) { :html }
     let(:password) { 'secret' }
 
     subject do
-      post(:create,
-        params: {
-          spree_user: {
-            email: user.email,
-            password: password
-          },
-          format: format
-        }
-      )
+      post(:create, params: {
+        spree_user: {
+          email: user.email,
+          password: password
+        },
+        format: format
+      })
     end
 
     context "when using correct login information" do

data/spec/features/admin/sign_in_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.feature 'Admin - Sign In', type: :feature do
   background do
-    @user = create(:user, email: 'email@person.com')
+    @user = create(:admin_user, email: 'email@person.com')
     visit spree.admin_login_path
   end
 
@@ -19,7 +19,7 @@ RSpec.feature 'Admin - Sign In', type: :feature do
     expect(page).to have_text 'Logged in successfully'
     expect(page).not_to have_text 'Login'
     expect(page).to have_text 'Logout'
-    expect(current_path).to eq '/'
+    expect(current_path).to eq '/admin/orders'
   end
 
   scenario 'shows validation erros' do

data/spec/features/admin/sign_out_spec.rb

@@ -15,9 +15,28 @@ RSpec.feature 'Admin - Sign Out', type: :feature, js: true do
   end
 
   scenario 'allows a signed in user to logout' do
-    click_link 'Logout'
+    click_logout_link
     visit spree.admin_login_path
     expect(page).to have_text 'Login'
     expect(page).not_to have_text 'Logout'
   end
+
+  def click_logout_link
+    new_version? ? logout_new_version : logout_old_version
+  end
+
+  def new_version?
+    Gem::Requirement.new('>= 4.2').satisfied_by?(Spree.solidus_gem_version)
+  end
+
+  def logout_new_version
+    find('details div', text: user.email, wait: 10).click
+    within('details') do
+      click_link 'Logout'
+    end
+  end
+
+  def logout_old_version
+    click_link 'Logout'
+  end
 end

data/spec/models/user_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe Spree::User, type: :model do
     let(:user) { create(:user) }
 
     context 'with same email address as previously deleted account' do
-      it 'will allow users to register later' do
+      it 'allows users to register later' do
         user1 = build(:user)
         user1.save
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 2.5.8
+  version: 2.5.9
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -243,6 +243,7 @@ files:
 - solidus_auth_devise.gemspec
 - spec/controllers/spree/admin/base_controller_spec.rb
 - spec/controllers/spree/admin/user_passwords_controller_spec.rb
+- spec/controllers/spree/admin/user_sessions_controller_spec.rb
 - spec/controllers/spree/base_controller_spec.rb
 - spec/controllers/spree/checkout_controller_spec.rb
 - spec/controllers/spree/products_controller_spec.rb
@@ -302,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Provides authentication and authorization services for use with Solidus by
@@ -310,6 +311,7 @@ summary: Provides authentication and authorization services for use with Solidus
 test_files:
 - spec/controllers/spree/admin/base_controller_spec.rb
 - spec/controllers/spree/admin/user_passwords_controller_spec.rb
+- spec/controllers/spree/admin/user_sessions_controller_spec.rb
 - spec/controllers/spree/base_controller_spec.rb
 - spec/controllers/spree/checkout_controller_spec.rb
 - spec/controllers/spree/products_controller_spec.rb