solidus_auth_devise 2.5.9 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '098ee5c680f5383b31766bff2da29911149036a3972e740cc59731c6d05c5f56'
-  data.tar.gz: 7f6c81439ad91719dc0fe4cee7ba2995370f02d87e1f33d7169472241f50f2c7
+  metadata.gz: 9e0d47cfd1b48b91343c2ba368dc685cf3e8c571a79d7d38c5b49538cf00d16b
+  data.tar.gz: ad94efe038f6e2fcc044e7e7943b9b62dc2bd43cb36eb3721d2a81708e596c52
 SHA512:
-  metadata.gz: 6044f99dbef2b8c35bd664d4a9566a7f7dab506678bed597831f5b818c969647ef72bf00e89395875c64a45f2701ac14c3e7c42d583e292e19ea93595c790bc4
-  data.tar.gz: 4a44b87bc260b095892bdc0e4477885a7aff5e119c2fac2d3e72c3373db49370b5c05da4d9b824f4d5068df62cbfeaae8d5ff21d27be7550b78f275613785743
+  metadata.gz: 3e425503e6ee10e0068856686a84fc60ec0ef38280d24e4882364801ff09c7e280604574ab1d3f4417e0ac06c09ae47ff519a4f64ffe8a56fcce806e285abf73
+  data.tar.gz: 4124d2869c44f9dd66f9422d4dd31b1d0e68ae663e4f46ebecfc510e106209966d273d66c8d4978d0a2d949a040bffe5d0a1306cb745b079301f7d914130922a

data/.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Ignore standardrb --fix commit
+eaba0e4370a03d10a6064466a9197c330bb92c64

data/.github/workflows/test.yml

@@ -0,0 +1,22 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  schedule:
+    - cron: "0 0 * * 4" # every Thursday
+
+concurrency:
+  group: test-${{ github.ref_name }}
+  cancel-in-progress: ${{ github.ref_name != 'main' }}
+
+permissions:
+  contents: read
+
+jobs:
+  Test:
+    uses: solidusio/test-solidus-extension/.github/workflows/test.yml@v1
+    with:
+      ruby_versions: "['3.4', '4.0']"

data/.rubocop.yml

@@ -1,10 +1,2 @@
-inherit_from: .rubocop_todo.yml
-
 require:
   - solidus_dev_support/rubocop
-
-AllCops:
-  NewCops: disable
-
-Gemspec/RequiredRubyVersion:
-  Enabled: false

data/Gemfile

@@ -1,41 +1,50 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
-gem 'solidus_backend', github: 'solidusio/solidus', branch: branch
+branch = ENV.fetch("SOLIDUS_BRANCH", "main")
+gem "solidus", github: "solidusio/solidus", branch: branch
+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'
-elsif branch == 'main'
-  gem 'solidus_frontend', github: 'solidusio/solidus_frontend'
+if branch >= "v3.2"
+  gem "solidus_frontend"
+elsif branch == "main"
+  gem "solidus_frontend", github: "solidusio/solidus_frontend"
 else
-  gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
+  gem "solidus_frontend", github: "solidusio/solidus", branch: branch
 end
 
-case ENV.fetch('DB', nil)
-when 'mysql'
-  gem 'mysql2'
-when 'postgresql'
-  gem 'pg'
+case ENV.fetch("DB", nil)
+when "mysql"
+  gem "mysql2"
+when "postgresql"
+  gem "pg"
 else
-  gem 'sqlite3'
+  rails_version = Gem::Requirement.new(rails_requirement_string).requirements[0][1]
+  sqlite_version = (rails_version < Gem::Version.new(7.2)) ? "~> 1.4" : "~> 2.0"
+
+  gem "sqlite3", sqlite_version
 end
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3")
   # While we still support Ruby < 3 we need to workaround a limitation in
   # the 'async' gem that relies on the latest ruby, since RubyGems doesn't
   # resolve gems based on the required ruby version.
-  gem 'async', '< 3', require: false
+  gem "async", "< 3", require: false
 end
 
 # 'net/smtp' is required by 'mail', see:
 # - https://github.com/ruby/net-protocol/issues/10
 # - https://stackoverflow.com/a/72474475
