spree_auth_devise 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 118d51e3f609cac9bc6a69453d96893824814d99a44e8be828741ebd410c9aa9
-  data.tar.gz: dcb44d6ef585b73b82665d12b04821e5f9d6393ef87626cbbd4091e060390365
+  metadata.gz: 91d6026f95c5de39d8065c441df4c64af29eccd78bf0aeafebfea951bbf87a91
+  data.tar.gz: 67f50ef5c962e5248621d94311a704db4c0081b6dc8864a1c01892adb5374a26
 SHA512:
-  metadata.gz: 0e3de0c4e4fd5adf202a9fa312f6025eaef63d9b61c8024703b418dc911d9dab405c76d3c25c6ed3f7e7d84f1bb867c2874a21e08dad903618c8632cf087531a
-  data.tar.gz: d650a6a697c44abba86562a2bc94b98ba117ce74a4a57f614f6e210690ea4f44f8e21f64aaf8a55458b8323b0e8686a48f3b313453337635aae8ffd2fe944dc3
+  metadata.gz: 7a8bd6c26af9821c350b367937f93901d1fc94c89b3e8fc99f2b1c583332455b4f66f23f7c015f2c94a43cca7af940fc11cae6dbab21656d05c3b57db5efec72
+  data.tar.gz: 6796f33284e8c55fa71045d39c0e8209d59550a044cb7c92efaf441a3bc8c70d4d68dcaface2ea6be690ebafbe1ed6a68f2e0bbbfa539c6a118d2d359b46a0a7

data/.travis.yml

@@ -15,8 +15,8 @@ services:
 language: ruby
 
 rvm:
-  - 2.5
-  - 2.6
+  - 2.7
+  - 3.0
 
 env:
   - DB=mysql
@@ -27,8 +27,11 @@ gemfile:
   - gemfiles/spree_master.gemfile
 
 jobs:
+  exclude:
+  - rvm: 3.0
+    gemfile: gemfiles/spree_4_1.gemfile
   allow_failures:
-    - gemfile: gemfiles/spree_master.gemfile
+  - gemfile: gemfiles/spree_master.gemfile
 
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"

data/app/controllers/spree/user_confirmations_controller.rb

@@ -8,6 +8,18 @@ class Spree::UserConfirmationsController < Devise::ConfirmationsController
 
   before_action :set_current_order
 
+  # POST /resource/confirmation
+  def create
+    self.resource = resource_class.send_confirmation_instructions(resource_params, current_store)
+    yield resource if block_given?
+
+    if successfully_sent?(resource)
+      respond_with({}, location: after_resending_confirmation_instructions_path_for(resource_name))
+    else
+      respond_with(resource)
+    end
+  end
+
   # GET /resource/confirmation?confirmation_token=abcdef
   def show
     self.resource = resource_class.confirm_by_token(params[:confirmation_token])

data/app/controllers/spree/user_passwords_controller.rb

@@ -53,4 +53,10 @@ class Spree::UserPasswordsController < Devise::PasswordsController
   def new_session_path(resource_name)
     spree.send("new_#{resource_name}_session_path")
   end
+
+  private
+
+  def accurate_title
+    Spree.t(:reset_password)
+  end
 end

data/app/controllers/spree/user_registrations_controller.rb

@@ -23,6 +23,7 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   # POST /resource/sign_up
   def create
     @user = build_resource(spree_user_params)
+    resource.skip_confirmation_notification! if Spree::Auth::Config[:confirmable]
     resource_saved = resource.save
     yield resource if block_given?
     if resource_saved
@@ -30,10 +31,12 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
         set_flash_message :notice, :signed_up
         sign_up(resource_name, resource)
         session[:spree_user_signup] = true
+        resource.send_confirmation_instructions(current_store) if Spree::Auth::Config[:confirmable]
         redirect_to_checkout_or_account_path(resource)
       else
         set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}"
         expire_data_after_sign_in!
+        resource.send_confirmation_instructions(current_store) if Spree::Auth::Config[:confirmable]
         respond_with resource, location: after_inactive_sign_up_path_for(resource)
       end
     else
@@ -89,6 +92,10 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
 
   private
 
+  def accurate_title
+    Spree.t(:sign_up)
+  end
+
   def spree_user_params
     params.require(:spree_user).permit(Spree::PermittedAttributes.user_attributes)
   end

data/app/mailers/spree/user_mailer.rb

@@ -6,15 +6,18 @@ module Spree
       @locale = @current_store.has_attribute?(:default_locale) ? @current_store.default_locale : I18n.default_locale
       I18n.locale = @locale if @locale.present?
       @edit_password_reset_url = spree.edit_spree_user_password_url(reset_password_token: token, host: @current_store.url)
