rodauth-rails 1.7.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a0e7a34f68cd9914ad148799dcc5b83c5f8509d6d3278f57a26ebd497a8460c
-  data.tar.gz: bfacb6b1ee374c5c0c1178d1a3b22a08bdb78626c1c91f3997a3c8572a8ede85
+  metadata.gz: 8f73ab003a11054b2534802c0de9224c867b7a173d8d553888918fa792ee3da4
+  data.tar.gz: 07136b1748df5970d5d263d5d9439596c3c2e083ccd88269ab7145a8cd73fefc
 SHA512:
-  metadata.gz: eb5ff0efa4e19d89f864eea1e5d2e7541b2a198cff6af02ec281904e660bac5124d59842f602527e988ac958913724c54225fceb02ca834f1ee03cbf6a975f24
-  data.tar.gz: 13350871f426602595dfa738b1a2016372f589788dfdd5d06ad5e915d351d2d5a4f3cec18c45871337153106c1f524ab27bae7f4c7f30c7e9fb2dbe02025c77d
+  metadata.gz: bc8c1a0ef2cd7d9c49f9fed9dd6423e92ec4112ddaa65b5a8fa63134f35d5fa9b5f2f1679c4d4d7f4d9f3cd5a71acf840d4d59ce2731b52d82914c200744eb03
+  data.tar.gz: 41f707560dd3ce232f54c80bc83f2210d4667d715c5f25aab812382a54f4115cab03d3e8e23d1c8c8b1e5e572404c91b332b040b741648c2577499779c0bf6a1

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+## 1.9.0 (2023-05-22)
+
+* Add support for webauthn_autofill feature to the views generator (@janko)
+
+* Generate view templates for two_factor_base feature only if explicitly specified (@janko)
+
+* Set `login_param "email"` in generated Rodauth configuration (@janko)
+
+* Handle Trilogy adapter in generators (@janko)
+
+* Use `email_subject_prefix` in generated mailer (@janko)
+
+* Fix typo in `unlock_account` email template (@zavan)
+
+* Retrieve current account using `account!` in `#rails_account` method (@janko)
+
+* Drop support for Rails 4.2 (@janko)
+
+## 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

@@ -31,16 +31,13 @@ There are already several popular authentication solutions for Rails (Devise,
 Sorcery, Clearance, Authlogic), so why would you choose Rodauth? Here are some
 of the advantages that stand out for me:
 
-* multifactor authentication ([TOTP][otp], [SMS codes][sms_codes], [recovery codes][recovery_codes], [WebAuthn][webauthn])
+* multifactor authentication ([TOTP][otp], [SMS codes][sms_codes], [recovery codes][recovery_codes], [passkeys][webauthn])
 * standardized [JSON API support][json] for every feature (including [JWT][jwt])
 * enterprise security features ([password complexity][password_complexity], [disallow password reuse][disallow_password_reuse], [password expiration][password_expiration], [session expiration][session_expiration], [single session][single_session], [account expiration][account_expiration])
-* [email authentication][email_auth] (aka "passwordless")
-* [audit logging][audit_logging] (for any action)
+* passwordless authentication ([email][email_auth], [passkeys][webauthn_login])
+* [audit logging][audit_logging] for any action
 * ability to protect password hashes even in case of SQL injection ([more details][password protection])
-* additional bruteforce protection for tokens ([more details][bruteforce tokens])
-* uniform configuration DSL (any setting can be static or dynamic)
-* consistent before/after hooks around everything
-* dedicated object encapsulating all authentication logic
+* uniform configuration DSL with before/after hooks around everything
 
 ### Sequel
 
@@ -70,7 +67,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 +82,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 +190,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
@@ -339,7 +346,7 @@ $ rails generate rodauth:views --all
 Use `--name` to generate views for a different Rodauth configuration:
 
 ```sh
-$ rails generate rodauth:views webauthn --name admin
+$ rails generate rodauth:views webauthn two_factor_base --name admin
 ```
 
 #### Page titles
@@ -499,7 +506,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 +522,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:
@@ -821,32 +852,27 @@ documentation].
 ### Defining custom methods
 
 All Rodauth configuration methods are just syntax sugar for defining instance