-gem 'net-smtp', require: false
+gem "net-smtp", require: false
 
 gemspec
 
@@ -44,4 +53,12 @@ gemspec
 #
 # We use `send` instead of calling `eval_gemfile` to work around an issue with
 # how Dependabot parses projects: https://github.com/dependabot/dependabot-core/issues/1658.
-send(:eval_gemfile, 'Gemfile-local') if File.exist? 'Gemfile-local'
+send(:eval_gemfile, "Gemfile-local") if File.exist? "Gemfile-local"
+
+# Pin state_machines
+gem "state_machines", "= 0.6.0"
+
+if RUBY_VERSION >= "4.0"
+  # Necessary for github_changelog_generator
+  gem "benchmark", "~> 0.5.0"
+end

data/README.md

@@ -1,6 +1,6 @@
 # Solidus Auth Devise
 
-[![CircleCI](https://circleci.com/gh/solidusio/solidus_auth_devise.svg?style=shield)](https://circleci.com/gh/solidusio/solidus_auth_devise)
+[![Test](https://github.com/solidusio/solidus_auth_devise/actions/workflows/test.yml/badge.svg)](https://github.com/solidusio/solidus_auth_devise/actions/workflows/test.yml)
 [![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.
@@ -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/Rakefile

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Don't build a dummy app with solidus_bolt enabled
-ENV['SKIP_SOLIDUS_BOLT'] = 'true'
+ENV["SKIP_SOLIDUS_BOLT"] = "true"
 
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 
-require 'solidus_dev_support/rake_tasks'
-SolidusDevSupport::RakeTasks.install
+require "solidus_dev_support/rake_tasks"
+SolidusDevSupport::RakeTasks.install(user_class: "Spree::User")
 
-task default: 'extension:specs'
+task default: "extension:specs"

data/app/models/spree/user.rb

@@ -3,20 +3,11 @@
 module Spree
   class User < Spree::Base
     include UserMethods
+    include Spree::SoftDeletable
 
     devise :database_authenticatable, :registerable, :recoverable,
-           :rememberable, :trackable, :validatable, :encryptable
-    devise :confirmable if Spree::Auth::Config[:confirmable]
-
-    if defined?(Spree::SoftDeletable)
-      include Spree::SoftDeletable
-    else
-      acts_as_paranoid
-      include Spree::ParanoiaDeprecations
-
-      include Discard::Model
-      self.discard_column = :deleted_at
-    end
+      :rememberable, :trackable, :validatable, :encryptable
+    devise :confirmable if Spree::Auth::Config.confirmable
 
     after_destroy :scramble_email_and_password
     after_discard :scramble_email_and_password
@@ -35,7 +26,7 @@ module Spree
     end
 
     def admin?
-      has_spree_role?('admin')
+      has_spree_role?("admin")
     end
 
     def confirmed?

data/app/patches/controllers/solidus_auth_devise/application_controller_patch.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module SolidusAuthDevise
+  module ApplicationControllerPatch
+    def self.prepended(base)
+      return unless base.respond_to?(:helper_method)
+
+      base.send(:helper_method, :spree_current_user)
+
+      return unless SolidusSupport.frontend_available?
+
+      base.send(:helper_method, :spree_login_path)
+      base.send(:helper_method, :spree_signup_path)
+      base.send(:helper_method, :spree_logout_path)
+    end
+
+    def spree_current_user
+      current_spree_user
+    end
+
+    if SolidusSupport.frontend_available?
+      delegate :login_path, :signup_path, :logout_path,
+        to: :spree,
+        prefix: :spree
+    end
+
+    ApplicationController.prepend self
+  end
+end

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/config/initializers/devise.rb

@@ -5,16 +5,16 @@
 Devise.setup do |config|
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in DeviseMailer.
-  config.mailer_sender = 'please-change-me@config-initializers-devise.com'
+  config.mailer_sender = "please-change-me@config-initializers-devise.com"
 
   # Configure the class responsible to send e-mails.
-  config.mailer = 'Spree::UserMailer'
+  config.mailer = "Spree::UserMailer"
 
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
   # available as additional gems.
-  require 'devise/orm/active_record'
+  require "devise/orm/active_record"
 
   # ==> Configuration for any authentication mechanism
   # Configure which keys are used when authenticating an user. By default is
@@ -34,13 +34,13 @@ Devise.setup do |config|
   # config.http_authenticatable_on_xhr = false
 
   # The realm used in Http Basic Authentication
-  config.http_authentication_realm = 'Spree Application'
+  config.http_authentication_realm = "Spree Application"
 
   # ==> Configuration for :database_authenticatable
   # For bcrypt, this is the cost for hashing the password and defaults to 10. If
   # using other encryptors, it sets how many times you want the password re-encrypted.
   config.stretches = 20
-  config.encryptor = 'authlogic_sha512'
+  config.encryptor = "authlogic_sha512"
 
   # Setup a pepper to generate the encrypted password.
   config.pepper = if Rails.configuration.respond_to?(:secret_token) && Rails.configuration.secret_token.present?
@@ -143,4 +143,6 @@ Devise.setup do |config|
   config.reset_password_within = 6.hours
 
   config.case_insensitive_keys = [:email]
+
+  config.reload_routes = false
 end

data/config/routes.rb

@@ -3,15 +3,15 @@
 Spree::Core::Engine.routes.draw do
   if SolidusSupport.frontend_available? && Spree::Auth::Config.draw_frontend_routes
     devise_for(:spree_user, {
-      class_name: 'Spree::User',
+      class_name: "Spree::User",
       controllers: {
-        sessions: 'spree/user_sessions',
-        registrations: 'spree/user_registrations',
-        passwords: 'spree/user_passwords',
-        confirmations: 'spree/user_confirmations'
+        sessions: "spree/user_sessions",
+        registrations: "spree/user_registrations",
+        passwords: "spree/user_passwords",
+        confirmations: "spree/user_confirmations"
       },
       skip: [:unlocks, :omniauth_callbacks],
-      path_names: { sign_out: 'logout' },
+      path_names: {sign_out: "logout"},
       path_prefix: :user,
       router_name: :spree
     })
@@ -19,48 +19,48 @@ Spree::Core::Engine.routes.draw do
     resources :users, only: [:edit, :update]
 
     devise_scope :spree_user do
-      get '/login', to: 'user_sessions#new', as: :login
-      post '/login', to: 'user_sessions#create', as: :create_new_session
-      match '/logout', to: 'user_sessions#destroy', as: :logout, via: Devise.sign_out_via
-      get '/signup', to: 'user_registrations#new', as: :signup
-      post '/signup', to: 'user_registrations#create', as: :registration
-      get '/password/recover', to: 'user_passwords#new', as: :recover_password
-      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 "/login", to: "user_sessions#new", as: :login
+      post "/login", to: "user_sessions#create", as: :create_new_session
+      match "/logout", to: "user_sessions#destroy", as: :logout, via: Devise.sign_out_via
+      get "/signup", to: "user_registrations#new", as: :signup
+      post "/signup", to: "user_registrations#create", as: :registration
+      get "/password/recover", to: "user_passwords#new", as: :recover_password
+      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
     end
 
-    get '/checkout/registration', to: 'checkout#registration', as: :checkout_registration
-    put '/checkout/registration', to: 'checkout#update_registration', as: :update_checkout_registration
+    get "/checkout/registration", to: "checkout#registration", as: :checkout_registration
+    put "/checkout/registration", to: "checkout#update_registration", as: :update_checkout_registration
 
-    resource :account, controller: 'users'
+    resource :account, controller: "users"
   end
 
   if SolidusSupport.backend_available? && Spree::Auth::Config.draw_backend_routes
     namespace :admin do
       devise_for(:spree_user, {
-        class_name: 'Spree::User',
+        class_name: "Spree::User",
         singular: :spree_user,
         skip: :all,
-        path_names: { sign_out: 'logout' },
+        path_names: {sign_out: "logout"},
         controllers: {
-          sessions: 'spree/admin/user_sessions',
-          passwords: 'spree/admin/user_passwords'
+          sessions: "spree/admin/user_sessions",
+          passwords: "spree/admin/user_passwords"
         },
         router_name: :spree
       })
 
       devise_scope :spree_user do
-        get '/authorization_failure', to: 'user_sessions#authorization_failure', as: :unauthorized
-        get '/login', to: 'user_sessions#new', as: :login
-        post '/login', to: 'user_sessions#create', as: :create_new_session
-        match '/logout', to: 'user_sessions#destroy', as: :logout, via: Devise.sign_out_via
+        get "/authorization_failure", to: "user_sessions#authorization_failure", as: :unauthorized
+        get "/login", to: "user_sessions#new", as: :login
+        post "/login", to: "user_sessions#create", as: :create_new_session
+        match "/logout", to: "user_sessions#destroy", as: :logout, via: Devise.sign_out_via
 
-        get '/password/recover', to: 'user_passwords#new', as: :recover_password
-        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 "/password/recover", to: "user_passwords#new", as: :recover_password
+        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
       end
     end
   end

data/db/default/users.rb

@@ -1,18 +1,30 @@
 # frozen_string_literal: true
 
-admin_role = Spree::Role.find_or_create_by(name: 'admin')
+admin_role = Spree::Role.find_or_create_by(name: "admin")
 
 if Spree::User.admin.any?
-  puts 'No admin user created.'
+  puts "No admin user created."
   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)
@@ -24,7 +36,7 @@ admin = Spree::User.new(
   password: password,
   password_confirmation: password,
   email: email,
-  login: email,
+  login: email
 )
 
 if admin.save

data/db/migrate/20101026184949_create_users.rb

@@ -1,30 +1,30 @@
 # frozen_string_literal: true
 
-class CreateUsers < SolidusSupport::Migration[4.2]
+class CreateUsers < ActiveRecord::Migration[4.2]
   def up
     unless table_exists?("spree_users")
       create_table "spree_users", force: true do |t|
-        t.string   "crypted_password",          limit: 128
-        t.string   "salt",                      limit: 128
-        t.string   "email"
-        t.string   "remember_token"
-        t.string   "remember_token_expires_at"
-        t.string   "persistence_token"
-        t.string   "single_access_token"
-        t.string   "perishable_token"
-        t.integer  "login_count",                              default: 0, null: false
-        t.integer  "failed_login_count",                       default: 0, null: false
+        t.string "crypted_password", limit: 128
+        t.string "salt", limit: 128
+        t.string "email"
+        t.string "remember_token"
+        t.string "remember_token_expires_at"
+        t.string "persistence_token"
+        t.string "single_access_token"
+        t.string "perishable_token"
+        t.integer "login_count", default: 0, null: false
+        t.integer "failed_login_count", default: 0, null: false
         t.datetime "last_request_at"
         t.datetime "current_login_at"
         t.datetime "last_login_at"
-        t.string   "current_login_ip"
-        t.string   "last_login_ip"
-        t.string   "login"
-        t.integer  "ship_address_id"
-        t.integer  "bill_address_id"
-        t.datetime "created_at",                                              null: false
-        t.datetime "updated_at",                                              null: false
-        t.string   "openid_identifier"
+        t.string "current_login_ip"
+        t.string "last_login_ip"
+        t.string "login"
+        t.integer "ship_address_id"
+        t.integer "bill_address_id"
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+        t.string "openid_identifier"
       end
     end
   end

data/db/migrate/20101026184950_rename_columns_for_devise.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RenameColumnsForDevise < SolidusSupport::Migration[4.2]
+class RenameColumnsForDevise < ActiveRecord::Migration[4.2]
   def up
     return if column_exists?(:spree_users, :password_salt)
 
@@ -14,14 +14,12 @@ class RenameColumnsForDevise < SolidusSupport::Migration[4.2]
     rename_column :spree_users, :last_login_at, :last_sign_in_at
     rename_column :spree_users, :current_login_ip, :current_sign_in_ip
     rename_column :spree_users, :last_login_ip, :last_sign_in_ip
-    add_column :spree_users, :authentication_token, :string
     add_column :spree_users, :unlock_token, :string
     add_column :spree_users, :locked_at, :datetime
     remove_column :spree_users, :openid_identifier
   end
 
   def down
-    remove_column :spree_users, :authentication_token
     remove_column :spree_users, :locked_at
     remove_column :spree_users, :unlock_token
     rename_column :spree_users, :last_sign_in_ip, :last_login_ip

data/db/migrate/20101214150824_convert_user_remember_field.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ConvertUserRememberField < SolidusSupport::Migration[4.2]
+class ConvertUserRememberField < ActiveRecord::Migration[4.2]
   def up
     remove_column :spree_users, :remember_created_at
     add_column :spree_users, :remember_created_at, :datetime

data/db/migrate/20120203010234_add_reset_password_sent_at_to_spree_users.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddResetPasswordSentAtToSpreeUsers < SolidusSupport::Migration[4.2]
+class AddResetPasswordSentAtToSpreeUsers < ActiveRecord::Migration[4.2]
   def change
     Spree::User.reset_column_information
     unless Spree::User.column_names.include?("reset_password_sent_at")

data/db/migrate/20120605211305_make_users_email_index_unique.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class MakeUsersEmailIndexUnique < SolidusSupport::Migration[4.2]
+class MakeUsersEmailIndexUnique < ActiveRecord::Migration[4.2]
   def up
     add_index "spree_users", ["email"], name: "email_idx_unique", unique: true
   end

data/db/migrate/20140904000425_add_deleted_at_to_users.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddDeletedAtToUsers < SolidusSupport::Migration[4.2]
+class AddDeletedAtToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_users, :deleted_at, :datetime
     add_index :spree_users, :deleted_at

data/db/migrate/20141002154641_add_confirmable_to_users.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddConfirmableToUsers < SolidusSupport::Migration[4.2]
+class AddConfirmableToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_users, :confirmation_token, :string
     add_column :spree_users, :confirmed_at, :datetime

data/db/migrate/20190125170630_add_reset_password_token_index_to_spree_users.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddResetPasswordTokenIndexToSpreeUsers < SolidusSupport::Migration[4.2]
+class AddResetPasswordTokenIndexToSpreeUsers < ActiveRecord::Migration[4.2]
   # We're not using the standard Rails index name because somebody could have
   #  already added that index to the table. By using a custom name we ensure
   # that the index can effectively be added and removed via migrations/rollbacks
@@ -8,7 +8,7 @@ class AddResetPasswordTokenIndexToSpreeUsers < SolidusSupport::Migration[4.2]
   # standard name + "_solidus_auth_devise"; the length is 61 chars which is
   # still OK for Sqlite, mySQL and Postgres.
   def custom_index_name
-    'index_spree_users_on_reset_password_token_solidus_auth_devise'
+    "index_spree_users_on_reset_password_token_solidus_auth_devise"
   end
 
   def default_index_exists?
@@ -21,7 +21,7 @@ class AddResetPasswordTokenIndexToSpreeUsers < SolidusSupport::Migration[4.2]
 
   def up
     Spree::User.reset_column_information
-    if Spree::User.column_names.include?('reset_password_token') && !default_index_exists? && !custom_index_exists?
+    if Spree::User.column_names.include?("reset_password_token") && !default_index_exists? && !custom_index_exists?
       add_index :spree_users, :reset_password_token, unique: true, name: custom_index_name
     end
   end

data/db/migrate/20200417153503_add_unconfirmed_email_to_spree_users.rb

@@ -1,4 +1,4 @@
-class AddUnconfirmedEmailToSpreeUsers < SolidusSupport::Migration[5.1]
+class AddUnconfirmedEmailToSpreeUsers < ActiveRecord::Migration[5.1]
   def change
     unless column_exists?(:spree_users, :unconfirmed_email)
       add_column :spree_users, :unconfirmed_email, :string

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/db/seeds.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require_relative 'default/users.rb'
+require_relative "default/users"