+      @user = user
 
-      mail to: user.email, from: from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions])
+      mail to: user.email, from: from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions]), store_url: @current_store.url
     end
 
     def confirmation_instructions(user, token, _opts = {})
-      @confirmation_url = spree.spree_user_confirmation_url(confirmation_token: token, host: Spree::Store.current.url)
+      current_store_id = _opts[:current_store_id]
+      @current_store = Spree::Store.find(current_store_id) || Spree::Store.current
+      @confirmation_url = spree_user_confirmation_url(confirmation_token: token, host: Spree::Store.current.url)
       @email = user.email
 
-      mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions])
+      mail to: user.email, from: from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions]), store_url: @current_store.url
     end
   end
 end

data/app/models/spree/user.rb

@@ -27,6 +27,31 @@ module Spree
       has_spree_role?('admin')
     end
 
+    def self.send_confirmation_instructions(attributes = {}, current_store)
+      confirmable = find_by_unconfirmed_email_with_errors(attributes) if reconfirmable
+      unless confirmable.try(:persisted?)
+        confirmable = find_or_initialize_with_errors(confirmation_keys, attributes, :not_found)
+      end
+      confirmable.resend_confirmation_instructions(current_store) if confirmable.persisted?
+      confirmable
+    end
+
+    def resend_confirmation_instructions(current_store)
+      pending_any_confirmation do
+        send_confirmation_instructions(current_store)
+      end
+    end
+
+    def send_confirmation_instructions(current_store)
+      unless @raw_confirmation_token
+        generate_confirmation_token!
+      end
+
+      opts = pending_reconfirmation? ? { to: unconfirmed_email } : {}
+      opts[:current_store_id] = current_store.id
+      send_devise_notification(:confirmation_instructions, @raw_confirmation_token, opts)
+    end
+
     def self.send_reset_password_instructions(attributes={}, current_store)
       recoverable = find_or_initialize_with_errors(reset_password_keys, attributes, :not_found)
       recoverable.send_reset_password_instructions(current_store) if recoverable.persisted?

data/app/views/spree/user_mailer/confirmation_instructions.html.erb

@@ -0,0 +1,20 @@
+<h1>
+  <%= Spree.t('user_mailer.confirmation_instructions.welcome', email: @email) %>
+</h1>
+<p>
+  <%= Spree.t('user_mailer.confirmation_instructions.instructions_1', { store_name: @current_store.name }) %>
+</p>
+<p>
+  <%= Spree.t('user_mailer.confirmation_instructions.instructions_2') %>
+</p>
+<p class="body-action">
+  <a href="<%= @confirmation_url %>" class="button button--green"><%= Spree.t('user_mailer.confirmation_instructions.button') %></a>
+</p>
+<p>
+  <%= Spree.t('user_mailer.confirmation_instructions.instructions_3') %>
+</p>
+<p>
+  <%= Spree.t('user_mailer.confirmation_instructions.thanks') %>
+  <br />
+  <%= Spree.t('user_mailer.confirmation_instructions.store_team', { store_name: @current_store.name }) %>
+</p>

data/app/views/spree/user_mailer/confirmation_instructions.text.erb

@@ -1,5 +1,8 @@
-<%= Spree.t('confirmation_instructions.welcome', email: @email) %>
-
-<%= Spree.t('confirmation_instructions.confirm') %>
-
+<%= Spree.t('user_mailer.confirmation_instructions.welcome', email: @email) %>
+<%= Spree.t('user_mailer.confirmation_instructions.instructions_1', { store_name: @current_store.name }) %>
+<%= Spree.t('user_mailer.confirmation_instructions.instructions_2') %>
+<%= Spree.t('user_mailer.confirmation_instructions.button') %>
 <%= @confirmation_url %>
+<%= Spree.t('user_mailer.confirmation_instructions.instructions_3') %>
+<%= Spree.t('user_mailer.confirmation_instructions.thanks') %>
+<%= Spree.t('user_mailer.confirmation_instructions.store_team', { store_name: @current_store.name }) %>

data/app/views/spree/user_mailer/reset_password_instructions.html.erb

@@ -0,0 +1,20 @@
+<h1>
+  <%= Spree.t('user_mailer.reset_password_instructions.welcome', email: @user.email) %>
+</h1>
+<p>
+  <%= Spree.t('user_mailer.reset_password_instructions.instructions_1', { store_name: @current_store.name }) %>
+</p>
+<p>
+  <%= Spree.t('user_mailer.reset_password_instructions.instructions_2') %>
+</p>
+<p class="body-action">
+  <a href="<%= @edit_password_reset_url %>" class="button button--green"><%= Spree.t('user_mailer.reset_password_instructions.button') %></a>
+</p>
+<p>
+  <%= Spree.t('user_mailer.reset_password_instructions.instructions_3') %>
+</p>
+<p>
+  <%= Spree.t('user_mailer.reset_password_instructions.thanks') %>
+  <br />
+  <%= Spree.t('user_mailer.reset_password_instructions.store_team', { store_name: @current_store.name }) %>
+</p>

