rodauth-rails 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a0e7a34f68cd9914ad148799dcc5b83c5f8509d6d3278f57a26ebd497a8460c
-  data.tar.gz: bfacb6b1ee374c5c0c1178d1a3b22a08bdb78626c1c91f3997a3c8572a8ede85
+  metadata.gz: df597e01d85bea28254330ac00e288d569fe709744e11ade3ada370784034b6a
+  data.tar.gz: 2934d9ea6177fa55e383cfbcbfdca6b4b27a36a1afdb7c9971e918fbca76e604
 SHA512:
-  metadata.gz: eb5ff0efa4e19d89f864eea1e5d2e7541b2a198cff6af02ec281904e660bac5124d59842f602527e988ac958913724c54225fceb02ca834f1ee03cbf6a975f24
-  data.tar.gz: 13350871f426602595dfa738b1a2016372f589788dfdd5d06ad5e915d351d2d5a4f3cec18c45871337153106c1f524ab27bae7f4c7f30c7e9fb2dbe02025c77d
+  metadata.gz: bf30eabb2fb372e96caf39ceb0e01696dcc45003db00703fd4eaa127bba8378a0e76c4194b0f2161851df82a066f0147ed72cedea25429657a287734f76d4e49
+  data.tar.gz: 40f773856e54971d573995e7f6c11b9a67c42c881ce95e458739fc5a12151a954233b3e80339beff622b82e79bc5485fc6497f7dd90c09cfd42ed2ca1abe3912

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.8.0 (2023-02-25)
+
+* Add table argument to `rodauth:install` generator (@janko)
+
+* Add `--prefix` option to `rodauth:migration` generator for choosing table prefix (@janko)
+
+* Add `--argon2` option to `rodauth:install` generator for configuring password hashing using Argon2 (@janko)
+
+* Move generated Sequel setup from initializer into the Rodauth configuration for faster boot time (@janko)
+
+* Use `email_to` and `email_from` Rodauth methods in generated mailer (@janko)
+
+* Add missing foreign key constraint in `email_auth` Active Record migration (@janko)
+
+* Correctly retrieve JSON request body when using Falcon (@janko)
+
+* Render validation error correctly in generated `webauthn_remove` Tailwind template (@janko)
+
 ## 1.7.1 (2023-01-25)
 
 * Make internal_request integration work on Rack 3.x (@janko)

data/README.md

@@ -70,7 +70,13 @@ Next, run the install generator:
 $ rails generate rodauth:install
 ```
 
-Or if you want Rodauth endpoints to be exposed via [JSON API]:
+This will use the `accounts` table. If you want a different table name:
+
+```sh
+$ rails generate rodauth:install users
+```
+
+If you want Rodauth endpoints to be exposed via [JSON API]:
 
 ```sh
 $ rails generate rodauth:install --json # regular authentication using the Rails session
@@ -79,6 +85,13 @@ $ rails generate rodauth:install --jwt # token authentication via the "Authoriza
 $ bundle add jwt
 ```
 
+To use Argon2 instead of bcrypt for password hashing:
+
+```sh
+$ rails generate rodauth:install --argon2
+$ bundle add argon2
+```
+
 This generator will create a Rodauth app and configuration with common
 authentication features enabled, a database migration with tables required by
 those features, a mailer with default templates, and a few other files.
@@ -180,12 +193,9 @@ session will be reset.
 
 #### Custom account model
 
-The `#rails_account` method will try to infer the account model class from
-the configured table name. For example, if the `accounts_table` is set to
-`:users`, it will automatically assume the model class of `User`.
-
-However, if the model class cannot be inferred from the table name, you can
-configure it manually:
+The `#rails_account` method will try to infer the account model class from the
+configured accounts table name. However, if the model class cannot be inferred
+from the table name, you can configure it manually:
 
 ```rb
 # app/misc/rodauth_main.rb
@@ -499,7 +509,7 @@ page][custom mailer worker] on how to set it up.
 
 The install generator will create a migration for tables used by the Rodauth
 features enabled by default. For any additional features, you can use the
-migration generator to create the corresponding tables:
+migration generator for creating the required tables:
 
 ```sh
 $ rails generate rodauth:migration otp sms_codes recovery_codes
@@ -515,6 +525,30 @@ class CreateRodauthOtpSmsCodesRecoveryCodes < ActiveRecord::Migration
 end
 ```
 
+#### Table prefix
+
+If you're storing account records in a table other than `accounts`, you'll want
+to specify the correct table prefix when generating new migrations:
+
+```sh
+$ rails generate rodauth:migration base active_sessions --prefix user
+
+# Add the following to your Rodauth configuration:
+#
+#   accounts_table :users
+#   active_sessions_table :user_active_session_keys
+#   active_sessions_account_id_column :user_id
+```
+```rb
+# db/migration/*_create_rodauth_user_base_active_sessions.rb
+class CreateRodauthUserBaseActiveSessions < ActiveRecord::Migration
+  def change
+    create_table :users do |t| ... end
+    create_table :user_active_session_keys do |t| ... end
+  end
+end
+```
+
 #### Custom migration name
 
 You can change the default migration name:
@@ -1103,11 +1137,17 @@ require "rodauth/migrations"
 
 class CreateRodauthDatabaseFunctions < ActiveRecord::Migration
   def up
-    Rodauth.create_database_authentication_functions(DB)
+    Rodauth.create_database_authentication_functions(db)
   end
 
   def down
-    Rodauth.drop_database_authentication_functions(DB)
+    Rodauth.drop_database_authentication_functions(db)
+  end
+
+  private
+
+  def db
+    RodauthMain.allocate.db
   end
 end
 ```

data/lib/generators/rodauth/install_generator.rb

@@ -5,19 +5,13 @@ module Rodauth
   module Rails
     module Generators
       class InstallGenerator < ::Rails::Generators::Base
