solidus_auth_devise 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed48bb8fc53ea89e494278ad2016e10fcfbd30bc
-  data.tar.gz: b761cf86babf945a3433d9aa1cf2b9279139e52c
+  metadata.gz: 59657ee853e6da1a3dc473ab72d480314ca4af04
+  data.tar.gz: 5453c9c17ae5cc87cd6f37bd31265e341d643b2e
 SHA512:
-  metadata.gz: 8a8ecb33d6be656864477bcc7d55b7adb1b3a8ee19b3061c49e48e618fb21b098a0ab86cfdbba117fff817c0e4b87306dbf5caa7203e2d674b74e3adcd03d862
-  data.tar.gz: 035211966358072827219d129f5dece6b04bd7a5d47316dd5d7bc5d40cdd700b314774a434e7f288f50bd9f42a03acbc1ded8c381f925deed2cf1b038caef878
+  metadata.gz: 0858cd10ce944dc24381e6acf4837fee98246b438fbe59f4f6055870ef2838638616458399ebb48e815c39d8cd07281070f0a4511095eeb2ecda1d851491c01d
+  data.tar.gz: abe7d73b5778f7d37273622b54cd6909d2bdea7bfd495de98f2175153c5d9e975161c155c3631e5d84a3f4720cf6cf8605c7693289d1c93b58b4bbcea3ab1eb9

data/.travis.yml

@@ -1,16 +1,20 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.1.8
+  - 2.3.1
 env:
   matrix:
     - SOLIDUS_BRANCH=v1.0 DB=postgres
     - SOLIDUS_BRANCH=v1.1 DB=postgres
     - SOLIDUS_BRANCH=v1.2 DB=postgres
     - SOLIDUS_BRANCH=v1.3 DB=postgres
+    - SOLIDUS_BRANCH=v1.4 DB=postgres
+    - SOLIDUS_BRANCH=v2.0 DB=postgres
     - SOLIDUS_BRANCH=master DB=postgres
     - SOLIDUS_BRANCH=v1.0 DB=mysql
     - SOLIDUS_BRANCH=v1.1 DB=mysql
     - SOLIDUS_BRANCH=v1.2 DB=mysql
     - SOLIDUS_BRANCH=v1.3 DB=mysql