data/app/views/spree/user_mailer/reset_password_instructions.text.erb

@@ -1,5 +1,12 @@
-<%= Spree.t('user_mailer.reset_password_instructions.instructions_1') %>
+<%= Spree.t('user_mailer.reset_password_instructions.welcome', email: @user.email) %>
 
+<%= Spree.t('user_mailer.reset_password_instructions.instructions_1', { store_name: @current_store.name }) %>
+<%= Spree.t('user_mailer.reset_password_instructions.instructions_2') %>
+
+<%= Spree.t('user_mailer.reset_password_instructions.button') %>
 <%= @edit_password_reset_url %>
 
-<%= Spree.t('user_mailer.reset_password_instructions.instructions_2') %>
+<%= Spree.t('user_mailer.reset_password_instructions.instructions_3') %>
+
+<%= Spree.t('user_mailer.reset_password_instructions.thanks') %>
+<%= Spree.t('user_mailer.reset_password_instructions.store_team', { store_name: @current_store.name }) %>

data/config/locales/de.yml

@@ -3,8 +3,6 @@ de:
   spree:
     admin_login: Admin Login
     change_your_password: Kennwort zurücksetzen
-    store_credits:
-      credit_balance: Saldo des Guthabens
     user_mailer:
       reset_password_instructions:
         instructions_1: "Es wurde eine Anfrage zum Zurücksetzen Ihres Passworts gestellt.\nWenn Sie diese Anfrage nicht gestellt haben, ignorieren Sie diese E-Mail.\n\nWenn Sie diese Anfrage gestellt haben, klicken Sie bitte auf den folgenden Link:"

data/config/locales/en.yml

@@ -3,18 +3,26 @@ en:
   spree:
     admin_login: "Admin Login"
     change_your_password: "Change your password"
-    store_credits:
-      credit_balance: Store Credit Balance
     user_mailer:
       reset_password_instructions:
-        instructions_1: "A request to reset your password has been made.\nIf you did not make this request, simply ignore this email.\n\nIf you did make this request just click the link below:"
-        instructions_2: "If the above URL does not work try copying and pasting it into your browser.\nIf you continue to have problems please feel free to contact us."
+        welcome: "Hi %{email}"
+        instructions_1: "A request to reset the password for your %{store_name} account has been made."
+        instructions_2: Click the button below to reset it.
+        instructions_3: If you did not request a password change ignore this email or contact us.
+        button: Reset your password
+        thanks: Thank you,
+        store_team: "%{store_name} Team"
       confirmation_instructions:
         welcome: "Welcome %{email}!"
-        confirm: "You can confirm your account email through the url below:"
+        instructions_1: "Thanks for registering at %{store_name}."
+        instructions_2: "Click the button below to confirm your account:"
+        instructions_3: If you have any questions, feel free to simply reply to this email.
+        button: Confirm email address
+        thanks: Thank you,
+        store_team: "%{store_name} Team"
   devise:
     confirmations:
-      confirmed: Your account was successfully confirmed. You are now signed in.
+      confirmed: Your account was successfully confirmed. You can now log in.
       send_instructions: You will receive an email with instructions about how to confirm your account in a few minutes.
       spree_user:
         already_confirmed: Email was already confirmed, please try signing in.

data/config/locales/zh-TW.yml

@@ -3,8 +3,6 @@ zh-TW:
   spree:
     admin_login: "管理員登入"
     change_your_password: "更改密碼"
-    store_credits:
-      credit_balance: 商城購物金餘額
   devise:
     confirmations:
       confirmed: 你的帳號已經確認完成，現在你已經登入網站了。

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

@@ -6,7 +6,8 @@ module Spree::CheckoutControllerDecorator
   end
 
   def registration
-    @user = Spree.user_class.new
+    @user = Spree.user_class.new 
+    @title = Spree.t(:registration)
   end
 
   def update_registration

data/lib/spree_auth_devise.rb

@@ -1,5 +1,4 @@
 require 'spree_core'
 require 'spree/auth/devise'
 require 'spree/authentication_helpers'
-require 'deface'
 require 'spree_extension'

data/spec/features/checkout_spec.rb