-        if RUBY_ENGINE == "jruby"
-          SEQUEL_ADAPTERS = {
-            "sqlite3"         => "sqlite",
-            "oracle_enhanced" => "oracle", # https://github.com/rsim/oracle-enhanced
-            "sqlserver"       => "mssql",
-          }
-        else
-          SEQUEL_ADAPTERS = {
-            "sqlite3"         => "sqlite",
-            "oracle_enhanced" => "oracle", # https://github.com/rsim/oracle-enhanced
-            "sqlserver"       => "tinytds", # https://github.com/rails-sqlserver/activerecord-sqlserver-adapter
-          }
-        end
+        SEQUEL_ADAPTERS = {
+          "postgresql"      => RUBY_ENGINE == "jruby" ? "postgresql" : "postgres",
+          "mysql2"          => RUBY_ENGINE == "jruby" ? "mysql" : "mysql2",
+          "sqlite3"         => "sqlite",
+          "oracle_enhanced" => "oracle",
+          "sqlserver"       => RUBY_ENGINE == "jruby" ? "mssql" : "tinytds",
+        }
 
         MAILER_VIEWS = %w[
           email_auth
@@ -31,24 +25,23 @@ module Rodauth
         source_root "#{__dir__}/templates"
         namespace "rodauth:install"
 
+        argument :table, optional: true, type: :string, desc: "Name of the accounts table"
+
+        class_option :prefix, type: :string, desc: "Change name for account tables"
+        class_option :argon2, type: :boolean, desc: "Use Argon2 for password hashing"
         class_option :json, type: :boolean, desc: "Configure JSON support"
         class_option :jwt, type: :boolean, desc: "Configure JWT support"
 
-        def create_rodauth_migration
-          invoke "rodauth:migration", migration_features, name: "create_rodauth"
+        def generate_rodauth_migration
+          invoke "rodauth:migration", migration_features,
+            name: "create_rodauth",
+            prefix: table_prefix
         end
 
         def create_rodauth_initializer
           template "config/initializers/rodauth.rb"
         end
 
-        def create_sequel_initializer
-          return unless defined?(ActiveRecord::Railtie)
-          return if defined?(Sequel) && !Sequel::DATABASES.empty?
-
-          template "config/initializers/sequel.rb"
-        end
-
         def create_rodauth_app
           template "app/misc/rodauth_app.rb"
           template "app/misc/rodauth_main.rb"
@@ -59,7 +52,7 @@ module Rodauth
         end
 
         def create_account_model
-          template "app/models/account.rb"
+          template "app/models/account.rb", "app/models/#{table_prefix}.rb"
         end
 
         def create_mailer
@@ -73,13 +66,10 @@ module Rodauth
         end
 
         def create_fixtures
-          test_unit_options = ::Rails.application.config.generators.options[:test_unit]
-          if test_unit_options[:fixture] && test_unit_options[:fixture_replacement].nil?
-            if ::Rails.application.config.generators.options[:rails][:test_framework] == :rspec
-              template "test/fixtures/accounts.yml", "spec/fixtures/accounts.yml"
-            else
-              template "test/fixtures/accounts.yml", "test/fixtures/accounts.yml"
-            end
+          generator_options = ::Rails.application.config.generators.options
+          if generator_options[:test_unit][:fixture] && generator_options[:test_unit][:fixture_replacement].nil?
+            test_dir = generator_options[:rails][:test_framework] == :rspec ? "spec" : "test"
+            template "test/fixtures/accounts.yml", "#{test_dir}/fixtures/#{table_prefix.pluralize}.yml"
           end
         end
 
@@ -95,6 +85,10 @@ module Rodauth
           features
         end
 
+        def table_prefix
+          table&.underscore&.singularize || "account"
+        end
+
         def json?
           options[:json] || api_only? && session_store? && !options[:jwt]
         end
@@ -103,6 +97,15 @@ module Rodauth
           options[:jwt] || api_only? && !session_store? && !options[:json]
         end
 
+        def argon2?
+          options[:argon2]
+        end
+
+        def sequel_activerecord_integration?
+          defined?(ActiveRecord::Railtie) &&
+            (!defined?(Sequel) || Sequel::DATABASES.empty?)
+        end
+
         def session_store?
           !!::Rails.application.config.session_store
         end
@@ -111,10 +114,8 @@ module Rodauth
           Rodauth::Rails.api_only?
         end
 
-        def sequel_uri_scheme
-          scheme = SEQUEL_ADAPTERS[activerecord_adapter] || activerecord_adapter
-          scheme = "jdbc:#{scheme}" if RUBY_ENGINE == "jruby"
-          scheme
+        def sequel_adapter
+          SEQUEL_ADAPTERS[activerecord_adapter] || activerecord_adapter
         end
 
         def activerecord_adapter

data/lib/generators/rodauth/migration/active_record/account_expiration.erb

@@ -1,7 +1,7 @@
 # Used by the account expiration feature
-create_table :account_activity_times, id: false do |t|
+create_table :<%= table_prefix %>_activity_times, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
-  t.foreign_key :accounts, column: :id
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.datetime :last_activity_at, null: false
   t.datetime :last_login_at, null: false
   t.datetime :expired_at

data/lib/generators/rodauth/migration/active_record/active_sessions.erb

@@ -1,6 +1,6 @@
 # Used by the active sessions feature
-create_table :account_active_session_keys, primary_key: [:account_id, :session_id] do |t|
-  t.references :account, foreign_key: true<%= primary_key_type(:type) %>
+create_table :<%= table_prefix %>_active_session_keys, primary_key: [:<%= table_prefix %>_id, :session_id] do |t|
+  t.references :<%= table_prefix %>, foreign_key: true<%= primary_key_type(:type) %>
   t.string :session_id
   t.datetime :created_at, null: false, default: <%= current_timestamp %>
   t.datetime :last_use, null: false, default: <%= current_timestamp %>

data/lib/generators/rodauth/migration/active_record/audit_logging.erb

@@ -1,6 +1,6 @@
 # Used by the audit logging feature
-create_table :account_authentication_audit_logs<%= primary_key_type %> do |t|
-  t.references :account, foreign_key: true, null: false<%= primary_key_type(:type) %>
+create_table :<%= table_prefix %>_authentication_audit_logs<%= primary_key_type %> do |t|
+  t.references :<%= table_prefix %>, foreign_key: true, null: false<%= primary_key_type(:type) %>
   t.datetime :at, null: false, default: <%= current_timestamp %>
   t.text :message, null: false
 <% case activerecord_adapter -%>
@@ -11,6 +11,6 @@ create_table :account_authentication_audit_logs<%= primary_key_type %> do |t|
 <% else -%>
   t.string :metadata
 <% end -%>
-  t.index [:account_id, :at], name: "audit_account_at_idx"
+  t.index [:<%= table_prefix %>_id, :at], name: "audit_<%= table_prefix %>_at_idx"
   t.index :at, name: "audit_at_idx"
 end

data/lib/generators/rodauth/migration/active_record/base.erb

@@ -2,7 +2,7 @@
 enable_extension "citext"
 
 <% end -%>
-create_table :accounts<%= primary_key_type %> do |t|
+create_table :<%= table_prefix.pluralize %><%= primary_key_type %> do |t|
   t.integer :status, null: false, default: 1
 <% case activerecord_adapter -%>
 <% when "postgresql" -%>

data/lib/generators/rodauth/migration/active_record/disallow_password_reuse.erb

@@ -1,5 +1,5 @@
 # Used by the disallow password reuse feature
-create_table :account_previous_password_hashes do |t|
-  t.references :account, foreign_key: true<%= primary_key_type(:type) %>
+create_table :<%= table_prefix %>_previous_password_hashes do |t|
+  t.references :<%= table_prefix %>, foreign_key: true<%= primary_key_type(:type) %>
   t.string :password_hash, null: false
 end

data/lib/generators/rodauth/migration/active_record/email_auth.erb

@@ -1,6 +1,7 @@
 # Used by the email auth feature
-create_table :account_email_auth_keys, id: false do |t|
+create_table :<%= table_prefix %>_email_auth_keys, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.string :key, null: false
   t.datetime :deadline, null: false
   t.datetime :email_last_sent, null: false, default: <%= current_timestamp %>

data/lib/generators/rodauth/migration/active_record/jwt_refresh.erb

@@ -1,7 +1,7 @@
 # Used by the jwt refresh feature
-create_table :account_jwt_refresh_keys<%= primary_key_type %> do |t|
-  t.references :account, foreign_key: true, null: false<%= primary_key_type(:type) %>
+create_table :<%= table_prefix %>_jwt_refresh_keys<%= primary_key_type %> do |t|
+  t.references :<%= table_prefix %>, foreign_key: true, null: false<%= primary_key_type(:type) %>
   t.string :key, null: false
   t.datetime :deadline, null: false
-  t.index :account_id, name: "account_jwt_rk_account_id_idx"
+  t.index :<%= table_prefix %>_id, name: "<%= table_prefix %>_jwt_rk_<%= table_prefix %>_id_idx"
 end

data/lib/generators/rodauth/migration/active_record/lockout.erb

@@ -1,12 +1,12 @@
 # Used by the lockout feature
-create_table :account_login_failures, id: false do |t|
+create_table :<%= table_prefix %>_login_failures, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
-  t.foreign_key :accounts, column: :id
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.integer :number, null: false, default: 1
 end
-create_table :account_lockouts, id: false do |t|
+create_table :<%= table_prefix %>_lockouts, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
-  t.foreign_key :accounts, column: :id
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.string :key, null: false
   t.datetime :deadline, null: false
   t.datetime :email_last_sent

data/lib/generators/rodauth/migration/active_record/otp.erb

@@ -1,7 +1,7 @@
 # Used by the otp feature
-create_table :account_otp_keys, id: false do |t|
+create_table :<%= table_prefix %>_otp_keys, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
-  t.foreign_key :accounts, column: :id
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.string :key, null: false
   t.integer :num_failures, null: false, default: 0
   t.datetime :last_use, null: false, default: <%= current_timestamp %>

data/lib/generators/rodauth/migration/active_record/password_expiration.erb

@@ -1,6 +1,6 @@
 # Used by the password expiration feature
-create_table :account_password_change_times, id: false do |t|
+create_table :<%= table_prefix %>_password_change_times, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
-  t.foreign_key :accounts, column: :id
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.datetime :changed_at, null: false, default: <%= current_timestamp %>
 end

data/lib/generators/rodauth/migration/active_record/recovery_codes.erb

@@ -1,6 +1,6 @@
 # Used by the recovery codes feature
-create_table :account_recovery_codes, primary_key: [:id, :code] do |t|
+create_table :<%= table_prefix %>_recovery_codes, primary_key: [:id, :code] do |t|
   t.<%= primary_key_type(nil) %> :id
-  t.foreign_key :accounts, column: :id
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.string :code
 end

data/lib/generators/rodauth/migration/active_record/remember.erb

@@ -1,7 +1,7 @@
 # Used by the remember me feature
-create_table :account_remember_keys, id: false do |t|
+create_table :<%= table_prefix %>_remember_keys, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
-  t.foreign_key :accounts, column: :id
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.string :key, null: false
   t.datetime :deadline, null: false
 end

data/lib/generators/rodauth/migration/active_record/reset_password.erb

@@ -1,7 +1,7 @@
 # Used by the password reset feature
-create_table :account_password_reset_keys, id: false do |t|
+create_table :<%= table_prefix %>_password_reset_keys, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
-  t.foreign_key :accounts, column: :id
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.string :key, null: false
   t.datetime :deadline, null: false
   t.datetime :email_last_sent, null: false, default: <%= current_timestamp %>

data/lib/generators/rodauth/migration/active_record/single_session.erb

@@ -1,6 +1,6 @@
 # Used by the single session feature
-create_table :account_session_keys, id: false do |t|
+create_table :<%= table_prefix %>_session_keys, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
-  t.foreign_key :accounts, column: :id
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.string :key, null: false
 end

data/lib/generators/rodauth/migration/active_record/sms_codes.erb

@@ -1,7 +1,7 @@
 # Used by the sms codes feature
-create_table :account_sms_codes, id: false do |t|
+create_table :<%= table_prefix %>_sms_codes, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
-  t.foreign_key :accounts, column: :id
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.string :phone_number, null: false
   t.integer :num_failures
   t.string :code

data/lib/generators/rodauth/migration/active_record/verify_account.erb

@@ -1,7 +1,7 @@
 # Used by the account verification feature
-create_table :account_verification_keys, id: false do |t|
+create_table :<%= table_prefix %>_verification_keys, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
-  t.foreign_key :accounts, column: :id
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.string :key, null: false
   t.datetime :requested_at, null: false, default: <%= current_timestamp %>
   t.datetime :email_last_sent, null: false, default: <%= current_timestamp %>

data/lib/generators/rodauth/migration/active_record/verify_login_change.erb

@@ -1,7 +1,7 @@
 # Used by the verify login change feature
-create_table :account_login_change_keys, id: false do |t|
+create_table :<%= table_prefix %>_login_change_keys, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
-  t.foreign_key :accounts, column: :id
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.string :key, null: false
   t.string :login, null: false
   t.datetime :deadline, null: false

data/lib/generators/rodauth/migration/active_record/webauthn.erb

@@ -1,11 +1,11 @@
 # Used by the webauthn feature
-create_table :account_webauthn_user_ids, id: false do |t|
+create_table :<%= table_prefix %>_webauthn_user_ids, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
-  t.foreign_key :accounts, column: :id
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
   t.string :webauthn_id, null: false
 end
-create_table :account_webauthn_keys, primary_key: [:account_id, :webauthn_id] do |t|
-  t.references :account, foreign_key: true<%= primary_key_type(:type) %>
+create_table :<%= table_prefix %>_webauthn_keys, primary_key: [:<%= table_prefix %>_id, :webauthn_id] do |t|
+  t.references :<%= table_prefix %>, foreign_key: true<%= primary_key_type(:type) %>
   t.string :webauthn_id
   t.string :public_key, null: false
   t.integer :sign_count, null: false

data/lib/generators/rodauth/migration/sequel/account_expiration.erb

@@ -1,6 +1,6 @@
 # Used by the account expiration feature
-create_table :account_activity_times do
-  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+create_table :<%= table_prefix %>_activity_times do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
   DateTime :last_activity_at, null: false
   DateTime :last_login_at, null: false
   DateTime :expired_at

data/lib/generators/rodauth/migration/sequel/active_sessions.erb

@@ -1,8 +1,8 @@
 # Used by the active sessions feature
-create_table :account_active_session_keys do
-  foreign_key :account_id, :accounts, type: :Bignum
+create_table :<%= table_prefix %>_active_session_keys do
+  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, type: :Bignum
   String :session_id
   Time :created_at, null: false, default: Sequel::CURRENT_TIMESTAMP
   Time :last_use, null: false, default: Sequel::CURRENT_TIMESTAMP
-  primary_key [:account_id, :session_id]
+  primary_key [:<%= table_prefix %>_id, :session_id]
 end

data/lib/generators/rodauth/migration/sequel/audit_logging.erb

@@ -1,7 +1,7 @@
 # Used by the audit logging feature
-create_table :account_authentication_audit_logs do
+create_table :<%= table_prefix %>_authentication_audit_logs do
   primary_key :id, type: :Bignum
-  foreign_key :account_id, :accounts, null: false, type: :Bignum
+  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, null: false, type: :Bignum
   DateTime :at, null: false, default: Sequel::CURRENT_TIMESTAMP
   String :message, null: false
 <% case db.database_type -%>
@@ -12,6 +12,6 @@ create_table :account_authentication_audit_logs do
 <% else -%>
   String :metadata
 <% end -%>
-  index [:account_id, :at], name: :audit_account_at_idx
+  index [:<%= table_prefix %>_id, :at], name: :audit_<%= table_prefix %>_at_idx
   index :at, name: :audit_at_idx
 end

data/lib/generators/rodauth/migration/sequel/base.erb

@@ -5,7 +5,7 @@ rescue NoMethodError # migration is being reverted
 end
 
 <% end -%>
-create_table :accounts do
+create_table :<%= table_prefix.pluralize %> do
   primary_key :id, type: :Bignum
 <% if db.database_type == :postgres -%>
   citext :email, null: false

data/lib/generators/rodauth/migration/sequel/disallow_password_reuse.erb

@@ -1,6 +1,6 @@
 # Used by the disallow password reuse feature
-create_table :account_previous_password_hashes do
+create_table :<%= table_prefix %>_previous_password_hashes do
   primary_key :id, type: :Bignum
-  foreign_key :account_id, :accounts, type: :Bignum
+  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, type: :Bignum
   String :password_hash, null: false
 end

data/lib/generators/rodauth/migration/sequel/email_auth.erb

@@ -1,6 +1,6 @@
 # Used by the email auth feature
-create_table :account_email_auth_keys do
-  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+create_table :<%= table_prefix %>_email_auth_keys do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
   String :key, null: false
   DateTime :deadline, null: false
   DateTime :email_last_sent, null: false, default: Sequel::CURRENT_TIMESTAMP

data/lib/generators/rodauth/migration/sequel/jwt_refresh.erb

@@ -1,8 +1,8 @@
 # Used by the jwt refresh feature
-create_table :account_jwt_refresh_keys do
+create_table :<%= table_prefix %>_jwt_refresh_keys do
   primary_key :id, type: :Bignum
-  foreign_key :account_id, :accounts, null: false, type: :Bignum
+  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, null: false, type: :Bignum
   String :key, null: false
   DateTime :deadline, null: false
-  index :account_id, name: :account_jwt_rk_account_id_idx
+  index :<%= table_prefix %>_id, name: :<%= table_prefix %>_jwt_rk_<%= table_prefix %>_id_idx
 end

data/lib/generators/rodauth/migration/sequel/lockout.erb

@@ -1,10 +1,10 @@
 # Used by the lockout feature
-create_table :account_login_failures do
-  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+create_table :<%= table_prefix %>_login_failures do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
   Integer :number, null: false, default: 1
 end
-create_table :account_lockouts do
-  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+create_table :<%= table_prefix %>_lockouts do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
   String :key, null: false
   DateTime :deadline, null: false
   DateTime :email_last_sent

data/lib/generators/rodauth/migration/sequel/otp.erb

@@ -1,6 +1,6 @@
 # Used by the otp feature
-create_table :account_otp_keys do
-  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+create_table :<%= table_prefix %>_otp_keys do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
   String :key, null: false
   Integer :num_failures, null: false, default: 0
   Time :last_use, null: false, default: Sequel::CURRENT_TIMESTAMP

data/lib/generators/rodauth/migration/sequel/password_expiration.erb

@@ -1,5 +1,5 @@
 # Used by the password expiration feature
-create_table :account_password_change_times do
-  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+create_table :<%= table_prefix %>_password_change_times do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
   DateTime :changed_at, null: false, default: Sequel::CURRENT_TIMESTAMP
 end

data/lib/generators/rodauth/migration/sequel/recovery_codes.erb

@@ -1,6 +1,6 @@
 # Used by the recovery codes feature
-create_table :account_recovery_codes do
-  foreign_key :id, :accounts, type: :Bignum
+create_table :<%= table_prefix %>_recovery_codes do
+  foreign_key :id, :<%= table_prefix.pluralize %>, type: :Bignum
   String :code
   primary_key [:id, :code]
 end

data/lib/generators/rodauth/migration/sequel/remember.erb

@@ -1,6 +1,6 @@
 # Used by the remember me feature
-create_table :account_remember_keys do
-  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+create_table :<%= table_prefix %>_remember_keys do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
   String :key, null: false
   DateTime :deadline, null: false
 end

data/lib/generators/rodauth/migration/sequel/reset_password.erb

@@ -1,6 +1,6 @@
 # Used by the password reset feature
-create_table :account_password_reset_keys do
-  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+create_table :<%= table_prefix %>_password_reset_keys do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
   String :key, null: false
   DateTime :deadline, null: false
   DateTime :email_last_sent, null: false, default: Sequel::CURRENT_TIMESTAMP

data/lib/generators/rodauth/migration/sequel/single_session.erb

@@ -1,5 +1,5 @@
 # Used by the single session feature
-create_table :account_session_keys do
-  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+create_table :<%= table_prefix %>_session_keys do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
   String :key, null: false
 end

data/lib/generators/rodauth/migration/sequel/sms_codes.erb

@@ -1,6 +1,6 @@
 # Used by the sms codes feature
-create_table :account_sms_codes do
-  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+create_table :<%= table_prefix %>_sms_codes do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
   String :phone_number, null: false
   Integer :num_failures
   String :code

data/lib/generators/rodauth/migration/sequel/verify_account.erb

@@ -1,6 +1,6 @@
 # Used by the account verification feature
-create_table :account_verification_keys do
-  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+create_table :<%= table_prefix %>_verification_keys do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
   String :key, null: false
   DateTime :requested_at, null: false, default: Sequel::CURRENT_TIMESTAMP
   DateTime :email_last_sent, null: false, default: Sequel::CURRENT_TIMESTAMP

data/lib/generators/rodauth/migration/sequel/verify_login_change.erb

@@ -1,6 +1,6 @@
 # Used by the verify login change feature
-create_table :account_login_change_keys do
-  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+create_table :<%= table_prefix %>_login_change_keys do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
   String :key, null: false
   String :login, null: false
   DateTime :deadline, null: false

data/lib/generators/rodauth/migration/sequel/webauthn.erb

@@ -1,13 +1,13 @@
 # Used by the webauthn feature
-create_table :account_webauthn_user_ids do
-  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+create_table :<%= table_prefix %>_webauthn_user_ids do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
   String :webauthn_id, null: false
 end
-create_table :account_webauthn_keys do
-  foreign_key :account_id, :accounts, type: :Bignum
+create_table :<%= table_prefix %>_webauthn_keys do
+  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, type: :Bignum
   String :webauthn_id
   String :public_key, null: false
   Integer :sign_count, null: false
   Time :last_use, null: false, default: Sequel::CURRENT_TIMESTAMP
-  primary_key [:account_id, :webauthn_id]
+  primary_key [:<%= table_prefix %>_id, :webauthn_id]
 end

data/lib/generators/rodauth/migration_generator.rb

@@ -13,6 +13,9 @@ module Rodauth
           desc: "Rodauth features to create tables for (otp, sms_codes, single_session, account_expiration etc.)",
           default: %w[]
 
+        class_option :prefix, optional: true, type: :string,
+          desc: "Change prefix for generated tables (default: account)"
+
         class_option :name, optional: true, type: :string,
           desc: "Name of the generated migration file"
 
@@ -22,10 +25,24 @@ module Rodauth
           migration_template "db/migrate/create_rodauth.rb", File.join(db_migrate_path, "#{migration_name}.rb")
         end
 
+        def show_instructions
+          # skip if called from install generator, it already adds configuration
+          return if current_command_chain.include?(:generate_rodauth_migration)
+          return unless options[:prefix] && behavior == :invoke
+
+          configuration = CONFIGURATION.values_at(*features.map(&:to_sym))
+            .flat_map(&:to_a)
+            .map { |config, format| "#{config} :#{format % { plural: table_prefix.pluralize, singular: table_prefix }}" }
+            .join("\n")
+            .indent(2)
+
+          say "\nAdd the following to your Rodauth configuration:\n\n#{configuration}"
+        end
+
         private
 
         def migration_name
-          options[:name] || "create_rodauth_#{features.join("_")}"
+          options[:name] || ["create_rodauth", *options[:prefix], *features].join("_")
         end
 
         def migration_content
@@ -64,6 +81,31 @@ module Rodauth
           Dir["#{MIGRATION_DIR}/*.erb"].map { |filename| File.basename(filename, ".erb") }
         end
 
+        def table_prefix
+          options[:prefix]&.singularize || "account"
+        end
+
+        CONFIGURATION = {
+          base: { accounts_table: "%{plural}" },
+          remember: { remember_table: "%{singular}_remember_keys" },
+          verify_account: { verify_account_table: "%{singular}_verification_keys" },
+          verify_login_change: { verify_login_change_table: "%{singular}_login_change_keys" },
+          reset_password: { reset_password_table: "%{singular}_password_reset_keys" },
+          email_auth: { email_auth_table: "%{singular}_email_auth_keys" },
+          otp: { otp_keys_table: "%{singular}_otp_keys" },
+          sms_codes: { sms_codes_table: "%{singular}_sms_codes" },
+          recovery_codes: { recovery_codes_table: "%{singular}_recovery_codes" },
+          webauthn: { webauthn_keys_table: "%{singular}_webauthn_keys", webauthn_user_ids_table: "%{singular}_webauthn_user_ids", webauthn_keys_account_id_column: "%{singular}_id" },
+          lockout: { account_login_failures_table: "%{singular}_login_failures", account_lockouts_table: "%{singular}_lockouts" },
+          active_sessions: { active_sessions_table: "%{singular}_active_session_keys", active_sessions_account_id_column: "%{singular}_id" },
+          account_expiration: { account_activity_table: "%{singular}_activity_times" },
+          password_expiration: { password_expiration_table: "%{singular}_password_change_times" },
+          single_session: { single_session_table: "%{singular}_session_keys" },
+          audit_logging: { audit_logging_table: "%{singular}_authentication_audit_logs", audit_logging_account_id_column: "%{singular}_id" },
+          disallow_password_reuse: { previous_password_hash_table: "%{singular}_previous_password_hashes", previous_password_account_id_column: "%{singular}_id" },
+          jwt_refresh: { jwt_refresh_token_table: "%{singular}_jwt_refresh_keys", jwt_refresh_token_account_id_column: "%{singular}_id" },
+        }
+
         if defined?(::ActiveRecord::Railtie) # Active Record
           include ::ActiveRecord::Generators::Migration
 

data/lib/generators/rodauth/templates/app/mailers/{rodauth_mailer.rb → rodauth_mailer.rb.tt}

@@ -1,16 +1,18 @@
 class RodauthMailer < ApplicationMailer
+  default to: -> { @rodauth.email_to }, from: -> { @rodauth.email_from }
+
   def verify_account(name, account_id, key)
     @rodauth = rodauth(name, account_id) { @verify_account_key_value = key }
     @account = @rodauth.rails_account
 
-    mail to: @account.email, subject: @rodauth.verify_account_email_subject
+    mail subject: @rodauth.verify_account_email_subject
   end
 
   def reset_password(name, account_id, key)
     @rodauth = rodauth(name, account_id) { @reset_password_key_value = key }
     @account = @rodauth.rails_account
 
-    mail to: @account.email, subject: @rodauth.reset_password_email_subject
+    mail subject: @rodauth.reset_password_email_subject
   end
 
   def verify_login_change(name, account_id, key)
@@ -25,28 +27,28 @@ class RodauthMailer < ApplicationMailer
     @rodauth = rodauth(name, account_id)
     @account = @rodauth.rails_account
 
-    mail to: @account.email, subject: @rodauth.password_changed_email_subject
+    mail subject: @rodauth.password_changed_email_subject
   end
 
   # def reset_password_notify(name, account_id)
   #   @rodauth = rodauth(name, account_id)
   #   @account = @rodauth.rails_account
 
-  #   mail to: @account.email, subject: @rodauth.reset_password_notify_email_subject
+  #   mail subject: @rodauth.reset_password_notify_email_subject
   # end
 
   # def email_auth(name, account_id, key)
   #   @rodauth = rodauth(name, account_id) { @email_auth_key_value = key }
   #   @account = @rodauth.rails_account
 
-  #   mail to: @account.email, subject: @rodauth.email_auth_email_subject
+  #   mail subject: @rodauth.email_auth_email_subject
   # end
 
   # def unlock_account(name, account_id, key)
   #   @rodauth = rodauth(name, account_id) { @unlock_account_key_value = key }
   #   @account = @rodauth.rails_account
 
-  #   mail to: @account.email, subject: @rodauth.unlock_account_email_subject
+  #   mail subject: @rodauth.unlock_account_email_subject
   # end
 
   private

data/lib/generators/rodauth/templates/app/misc/{rodauth_main.rb → rodauth_main.rb.tt}

@@ -1,18 +1,56 @@
+require "sequel/core"
+
 class RodauthMain < Rodauth::Rails::Auth
   configure do
     # List of authentication features that are loaded.
     enable :create_account, :verify_account, :verify_account_grace_period,
       :login, :logout<%= ", :remember" unless jwt? %><%= ", :json" if json? %><%= ", :jwt" if jwt? %>,
       :reset_password, :change_password, :change_password_notify,
-      :change_login, :verify_login_change, :close_account
+      :change_login, :verify_login_change, :close_account<%= ", :argon2" if argon2? %>
 
     # See the Rodauth documentation for the list of available config options:
     # http://rodauth.jeremyevans.net/documentation.html
 
     # ==> General
+<% if sequel_activerecord_integration? -%>
+    # Initialize Sequel and have it reuse Active Record's database connection.
+<% if RUBY_ENGINE == "jruby" -%>
+    db Sequel.connect("jdbc:<%= sequel_adapter %>://", extensions: :activerecord_connection, keep_reference: false)
+<% else -%>
+    db Sequel.<%= sequel_adapter %>(extensions: :activerecord_connection, keep_reference: false)
+<% end -%>
+
+<% end -%>
+    # Change prefix of table and foreign key column names from default "account"
+<% if table -%>
+    accounts_table :<%= table_prefix.pluralize %>
+    verify_account_table :<%= table_prefix %>_verification_keys
+    verify_login_change_table :<%= table_prefix %>_login_change_keys
+    reset_password_table :<%= table_prefix %>_password_reset_keys
+<% unless jwt? -%>
+    remember_table :<%= table_prefix %>_remember_keys
+<% end -%>
+<% else -%>
+    # accounts_table :users
+    # verify_account_table :user_verification_keys
+    # verify_login_change_table :user_login_change_keys
+    # reset_password_table :user_password_reset_keys
+<% unless jwt? -%>
+    # remember_table :user_remember_keys
+<% end -%>
+<% end -%>
+
     # The secret key used for hashing public-facing tokens for various features.
     # Defaults to Rails `secret_key_base`, but you can use your own secret key.
     # hmac_secret "<%= SecureRandom.hex(64) %>"
+<% if argon2? -%>
+
+    # Use a rotatable password pepper when hashing passwords with Argon2.
+    # argon2_secret "<SECRET_KEY>"
+
+    # Since we're using argon2, prevent loading the bcrypt gem to save memory.
+    require_bcrypt? false
+<% end -%>
 <% if jwt? -%>
 
     # Set JWT secret, which is used to cryptographically protect the token.
@@ -28,10 +66,13 @@ class RodauthMain < Rodauth::Rails::Auth
     # require_login_confirmation? false
 <% end -%>
 
-    # Specify the controller used for view rendering and CSRF verification.
+    # Use path prefix for all routes.
+    # prefix "/auth"
+
+    # Specify the controller used for view rendering, CSRF, and callbacks.
     rails_controller { RodauthController }
 
-    # Set on Rodauth controller with the title of the current page.
+    # Set in Rodauth controller instance with the title of the current page.
     title_instance_variable :@page_title
 
     # Store account status in an integer column without foreign key constraint.
@@ -40,14 +81,13 @@ class RodauthMain < Rodauth::Rails::Auth
     # Store password hash in a column instead of a separate table.
     account_password_hash_column :password_hash
 
-    # Passwords shorter than 8 characters are considered weak according to OWASP.
-    password_minimum_length 8
-    # bcrypt has a maximum input length of 72 bytes, truncating any extra bytes.
-    password_maximum_bytes 72
-
     # Set password when creating account instead of when verifying.
     verify_account_set_password? false
 
+    # Change some default param keys.
+    # login_param "email"
+    # password_confirm_param "confirm_password"
+
     # Redirect back to originally requested location after authentication.
     # login_return_to_requested_location? true
     # two_factor_auth_return_to_requested_location? true # if using MFA
@@ -110,8 +150,27 @@ class RodauthMain < Rodauth::Rails::Auth
     # password_too_short_message { "needs to have at least #{password_minimum_length} characters" }
     # login_does_not_meet_requirements_message { "invalid email#{", #{login_requirement_message}" if login_requirement_message}" }
 
-    # Change minimum number of password characters required when creating an account.
-    # password_minimum_length 8
+    # Passwords shorter than 8 characters are considered weak according to OWASP.
+    password_minimum_length 8
+<% if argon2? -%>
+    # Having a maximum password length set prevents long password DoS attacks.
+    password_maximum_length 64
+<% else -%>
+    # bcrypt has a maximum input length of 72 bytes, truncating any extra bytes.
+    password_maximum_bytes 72
+<% end -%>
+
+    # Custom password complexity requirements (alternative to password_complexity feature).
+    # password_meets_requirements? do |password|
+    #   super(password) && password_complex_enough?(password)
+    # end
+    # auth_class_eval do
+    #   def password_complex_enough?(password)
+    #     return true if password.match?(/\d/) && password.match?(/[^a-zA-Z\d]/)
+    #     set_password_requirement_error_message(:password_simple, "requires one number and one special character")
+    #     false
+    #   end
+    # end
 <% unless jwt? -%>
 
     # ==> Remember Feature

data/lib/generators/rodauth/templates/app/models/{account.rb → account.rb.tt}

@@ -1,5 +1,5 @@
 <% if defined?(ActiveRecord::Railtie) -%>
-class Account < ApplicationRecord
+class <%= table_prefix.camelize %> < ApplicationRecord
   include Rodauth::Rails.model
 <% if ActiveRecord.version >= Gem::Version.new("7.0") -%>
   enum :status, unverified: 1, verified: 2, closed: 3
@@ -8,7 +8,7 @@ class Account < ApplicationRecord
 <% end -%>
 end
 <% else -%>
-class Account < Sequel::Model
+class <%= table_prefix.camelize %> < Sequel::Model
   include Rodauth::Rails.model
   plugin :enum
   enum :status, unverified: 1, verified: 2, closed: 3

data/lib/generators/rodauth/templates/app/views/rodauth/tailwind/webauthn_remove.html.erb

@@ -8,13 +8,13 @@
   <% end %>
 
   <fieldset class="mb-6">
-    <% (usage = rodauth.account_webauthn_usage).each do |id, last_use| %>
+    <% rodauth.account_webauthn_usage.each do |id, last_use| %>
       <div class="flex items-center space-x-2">
         <%= form.radio_button rodauth.webauthn_remove_param, id, id: "webauthn-remove-#{id}", class: "dark:bg-gray-900 dark:border-gray-600 dark:checked:bg-current dark:checked:border-current dark:checked:text-emerald-400 dark:focus:ring-emerald-400 dark:focus:ring-offset-gray-900" %>
         <%= form.label "webauthn-remove-#{id}", "Last use: #{last_use}", class: "text-sm" %>
-        <%= content_tag(:span, rodauth.field_error(rodauth.webauthn_remove_param), class: "block mt-1 text-red-600 text-xs dark:text-red-400", id: "webauthn_remove_error_message") if rodauth.field_error(rodauth.webauthn_remove_param) && id == usage.keys.last %>
       </div>
     <% end %>
+    <%= content_tag(:span, rodauth.field_error(rodauth.webauthn_remove_param), class: "block mt-1 text-red-600 text-xs dark:text-red-400", id: "webauthn_remove_error_message") if rodauth.field_error(rodauth.webauthn_remove_param) %>
   </fieldset>
 
   <%= form.submit rodauth.webauthn_remove_button, class: "w-full px-8 py-3 cursor-pointer font-semibold text-sm rounded-md text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-600 dark:bg-emerald-400 dark:hover:bg-emerald-500 dark:text-gray-900 dark:focus:ring-emerald-400 dark:focus:ring-offset-current" %>

data/lib/generators/rodauth/templates/test/fixtures/{accounts.yml → accounts.yml.tt}

@@ -1,10 +1,10 @@
 # Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 one:
   email: freddie@queen.com
-  password_hash: <%%= BCrypt::Password.create("password", cost: BCrypt::Engine::MIN_COST) %>
+  password_hash: <%%= RodauthMain.allocate.password_hash("password") %>
   status: verified
 
 two:
   email: brian@queen.com
-  password_hash: <%%= BCrypt::Password.create("password", cost: BCrypt::Engine::MIN_COST) %>
+  password_hash: <%%= RodauthMain.allocate.password_hash("password") %>
   status: verified

data/lib/rodauth/rails/app.rb

@@ -82,6 +82,25 @@ module Rodauth
             super
           end
         end
+
+        # The Rack input might not be rewindable, so ensure we parse the JSON
+        # request body in Rails, and avoid parsing it again in Roda.
+        def POST
+          if content_type =~ /json/
+            env["roda.json_params"] = scope.rails_request.POST.to_hash
+          end
+          super
+        end
+
+        unless ActionPack.version < Gem::Version.new("5.0")
+          # When calling a Rodauth method that redirects inside the Rails
+          # router, Roda's after hook that commits the flash would never get
+          # called, so we make sure to commit the flash beforehand.
+          def redirect(*)
+            scope.rails_request.commit_flash
+            super
+          end
+        end
       end
     end
   end

data/lib/rodauth/rails/feature/base.rb

@@ -60,16 +60,6 @@ module Rodauth
 
         private
 
-        unless ActionPack.version < Gem::Version.new("5.0")
-          # When calling a Rodauth method that redirects inside the Rails
-          # router, Roda's after hook that commits the flash would never get
-          # called, so we make sure to commit the flash beforehand.
-          def redirect(*)
-            rails_request.commit_flash
-            super
-          end
-        end
-
         def instantiate_rails_account
           if defined?(ActiveRecord::Base) && rails_account_model < ActiveRecord::Base
             rails_account_model.instantiate(account.stringify_keys)

data/lib/rodauth/rails/version.rb

@@ -1,5 +1,5 @@
 module Rodauth
   module Rails
-    VERSION = "1.7.1"
+    VERSION = "1.8.0"
   end
 end

data/rodauth-rails.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "railties", ">= 4.2", "< 8"
-  spec.add_dependency "rodauth", "~> 2.27"
+  spec.add_dependency "rodauth", "~> 2.28"
   spec.add_dependency "roda", "~> 3.55"
   spec.add_dependency "sequel-activerecord_connection", "~> 1.1"
   spec.add_dependency "rodauth-model", "~> 0.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.27'
+        version: '2.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.27'
+        version: '2.28'
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement
@@ -219,11 +219,11 @@ files:
 - lib/generators/rodauth/migration/sequel/webauthn.erb
 - lib/generators/rodauth/migration_generator.rb
 - lib/generators/rodauth/templates/INSTRUCTIONS
-- lib/generators/rodauth/templates/app/controllers/rodauth_controller.rb
-- lib/generators/rodauth/templates/app/mailers/rodauth_mailer.rb
-- lib/generators/rodauth/templates/app/misc/rodauth_app.rb
-- lib/generators/rodauth/templates/app/misc/rodauth_main.rb
-- lib/generators/rodauth/templates/app/models/account.rb
+- lib/generators/rodauth/templates/app/controllers/rodauth_controller.rb.tt
+- lib/generators/rodauth/templates/app/mailers/rodauth_mailer.rb.tt
+- lib/generators/rodauth/templates/app/misc/rodauth_app.rb.tt
+- lib/generators/rodauth/templates/app/misc/rodauth_main.rb.tt
+- lib/generators/rodauth/templates/app/models/account.rb.tt
 - lib/generators/rodauth/templates/app/views/rodauth/_email_auth_request_form.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/_login_form.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/_login_form_footer.html.erb
@@ -307,10 +307,9 @@ files:
 - lib/generators/rodauth/templates/app/views/rodauth_mailer/unlock_account.text.erb
 - lib/generators/rodauth/templates/app/views/rodauth_mailer/verify_account.text.erb
 - lib/generators/rodauth/templates/app/views/rodauth_mailer/verify_login_change.text.erb
-- lib/generators/rodauth/templates/config/initializers/rodauth.rb
-- lib/generators/rodauth/templates/config/initializers/sequel.rb
-- lib/generators/rodauth/templates/db/migrate/create_rodauth.rb
-- lib/generators/rodauth/templates/test/fixtures/accounts.yml
+- lib/generators/rodauth/templates/config/initializers/rodauth.rb.tt
+- lib/generators/rodauth/templates/db/migrate/create_rodauth.rb.tt
+- lib/generators/rodauth/templates/test/fixtures/accounts.yml.tt
 - lib/generators/rodauth/views_generator.rb
 - lib/rodauth-rails.rb
 - lib/rodauth/rails.rb
@@ -352,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Provides Rails integration for Rodauth.

data/lib/generators/rodauth/templates/config/initializers/sequel.rb

@@ -1,4 +0,0 @@
-require "sequel/core"
-
-# initialize Sequel and have it reuse Active Record's database connection
-DB = Sequel.connect("<%= sequel_uri_scheme %>://", extensions: :activerecord_connection)