+    - SOLIDUS_BRANCH=v1.4 DB=mysql
+    - SOLIDUS_BRANCH=v2.0 DB=mysql
     - SOLIDUS_BRANCH=master DB=mysql

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## Solidus Auth Devise v1.6.0 (master, unreleased)
+## Master (unreleased)
+
+## Solidus Auth Devise v1.6.0 (2016-08-23)
+
+* Loading of routes can be disabled through config (#71)
+
+* Support for Solidus 2.0 and Rails 5.0
+
+* Remove load-time manipulation of the Devise secret key (#67)
 
 ## Solidus Auth Devise v1.5.0 (2016-07-18)
 

data/Gemfile

@@ -3,6 +3,10 @@ source "https://rubygems.org"
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem "solidus", github: "solidusio/solidus", branch: branch
 
+if branch == 'master' || branch >= "v2.0"
+  gem "rails-controller-testing", group: :test
+end
+
 gem 'pg'
 gem 'mysql2'
 

data/app/models/spree/auth_configuration.rb

@@ -3,5 +3,7 @@ module Spree
     preference :registration_step, :boolean, default: true
     preference :signout_after_password_change, :boolean, default: true
     preference :confirmable, :boolean, default: false
+    preference :draw_frontend_routes, :boolean, default: true
+    preference :draw_backend_routes, :boolean, default: true
   end
 end

data/app/overrides/auth_admin_login_navigation_bar.rb

@@ -0,0 +1,11 @@
+override_required = !Spree.respond_to?(:solidus_version) || Spree.solidus_version < '1.2'
+if override_required
+  Deface::Override.new(
+    virtual_path: "spree/admin/shared/_header",
+    name: "auth_admin_login_navigation_bar",
+    insert_before: "[data-hook='admin_login_navigation_bar'], #admin_login_navigation_bar[data-hook]",
+    partial: "spree/layouts/admin/login_nav",
+    disabled: false,
+    original: '841227d0aedf7909d62237d8778df99100087715'
+  )
+end

data/config/routes.rb

@@ -1,5 +1,9 @@
 Spree::Core::Engine.routes.draw do
-  if Spree::Auth::Engine.frontend_available?
+  if (
+    Spree::Auth::Engine.frontend_available? &&
+    Spree::Auth::Config.draw_frontend_routes
+  )
+
     devise_for(:spree_user, {
       class_name: 'Spree::User',
       controllers: {
@@ -34,7 +38,11 @@ Spree::Core::Engine.routes.draw do
     resource :account, controller: 'users'
   end
 
-  if Spree::Auth::Engine.backend_available?
+  if (
+    Spree::Auth::Engine.backend_available? &&
+    Spree::Auth::Config.draw_backend_routes
+  )
+
     namespace :admin do
       devise_for(:spree_user, {
         class_name: 'Spree::User',

data/lib/spree/auth/devise.rb

@@ -3,18 +3,12 @@ require 'devise'
 require 'devise-encryptable'
 require 'cancan'
 
-Devise.secret_key = SecureRandom.hex(50)
-
 module Spree
   module Auth
-    mattr_accessor :default_secret_key
-
     def self.config(&block)
       yield(Spree::Auth::Config)
     end
   end
 end
 
-Spree::Auth.default_secret_key = Devise.secret_key
-
 require 'spree/auth/engine'

data/lib/spree/auth/engine.rb

@@ -15,15 +15,6 @@ module Spree
         Spree.user_class = "Spree::User"
       end
 
-      initializer "solidus_auth_devise.check_secret_token" do
-        if Spree::Auth.default_secret_key == Devise.secret_key
-          puts "[WARNING] You are not setting Devise.secret_key within your application!"
-          puts "You must set this in config/initializers/devise.rb. Here's an example:"
-          puts " "
-          puts %Q{Devise.secret_key = "#{SecureRandom.hex(50)}"}
-        end
-      end
-
       config.to_prepare do
         auth = Spree::Auth::Engine
 

data/solidus_auth_devise.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = "solidus_auth_devise"
-  s.version     = "1.5.0"
+  s.version     = "1.6.0"
   s.summary     = "Provides authentication and authorization services for use with Solidus by using Devise and CanCan."
   s.description = s.summary
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.requirements << "none"
 
-  solidus_version = [">= 1.0.6", "< 2"]
+  solidus_version = [">= 1.0.6", "< 3"]
 
   s.add_dependency "solidus_core", solidus_version
   s.add_dependency "devise", '~> 4.1'

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -20,14 +20,14 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         before { allow(controller).to receive(:spree_current_user) { user } }
 
         it 'proceeds to the first checkout step' do
-          spree_get :edit, { state: 'address' }
+          get :edit, { state: 'address' }
           expect(response).to render_template :edit
         end
       end
 
       context 'when not authenticated as guest' do
         it 'redirects to registration step' do
-          spree_get :edit, { state: 'address' }
+          get :edit, { state: 'address' }
           expect(response).to redirect_to spree.checkout_registration_path
         end
       end
@@ -36,7 +36,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         before { order.email = 'guest@solidus.io' }
 
         it 'proceeds to the first checkout step' do
-          spree_get :edit, { state: 'address' }
+          get :edit, { state: 'address' }
           expect(response).to render_template :edit
         end
 
@@ -50,7 +50,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
           end
 
           it 'redirects to registration step' do
-            spree_get :edit, { state: 'address' }
+            get :edit, { state: 'address' }
             expect(response).to redirect_to spree.checkout_registration_path
           end
         end
@@ -67,14 +67,14 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         before { allow(controller).to receive(:spree_current_user) { user } }
 
         it 'proceeds to the first checkout step' do
-          spree_get :edit, { state: 'address' }
+          get :edit, { state: 'address' }
           expect(response).to render_template :edit
         end
       end
 
       context 'when authenticated as guest' do
         it 'proceeds to the first checkout step' do
-          spree_get :edit, { state: 'address' }
+          get :edit, { state: 'address' }
           expect(response).to render_template :edit
         end
       end
@@ -96,7 +96,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
 
         it 'redirects to the tokenized order view' do
           request.cookie_jar.signed[:guest_token] = 'ABC'
-          spree_post :update, { state: 'confirm' }
+          post :update, { state: 'confirm' }
           expect(response).to redirect_to spree.token_order_path(order, 'ABC')
           expect(flash.notice).to eq Spree.t(:order_processed_successfully)
         end
@@ -110,7 +110,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         end
 
         it 'redirects to the standard order view' do
-          spree_post :update, { state: 'confirm' }
+          post :update, { state: 'confirm' }
           expect(response).to redirect_to spree.order_path(order)
         end
       end
@@ -121,13 +121,13 @@ RSpec.describe Spree::CheckoutController, type: :controller do
     it 'does not check registration' do
       allow(controller).to receive(:check_authorization)
       expect(controller).not_to receive(:check_registration)
-      spree_get :registration
+      get :registration
     end
 
     it 'checks if the user is authorized for :edit' do
       expect(controller).to receive(:authorize!).with(:edit, order, token)
       request.cookie_jar.signed[:guest_token] = token
-      spree_get :registration, {}
+      get :registration, {}
     end
   end
 
@@ -138,12 +138,12 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       controller.stub :check_authorization
       order.stub update_attributes: true
       controller.should_not_receive :check_registration
-      spree_put :update_registration, { order: { } }
+      put :update_registration, { order: { email: 'foo@example.com' } }
     end
 
     it 'renders the registration view if unable to save' do
       allow(controller).to receive(:check_authorization)
-      spree_put :update_registration, { order: { email: 'invalid' } }
+      put :update_registration, { order: { email: 'invalid' } }
       expect(flash[:registration_error]).to eq I18n.t(:email_is_invalid, scope: [:errors, :messages])
       expect(response).to render_template :registration
     end
@@ -151,7 +151,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
     it 'redirects to the checkout_path after saving' do
       allow(order).to receive(:update_attributes) { true }
       allow(controller).to receive(:check_authorization)
-      spree_put :update_registration, { order: { email: 'jobs@spreecommerce.com' } }
+      put :update_registration, { order: { email: 'jobs@spreecommerce.com' } }
       expect(response).to redirect_to spree.checkout_path
     end
 
@@ -159,7 +159,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       request.cookie_jar.signed[:guest_token] = token
       allow(order).to receive(:update_attributes) { true }
       expect(controller).to receive(:authorize!).with(:edit, order, token)
-      spree_put :update_registration, { order: { email: 'jobs@spreecommerce.com' } }
+      put :update_registration, { order: { email: 'jobs@spreecommerce.com' } }
     end
   end
 end

data/spec/controllers/spree/products_controller_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Spree::ProductsController, type: :controller do
     allow(controller).to receive(:before_save_new_order)
     allow(controller).to receive(:spree_current_user) { user }
     allow(user).to receive(:has_spree_role?) { true }
-    spree_get :show, id: product.to_param
+    get :show, id: product.to_param
     expect(response.status).to eq(200)
   end
 
@@ -15,7 +15,7 @@ RSpec.describe Spree::ProductsController, type: :controller do
     allow(controller).to receive(:before_save_new_order)
     allow(controller).to receive(:spree_current_user) { user }
     allow(user).to receive(:has_spree_role?) { false }
-    spree_get :show, id: product.to_param
+    get :show, id: product.to_param
     expect(response.status).to eq(404)
   end
 end

data/spec/controllers/spree/user_passwords_controller_spec.rb

@@ -7,14 +7,14 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
   describe 'GET edit' do
     context 'when the user token has not been specified' do
       it 'redirects to the new session path' do
-        spree_get :edit
+        get :edit
         expect(response).to redirect_to(
           'http://test.host/user/spree_user/sign_in'
         )
       end
 
       it 'flashes an error' do
-        spree_get :edit
+        get :edit
         expect(flash[:alert]).to include(
           "You can't access this page without coming from a password reset " +
           'email'
@@ -24,7 +24,7 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
 
     context 'when the user token has been specified' do
       it 'does something' do
-        spree_get :edit, reset_password_token: token
+        get :edit, reset_password_token: token
         expect(response.code).to eq('200')
       end
     end
@@ -33,7 +33,7 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
   context '#update' do
     context 'when updating password with blank password' do
       it 'shows error flash message, sets spree_user with token and re-displays password edit form' do
-        spree_put :update, { spree_user: { password: '', password_confirmation: '', reset_password_token: token } }
+        put :update, { spree_user: { password: '', password_confirmation: '', reset_password_token: token } }
         expect(assigns(:spree_user).kind_of?(Spree::User)).to eq true
         expect(assigns(:spree_user).reset_password_token).to eq token
         expect(flash[:error]).to eq I18n.t(:cannot_be_blank, scope: [:devise, :user_passwords, :spree_user])

data/spec/controllers/spree/user_registrations_controller_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
     let(:password_confirmation) { 'foobar123' }
 
     subject do
-      spree_post(:create,
+      post(:create,
         spree_user: {
           email: 'foobar@example.com',
           password: 'foobar123',

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
     let(:password) { 'secret' }
 
     subject do
-      spree_post(:create,
+      post(:create,
         spree_user: {
           email: user.email,
           password: password

data/spec/controllers/spree/users_controller_spec.rb

@@ -9,14 +9,14 @@ RSpec.describe Spree::UsersController, type: :controller do
   context '#load_object' do
     it 'redirects to signup path if user is not found' do
       allow(controller).to receive(:spree_current_user) { nil }
-      spree_put :update, { user: { email: 'foobar@example.com' } }
+      put :update, { user: { email: 'foobar@example.com' } }
       expect(response).to redirect_to spree.login_path
     end
   end
 
   context '#create' do
     it 'creates a new user' do
-      spree_post :create, { user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' } }
+      post :create, { user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' } }
       expect(assigns[:user].new_record?).to be false
     end
   end
@@ -24,14 +24,14 @@ RSpec.describe Spree::UsersController, type: :controller do
   context '#update' do
     context 'when updating own account' do
       it 'performs update' do
-        spree_put :update, { user: { email: 'mynew@email-address.com' } }
+        put :update, { user: { email: 'mynew@email-address.com' } }
         expect(assigns[:user].email).to eq 'mynew@email-address.com'
         expect(response).to redirect_to spree.account_url(only_path: true)
       end
     end
 
     it 'does not update roles' do
-      spree_put :update, user: { spree_role_ids: [role.id] }
+      put :update, user: { spree_role_ids: [role.id] }
       expect(assigns[:user].spree_roles).to_not include role
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -19,7 +19,7 @@ dependencies:
         version: 1.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 1.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: 1.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: 1.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: solidus_frontend
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ dependencies:
         version: 1.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
         version: 1.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -312,8 +312,8 @@ files:
 - app/mailers/spree/user_mailer.rb
 - app/models/spree/auth_configuration.rb
 - app/models/spree/user.rb
+- app/overrides/auth_admin_login_navigation_bar.rb
 - app/overrides/auth_shared_login_bar.rb
-- app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface
 - bin/rails
 - circle.yml
 - config/initializers/devise.rb

data/app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface

@@ -1,4 +0,0 @@
-<!-- insert_top "[data-hook='admin_login_navigation_bar'], #admin_login_navigation_bar[data-hook]"
-     original '841227d0aedf7909d62237d8778df99100087715' -->
-
-<%= render partial: "spree/layouts/admin/login_nav" %>