@@ -87,9 +87,9 @@ RSpec.feature 'Checkout', :js, type: :feature do
       # The 'plain-text' version is sent in the email and there's one way to get that!
       reset_password_email = ActionMailer::Base.deliveries.first
       token_url_regex = /^http:\/\/www.example.com\/user\/spree_user\/password\/edit\?reset_password_token=(.*)$/
-      token = token_url_regex.match(reset_password_email.body.to_s)[1]
+      token = token_url_regex.match(reset_password_email.body.encoded)[1]
 
-      visit spree.edit_spree_user_password_path(reset_password_token: token)
+      visit spree.edit_spree_user_password_path(reset_password_token: token).tr("%0D","")
       fill_in 'Password', with: 'password'
       fill_in 'Password Confirmation', with: 'password'
       click_button 'Update'

data/spec/features/confirmation_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 RSpec.feature 'Confirmation', type: :feature, reload_user: true do
   before do
     set_confirmable_option(true)
-    Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))
+    expect(Spree::UserMailer).to receive(:confirmation_instructions).with(anything, anything, { current_store_id: Spree::Store.current.id }).and_return(double(deliver: true))
   end
 
   after(:each) { set_confirmable_option(false) }

data/spec/mailers/user_mailer_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Spree::UserMailer, type: :mailer do
 
       context 'body includes' do
         it 'password reset url' do
-          expect(@message.body.raw_source).to include "http://#{store.url}/user/spree_user/password/edit"
+          expect(@message.body.encoded).to include "http://#{store.url}/user/spree_user/password/edit"
         end
       end
     end

data/spec/models/user_spec.rb

@@ -68,7 +68,7 @@ RSpec.describe Spree::User, type: :model do
   describe "confirmable", reload_user: true do
     it "is confirmable if the confirmable option is enabled" do
       set_confirmable_option(true)
-      Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))
+      Spree::UserMailer.stub(:confirmation_instructions).with(anything, anything, { current_store_id: Spree::Store.current.id }).and_return(double(deliver: true))
       expect(Spree.user_class.devise_modules).to include(:confirmable)
       set_confirmable_option(false)
     end

data/spree_auth_devise.gemspec

@@ -3,24 +3,29 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_auth_devise'
-  s.version     = '4.2.0'
+  s.version     = '4.3.0'
   s.summary     = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
   s.description = s.summary
 
   s.required_ruby_version = '>= 2.5.0'
 
-  s.author      = 'Sean Schofield'
-  s.email       = 'sean@spreecommerce.com'
+  s.authors     = ['Sean Schofield', 'Spark Solutions']
+  s.email       = 'hello@spreecommerce.org'
   s.homepage    = 'https://spreecommerce.org'
   s.license     = 'BSD-3-Clause'
 
+  s.metadata = {
+    "bug_tracker_uri"   => "https://github.com/spree/spree_auth_devise/issues",
+    "changelog_uri"     => "https://github.com/spree/spree_auth_devise/releases/tag/v#{s.version}",
+    "documentation_uri" => "https://guides.spreecommerce.org/",
+    "source_code_uri"   => "https://github.com/spree/spree_auth_devise/tree/v#{s.version}",
+  }
+
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- spec/*`.split("\n")
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'deface', '~> 1.0'
-
   s.add_dependency 'devise', '~> 4.7'
   s.add_dependency 'devise-encryptable', '0.2.0'
 

metadata

@@ -1,29 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Sean Schofield
+- Spark Solutions
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +89,7 @@ dependencies:
         version: '0'
 description: Provides authentication and authorization services for use with Spree
   by using Devise and CanCan.
-email: sean@spreecommerce.com
+email: hello@spreecommerce.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -127,10 +114,11 @@ files:
 - app/mailers/spree/user_mailer.rb
 - app/models/spree/auth_configuration.rb
 - app/models/spree/user.rb
-- app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface
 - app/services/spree/account/create.rb
 - app/services/spree/account/update.rb
+- app/views/spree/user_mailer/confirmation_instructions.html.erb
 - app/views/spree/user_mailer/confirmation_instructions.text.erb
+- app/views/spree/user_mailer/reset_password_instructions.html.erb
 - app/views/spree/user_mailer/reset_password_instructions.text.erb
 - app/views/spree/user_passwords/edit.html.erb
 - app/views/spree/user_passwords/new.html.erb
@@ -231,7 +219,11 @@ files:
 homepage: https://spreecommerce.org
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/spree/spree_auth_devise/issues
+  changelog_uri: https://github.com/spree/spree_auth_devise/releases/tag/v4.3.0
+  documentation_uri: https://guides.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.3.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -248,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Provides authentication and authorization services for use with Spree by

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 '71d12ae155143c6ea8090942955299485f534153' -->
-
-<%= render partial: "spree/layouts/admin/login_nav" %>