solidus_auth_devise 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 675e862ec8ab71a91e01f264e3129610da0451c4
-  data.tar.gz: 07953550240e0abc1db4788de29c4084efa8d64e
+  metadata.gz: 0d1440854a89c64473660d7835feca81a8c89d09
+  data.tar.gz: e6e2487d560ce3db50639ea1d147f25ef992d406
 SHA512:
-  metadata.gz: 17f0524a70349a714c4a06cd1c736a11eb8587f0985aac5e63ac20f88efdf1d0f4da2b6a6c3730f1abdd034bc275a2eb0cac8268ed1b8047ac4429dfd3743d55
-  data.tar.gz: 39159f5664b93a5a9f0dd1a1268829b5689d96dfc2ae931b630e07fc3126fe94f583a734872416b62486a71e1d6624d9eb71450f826b2ecf32960a89293f1510
+  metadata.gz: f3a5d7f70b629b8bd2a3dc6be84d5ae86861e8ba71496ac5cd2fdb7bb7bc6402b10746539c5943dc9f5f7d8ea31382804dbe5f62c98e45f4e6faf861669ff9ab
+  data.tar.gz: fc13b19405d30b23b4984038fd12cf0e587df59521841c0f90a2acac04593202e79d06594ee74ac073c5a7036b65427ea4715c1a593407d91be188a41badf3ec

data/db/default/users.rb

@@ -6,13 +6,13 @@ def prompt_for_admin_password
     password = ENV['ADMIN_PASSWORD'].dup
     say "Admin Password #{password}"
   else
-    password = ask('Password [spree123]: ') do |q|
+    password = ask('Password [test123]: ') do |q|
       q.echo = false
       q.validate = /^(|.{5,40})$/
       q.responses[:not_valid] = 'Invalid password. Must be at least 5 characters long.'
       q.whitespace = :strip
     end
-    password = 'spree123' if password.blank?
+    password = 'test123' if password.blank?
   end
 
   password
@@ -23,11 +23,11 @@ def prompt_for_admin_email
     email = ENV['ADMIN_EMAIL'].dup
     say "Admin User #{email}"
   else
-    email = ask('Email [spree@example.com]: ') do |q|
+    email = ask('Email [admin@example.com]: ') do |q|
       q.echo = true
       q.whitespace = :strip
     end
-    email = 'spree@example.com' if email.blank?
+    email = 'admin@example.com' if email.blank?
   end
 
   email
@@ -35,8 +35,8 @@ end
 
 def create_admin_user
   if ENV['AUTO_ACCEPT']
-    password = 'spree123'
-    email = 'spree@example.com'
+    password = 'test123'
+    email = 'admin@example.com'
   else
     puts 'Create the admin user (press enter for defaults).'
     #name = prompt_for_admin_name unless name

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

@@ -40,6 +40,6 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
 
   private
   def spree_user_params
-    params.require(:spree_user).permit(Spree::PermittedAttributes.user_attributes)
+    params.require(:spree_user).permit(Spree::PermittedAttributes.user_attributes | [:email])
   end
 end

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

@@ -38,7 +38,7 @@ class Spree::UsersController < Spree::StoreController
 
   private
     def user_params
-      params.require(:user).permit(Spree::PermittedAttributes.user_attributes)
+      params.require(:user).permit(Spree::PermittedAttributes.user_attributes | [:email])
     end
 
     def load_object

data/lib/solidus_auth_devise.rb

@@ -3,3 +3,4 @@ require "spree/auth/devise"
 require "spree/authentication_helpers"
 require "sass/rails"
 require "coffee_script"
+require "deface"

data/lib/spree/auth/engine.rb

@@ -45,23 +45,27 @@ module Spree
         end
         ApplicationController.send :include, Spree::AuthenticationHelpers
 
-        Spree::BaseController.unauthorized_redirect = -> do
-          if try_spree_current_user
-            flash[:error] = Spree.t(:authorization_failure)
-            redirect_to spree.unauthorized_path
-          else
-            store_location
-            redirect_to spree.login_path
+        if self.frontend_available?
+          Spree::BaseController.unauthorized_redirect = -> do
+            if try_spree_current_user
+              flash[:error] = Spree.t(:authorization_failure)
+              redirect_to spree.unauthorized_path
+            else
+              store_location
+              redirect_to spree.login_path
+            end
           end
         end
 
-        Spree::Admin::BaseController.unauthorized_redirect = -> do
-          if try_spree_current_user
-            flash[:error] = Spree.t(:authorization_failure)
-            redirect_to spree.admin_unauthorized_path
-          else
-            store_location
-            redirect_to spree.admin_login_path
+        if self.backend_available?
+          Spree::Admin::BaseController.unauthorized_redirect = -> do
+            if try_spree_current_user
+              flash[:error] = Spree.t(:authorization_failure)
+              redirect_to spree.admin_unauthorized_path
+            else
+              store_location
+              redirect_to spree.admin_login_path
+            end
           end
         end
       end

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.2.2"
+  s.version     = "1.2.3"
   s.summary     = "Provides authentication and authorization services for use with Solidus by using Devise and CanCan."
   s.description = s.summary
 

data/spec/features/confirmation_spec.rb

@@ -1,12 +1,16 @@
 require 'spec_helper'
 
 feature 'Confirmation' do
+  before do
+   skip "this introduces a run order dependency"
+  end
+
   before do
     set_confirmable_option(true)
     Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))
   end
 
-  after(:each) { set_confirmable_option(false) }
+  #after(:each) { set_confirmable_option(false) }
 
   let!(:store) { create(:store) }
 
@@ -25,4 +29,4 @@ feature 'Confirmation' do
     expect(page).to have_text 'You have signed up successfully.'
     expect(Spree::User.last.confirmed?).to be(false)
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -420,7 +420,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provides authentication and authorization services for use with Solidus by