-methods on the auth class. You can also define your own custom methods on the
-auth class:
+methods on the auth class. You can also define your own custom methods:
 
 ```rb
 class RodauthMain < Rodauth::Rails::Auth
   configure do
-    # ...
     password_match? { |password| ldap_valid?(password) }
-    # ...
   end
 
-  # Example external identities table
-  def identities
-    db[:account_identities].where(account_id: account_id).all
+  def admin?
+    rails_account.admin?
   end
 
   private
 
-  # Example LDAP authentication
   def ldap_valid?(password)
     SimpleLdapAuthenticator.valid?(account[:email], password)
   end
 end
 ```
 ```rb
-rodauth.identities #=> [{ provider: "facebook", uid: "abc123", ... }, ...]
+rodauth.admin? #=> true
 ```
 
 ### Rails URL helpers
@@ -1103,11 +1129,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
 ```
@@ -1187,12 +1219,12 @@ conduct](CODE_OF_CONDUCT.md).
 [sms_codes]: http://rodauth.jeremyevans.net/rdoc/files/doc/sms_codes_rdoc.html
 [recovery_codes]: http://rodauth.jeremyevans.net/rdoc/files/doc/recovery_codes_rdoc.html
 [webauthn]: http://rodauth.jeremyevans.net/rdoc/files/doc/webauthn_rdoc.html
+[webauthn_login]: http://rodauth.jeremyevans.net/rdoc/files/doc/webauthn_login_rdoc.html
 [json]: http://rodauth.jeremyevans.net/rdoc/files/doc/json_rdoc.html
 [jwt]: http://rodauth.jeremyevans.net/rdoc/files/doc/jwt_rdoc.html
 [email_auth]: http://rodauth.jeremyevans.net/rdoc/files/doc/email_auth_rdoc.html
 [audit_logging]: http://rodauth.jeremyevans.net/rdoc/files/doc/audit_logging_rdoc.html
 [password protection]: https://github.com/jeremyevans/rodauth#label-Password+Hash+Access+Via+Database+Functions
-[bruteforce tokens]: https://github.com/jeremyevans/rodauth#label-Tokens
 [password_complexity]: http://rodauth.jeremyevans.net/rdoc/files/doc/password_complexity_rdoc.html
 [disallow_password_reuse]: http://rodauth.jeremyevans.net/rdoc/files/doc/disallow_password_reuse_rdoc.html
 [password_expiration]: http://rodauth.jeremyevans.net/rdoc/files/doc/password_expiration_rdoc.html

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,18 +97,25 @@ 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
 
         def api_only?
-          Rodauth::Rails.api_only?
+          ::Rails.application.config.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,7 +1,7 @@
 # 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 %>
+  t.datetime :created_at, null: false, default: -> { "<%= current_timestamp %>" }
+  t.datetime :last_use, null: false, default: -> { "<%= current_timestamp %>" }
 end

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

@@ -1,16 +1,16 @@
 # 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) %>
-  t.datetime :at, null: false, default: <%= current_timestamp %>
+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 -%>
 <% when "postgresql" -%>
   t.jsonb :metadata
-<% when "sqlite3", "mysql2" -%>
+<% when "sqlite3", "mysql2", "trilogy" -%>
   t.json :metadata
 <% 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,7 +1,8 @@
 # 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 %>
+  t.datetime :email_last_sent, null: false, default: -> { "<%= current_timestamp %>" }
 end

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,8 +1,8 @@
 # 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 %>
+  t.datetime :last_use, null: false, default: -> { "<%= current_timestamp %>" }
 end

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.datetime :changed_at, null: false, default: <%= current_timestamp %>
+  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,8 +1,8 @@
 # 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 %>
+  t.datetime :email_last_sent, null: false, default: -> { "<%= current_timestamp %>" }
 end

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,9 +1,9 @@
 # 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
-  t.datetime :code_issued_at, null: false, default: <%= current_timestamp %>
+  t.datetime :code_issued_at, null: false, default: -> { "<%= current_timestamp %>" }
 end

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

@@ -1,8 +1,8 @@
 # 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 %>
+  t.datetime :requested_at, null: false, default: -> { "<%= current_timestamp %>" }
+  t.datetime :email_last_sent, null: false, default: -> { "<%= current_timestamp %>" }
 end

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,13 +1,13 @@
 # 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
-  t.datetime :last_use, null: false, default: <%= current_timestamp %>
+  t.datetime :last_use, null: false, default: -> { "<%= current_timestamp %>" }
 end

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