solidus_auth_devise 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84725664c8b934aad5a5bf577d7d3d68780a2de90bbe24ab2ad873072bee53c8
-  data.tar.gz: 6ac102f9f5d9003520ea694db1b396f1c5009561a67f0a5ef986623ba8582c1e
+  metadata.gz: 9e0d47cfd1b48b91343c2ba368dc685cf3e8c571a79d7d38c5b49538cf00d16b
+  data.tar.gz: ad94efe038f6e2fcc044e7e7943b9b62dc2bd43cb36eb3721d2a81708e596c52
 SHA512:
-  metadata.gz: a9fc38b7508fd7b58025858556c94db80d154bce9e838084b4bf1d30cd36703500194046b57ee7ce34b27c49f725845ef86cf13ea342ed0227df3582c0d9ed2a
-  data.tar.gz: ae8963f1294e759c4eeb4cbeceedc526f99635c5d973e0bcbd641f6142124efc88a8204d51cd555426d6ec8b5d727a52bb376967fbe2eb026282001771084cd9
+  metadata.gz: 3e425503e6ee10e0068856686a84fc60ec0ef38280d24e4882364801ff09c7e280604574ab1d3f4417e0ac06c09ae47ff519a4f64ffe8a56fcce806e285abf73
+  data.tar.gz: 4124d2869c44f9dd66f9422d4dd31b1d0e68ae663e4f46ebecfc510e106209966d273d66c8d4978d0a2d949a040bffe5d0a1306cb745b079301f7d914130922a

data/Gemfile

@@ -10,6 +10,9 @@ gem "solidus_backend", github: "solidusio/solidus", branch: branch
 rails_requirement_string = ENV.fetch("RAILS_VERSION", "7.0")
 gem "rails", "~> #{rails_requirement_string}"
 
+# json 3 is incompatible with Rails < 8.1.
+gem "json", "< 3", require: false
+
 # The solidus_frontend gem has been pulled out since v3.2
 if branch >= "v3.2"
   gem "solidus_frontend"

data/README.md

@@ -27,7 +27,17 @@ bundle exec rake db:seed
 
 #### Default Username/Password
 
-As part of running the above installation steps, you will be asked to set an admin email/password combination. The default values are `admin@example.com` and `test123`, respectively.
+The seed creates an admin user when no admin exists yet. Set the `ADMIN_EMAIL`
+and `ADMIN_PASSWORD` environment variables to choose its credentials:
+
+```shell
+ADMIN_EMAIL=you@example.com ADMIN_PASSWORD=... bundle exec rake spree_auth:admin:create
+```
+
+In the `development` and `test` environments, the credentials default to
+`admin@example.com` and `test123` when the variables are not set. In every other
+environment (`production`, `staging`, etc.) both variables are required, and the
+seed aborts with an error if either is missing.
 
 #### Confirmable
 
@@ -36,7 +46,7 @@ To enable Devise's Confirmable module, which will send the user an email with a
 * Add this line to an initializer in your Rails project (typically `config/initializers/spree.rb`):
 
 ```ruby
-Spree::Auth::Config[:confirmable] = true
+Spree::Auth::Config.confirmable = true
 ```
 
 * Add a Devise initializer to your Rails project (typically `config/initializers/devise.rb`):

data/app/models/spree/user.rb

@@ -7,7 +7,7 @@ module Spree
 
     devise :database_authenticatable, :registerable, :recoverable,
       :rememberable, :trackable, :validatable, :encryptable
-    devise :confirmable if Spree::Auth::Config[:confirmable]
+    devise :confirmable if Spree::Auth::Config.confirmable
 
     after_destroy :scramble_email_and_password
     after_discard :scramble_email_and_password

data/config/routes.rb

@@ -28,7 +28,7 @@ Spree::Core::Engine.routes.draw do
       post "/password/recover", to: "user_passwords#create", as: :reset_password
       get "/password/change", to: "user_passwords#edit", as: :edit_password
       put "/password/change", to: "user_passwords#update", as: :update_password
-      get "/confirm", to: "user_confirmations#show", as: :confirmation if Spree::Auth::Config[:confirmable]
+      get "/confirm", to: "user_confirmations#show", as: :confirmation if Spree::Auth::Config.confirmable
     end
 
     get "/checkout/registration", to: "checkout#registration", as: :checkout_registration

data/db/default/users.rb

@@ -7,12 +7,24 @@ if Spree::User.admin.any?
   return
 end
 
-email = ENV["ADMIN_EMAIL"] || "admin@example.com"
-password = ENV["ADMIN_PASSWORD"] || "test123"
+email = ENV["ADMIN_EMAIL"]
+password = ENV["ADMIN_PASSWORD"]
+
+if Rails.env.development? || Rails.env.test?
+  email ||= "admin@example.com"
+  password ||= "test123"
+elsif email.blank? || password.blank?
+  abort <<~MSG
+    Refusing to create an admin user with default credentials in the #{Rails.env} environment.
+    Set ADMIN_EMAIL and ADMIN_PASSWORD and run the task again, for example:
+
+      ADMIN_EMAIL=you@example.com ADMIN_PASSWORD=... bin/rails spree_auth:admin:create
+  MSG
+end
 
 puts "Creating admin user with:"
 puts "  - email: #{email}"
-puts "  - password: #{password}"
+puts "  - password: #{ENV["ADMIN_PASSWORD"] ? "(from ADMIN_PASSWORD)" : password}"
 puts "(please use the ADMIN_EMAIL and ADMIN_PASSWORD environment variables to control how the default admin user is created)"
 
 if Spree::User.find_by(email: email)

data/db/migrate/20260422183113_add_timezone_to_spree_users.rb

@@ -0,0 +1,6 @@
+class AddTimezoneToSpreeUsers < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_users, :timezone, :string, if_not_exists: true,
+      comment: "User's timezone, e.g., 'Eastern Time (US & Canada)'"
+  end
+end

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

@@ -24,8 +24,9 @@ class Spree::Admin::UserPasswordsController < Devise::PasswordsController
 
     set_flash_message(:notice, :send_instructions) if is_navigational_format?
 
-    if resource.errors.empty?
-      respond_with resource, location: admin_user_path(resource)
+    if successfully_sent?(resource)
+      location = (spree_current_user && resource.persisted?) ? admin_user_path(resource) : admin_login_path
+      respond_with resource, location: location
     else
       respond_with_navigational(resource) { render :new }
     end

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

@@ -20,7 +20,7 @@ class Spree::UserPasswordsController < Devise::PasswordsController
 
     set_flash_message(:notice, :send_instructions) if is_navigational_format?
 
-    if resource.errors.empty?
+    if successfully_sent?(resource)
       respond_with resource, location: spree.login_path
     else
       respond_with_navigational(resource) { render :new }

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

@@ -38,7 +38,7 @@ class Spree::UsersController < Spree::StoreController
 
       if params[:user][:password].present?
         # this logic needed b/c devise wants to log us out after password changes
-        if Spree::Auth::Config[:signout_after_password_change]
+        if Spree::Auth::Config.signout_after_password_change
           redirect_url = spree.login_url
         else
           bypass_sign_in(@user)

data/lib/generators/solidus/auth/install/install_generator.rb

@@ -18,14 +18,7 @@ module Solidus
         end
 
         def add_migrations
-          admin_email = options[:admin_email] || (options[:interactive] && ask("Email:", default: "admin@example.com"))
-          admin_password = options[:admin_password] || (options[:interactive] && ask("Password:", default: "test123"))
-
-          options = []
-          options << "ADMIN_EMAIL=#{admin_email}" if admin_email
-          options << "ADMIN_PASSWORD=#{admin_password}" if admin_password
-
-          rake "railties:install:migrations FROM=solidus_auth #{options.shelljoin}"
+          rake "railties:install:migrations FROM=solidus_auth"
         end
 
         def run_migrations
@@ -33,11 +26,26 @@ module Solidus
               options[:auto_run_migrations] == false || # exclude nil
               options[:interactive] && no?("Would you like to run the migrations now?")
 
+            @migrations_skipped = true
             say_status :skip, "Skipping rake db:migrate, don't forget to run it!", :yellow
           else
             rake "db:migrate"
           end
         end
+
+        def create_admin_user
+          return if @migrations_skipped
+
+          admin_email = options[:admin_email] || (options[:interactive] && ask("Email:", default: "admin@example.com"))
+          admin_password = options[:admin_password] || (options[:interactive] && ask("Password:", default: "test123"))
+          return unless admin_email || admin_password
+
+          env = []
+          env << "ADMIN_EMAIL=#{admin_email.shellescape}" if admin_email
+          env << "ADMIN_PASSWORD=#{admin_password.shellescape}" if admin_password
+
+          rake "spree_auth:admin:create #{env.join(" ")}"
+        end
       end
     end
   end

data/lib/generators/solidus/auth/install/templates/config/initializers/devise.rb.erb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 Devise.secret_key = '<%= SecureRandom.hex(64) %>'
-Devise.email_regexp = Spree::Config[:default_email_regexp]
+Devise.email_regexp = Spree::Config.default_email_regexp

data/lib/patches/frontend/controllers/solidus_auth_devise/checkout_controller_patch.rb

@@ -50,7 +50,7 @@ module SolidusAuthDevise
     end
 
     def registration_required?
-      Spree::Auth::Config[:registration_step] &&
+      Spree::Auth::Config.registration_step &&
         !already_registered?
     end
 
@@ -60,7 +60,7 @@ module SolidusAuthDevise
 
     def guest_authenticated?
       current_order&.email.present? &&
-        Spree::Config[:allow_guest_checkout]
+        Spree::Config.allow_guest_checkout
     end
 
     # Overrides the equivalent method defined in Spree::Core.  This variation of the method will ensure that users

data/lib/solidus_auth_devise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusAuthDevise
-  VERSION = "2.6.0"
+  VERSION = "2.6.1"
 end

data/lib/views/frontend/spree/checkout/registration.html.erb

@@ -4,7 +4,7 @@
   <div id="account" class="columns alpha eight">
     <%= render template: 'spree/user_sessions/new' %>
   </div>
-  <% if Spree::Config[:allow_guest_checkout] %>
+  <% if Spree::Config.allow_guest_checkout %>
     <div id="guest_checkout" data-hook class="columns omega eight">
       <h6><%= t('spree.guest_user_account') %></h6>
       <% if flash[:registration_error] %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Solidus Team
@@ -194,6 +194,7 @@ files:
 - db/migrate/20141002154641_add_confirmable_to_users.rb
 - db/migrate/20190125170630_add_reset_password_token_index_to_spree_users.rb
 - db/migrate/20200417153503_add_unconfirmed_email_to_spree_users.rb
+- db/migrate/20260422183113_add_timezone_to_spree_users.rb
 - db/seeds.rb
 - lib/controllers/backend/spree/admin/user_passwords_controller.rb
 - lib/controllers/backend/spree/admin/user_sessions_controller.rb
@@ -264,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Provides authentication and authorization services for use with Solidus by
   using Devise and CanCan.