rodauth-rails 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a85a9d6a32ae95b8508024caebfa807fae2ab58841bfe2d8d2d6d382f3f336b2
-  data.tar.gz: bae2d174023325da77e494431246c5b4269e803be35157c084b5e35cc084c090
+  metadata.gz: 12ac51c0ef57f053d8bdc843eef7a846554defb7e37403b9ccf2ab83bd52fb6b
+  data.tar.gz: 5854a05239bfbb92f2b0aecc5c0e9dd1de22388d364afc6f4fe601e4900c54c5
 SHA512:
-  metadata.gz: 20ff48cdfa007d82233bd5e46bb09b31b6b1dc0ffa4669303b5c7bec19c3fdb36cda03b38ce36199eb4241433e4f2c118dd729544bda62a7b3c949c6af313a5e
-  data.tar.gz: 7930be938efaa027572fd487067b925eafc286e5f356db1781e0892cf62d30f2aef72ac4a1b854b17fee07679d38975c5fe29a15509dbf180e88bc973ba3457e
+  metadata.gz: bbf3d3cc5f453756a8a52a73409de3134569aa12908be81a505e637b0a05f890735a9589df237fb1e7f2f9687a5df2ac6821586d0e4cd52995d9efd3b0989e46
+  data.tar.gz: 6c1725dc4b64c498a6d840aba77c61c273df112bb712610b8342ebded946c7dfdb7a4e7fe33ffac69303ff8020223902040a66ebb58d6cd7247a085ceebdd448

data/README.md

@@ -68,7 +68,7 @@ $ rails generate rodauth:install
 
 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.
+those features, and a few other files.
 
 Feel free to remove any features you don't need, along with their corresponding
 tables. Afterwards, run the migration:
@@ -77,14 +77,6 @@ tables. Afterwards, run the migration:
 $ rails db:migrate
 ```
 
-For your mailer to be able to generate email links, you'll need to set up
-default URL options in each environment. Here is a possible configuration for
-`config/environments/development.rb`:
-
-```rb
-config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
-```
-
 ### Install options
 
 The install generator will use the `accounts` table by default. You can specify a different table name:
@@ -254,7 +246,7 @@ end
 ```rb
 class RodauthController < ApplicationController
   before_action :verify_captcha, only: :login, if: -> { request.post? } # executes before Rodauth endpoints
-  rescue_from("MyApp::SomeError") { |exception| ... } # rescues around Rodauth endpoints
+  rescue_from("SomeError") { |exception| ... } # rescues around Rodauth endpoints
 end
 ```
 
@@ -316,42 +308,41 @@ $ rails generate rodauth:views webauthn two_factor_base --name admin
 
 ## Mailer
 
-The install generator will create `RodauthMailer` with default email templates,
-and configure Rodauth features that send emails as part of the authentication
-flow to use it.
+When you're ready to modify the default email templates and safely deliver them
+in a background job, you can run the following command to generate the mailer
+integration:
 
-```rb
-# app/mailers/rodauth_mailer.rb
-class RodauthMailer < ApplicationMailer
-  def verify_account(account_id, key) ... end
-  def reset_password(account_id, key) ... end
-  def verify_login_change(account_id, key) ... end
-  def password_changed(account_id) ... end
-  # def email_auth(account_id, key) ... end
-  # def unlock_account(account_id, key) ... end
-end
+```sh
+$ rails generate rodauth:mailer
 ```
+
+This will create a `RodauthMailer`, email templates, and necessary Rodauth
+configuration for the features you have enabled. For email links to work, you
+need to have `config.action_mailer.default_url_options` set for each
+environment.
+
 ```rb
-# app/misc/rodauth_main.rb
-class RodauthMain < Rodauth::Rails::Auth
-  configure do
-    create_reset_password_email { RodauthMailer.reset_password(account_id, reset_password_key_value) }
-    create_verify_account_email { RodauthMailer.verify_account(account_id, verify_account_key_value) }
-    create_verify_login_change_email { |_login| RodauthMailer.verify_login_change(account_id, verify_login_change_key_value) }
-    create_password_changed_email { RodauthMailer.password_changed(account_id) }
-    # create_email_auth_email { RodauthMailer.email_auth(account_id, email_auth_key_value) }
-    # create_unlock_account_email { RodauthMailer.unlock_account(account_id, unlock_account_key_value) }
-    send_email do |email|
-      # queue email delivery on the mailer after the transaction commits
-      db.after_commit { email.deliver_later }
-    end
-  end
-end
+# config/environments/development.rb
+config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
+```
+
+The generator accepts various options:
+
+```sh
+# generate mailer integration for specified features
+$ rails generate rodauth:mailer email_auth lockout webauthn_modify_email
+
+# generate mailer integration for all Rodauth features
+$ rails generate rodauth:mailer --all
+
+# specify different Rodauth configuration to select enabled features
+$ rails generate rodauth:mailer --name admin
 ```
 
-This configuration calls `#deliver_later`, which uses Active Job to deliver
-emails in a background job. If you want to send emails synchronously, you can
-modify the configuration to call `#deliver_now` instead.
+Note that the generated Rodauth configuration calls `#deliver_later`, which
+uses Active Job to deliver emails in a background job. If you want to deliver
+emails synchronously, you can modify the configuration to call `#deliver_now`
+instead.
 
 If you're using a background processing library without an Active Job adapter,
 or a 3rd-party service for sending transactional emails, see [this wiki
@@ -535,6 +526,14 @@ Rodauth::Rails.rodauth(session: { two_factor_auth_setup: true })
 Rodauth::Rails.rodauth(:admin, params: { "param" => "value" })
 ```
 
+You can override default URL options ad-hoc by modifying `#rails_url_options`:
+
+```rb
+rodauth.base_url #=> "https://example.com"
+rodauth.rails_url_options[:host] = "subdomain.example.com"
+rodauth.base_url #=> "https://subdomain.example.com"
+```
+
 ### Using as a library
 
 Rodauth offers a [`Rodauth.lib`][library] method for when you want to use it as a library (via [internal requests][internal_request]), as opposed to having it route requests. This gem provides a `Rodauth::Rails.lib` counterpart that does the same but with Rails integration:
@@ -633,6 +632,7 @@ The `rails` feature rodauth-rails loads provides the following configuration met
 | `rails_controller_instance` | Instance of the controller with the request env context.           |
 | `rails_controller`          | Controller class to use for rendering and CSRF protection.         |
 | `rails_account_model`       | Model class connected with the accounts table.                     |
+| `rails_url_options`         | Options used for generating URLs outside of a request (defaults to `config.action_mailer.default_url_options`) |
 
 ```rb
 class RodauthMain < Rodauth::Rails::Auth

data/lib/generators/rodauth/install_generator.rb

@@ -13,15 +13,6 @@ module Rodauth
           "sqlserver"       => RUBY_ENGINE == "jruby" ? "mssql" : "tinytds",
         }
 
-        MAILER_VIEWS = %w[
-          email_auth
-          password_changed
-          reset_password
-          unlock_account
-          verify_account
-          verify_login_change
-        ]
-
         source_root "#{__dir__}/templates"
         namespace "rodauth:install"
 
@@ -55,16 +46,6 @@ module Rodauth
           template "app/models/account.rb", "app/models/#{table_prefix}.rb"
         end
 
-        def create_mailer
-          return unless defined?(ActionMailer)
-
-          template "app/mailers/rodauth_mailer.rb"
-
-          MAILER_VIEWS.each do |view|
-            copy_file "app/views/rodauth_mailer/#{view}.text.erb"
-          end
-        end
-
         def create_fixtures
           generator_options = ::Rails.configuration.generators.options
           if generator_options[:test_unit][:fixture] && generator_options[:test_unit][:fixture_replacement].nil?
@@ -101,9 +82,12 @@ module Rodauth
           options[:argon2]
         end
 
-        def sequel_activerecord_integration?
-          defined?(ActiveRecord::Railtie) &&
-            (!defined?(Sequel) || Sequel::DATABASES.empty?)
+        def activerecord?
+          defined?(ActiveRecord::Railtie)
+        end
+
+        def sequel?
+          defined?(Sequel) && Sequel::DATABASES.any?
         end
 
         def session_store?

data/lib/generators/rodauth/mailer/email_auth.erb

@@ -0,0 +1,6 @@
+def email_auth(name, account_id, key)
+  @rodauth = rodauth(name, account_id) { @email_auth_key_value = key }
+  @account = @rodauth.rails_account
+
+  mail subject: @rodauth.email_subject_prefix + @rodauth.email_auth_email_subject
+end

data/lib/generators/rodauth/mailer/otp_disabled.erb

@@ -0,0 +1,6 @@
+def otp_disabled(name, account_id)
+  @rodauth = rodauth(name, account_id)
+  @account = @rodauth.rails_account
+
+  mail subject: @rodauth.email_subject_prefix + @rodauth.otp_disabled_email_subject
+end

data/lib/generators/rodauth/mailer/otp_locked_out.erb

@@ -0,0 +1,6 @@
+def otp_locked_out(name, account_id)
+  @rodauth = rodauth(name, account_id)
+  @account = @rodauth.rails_account
+
+  mail subject: @rodauth.email_subject_prefix + @rodauth.otp_locked_out_email_subject
+end

data/lib/generators/rodauth/mailer/otp_setup.erb

@@ -0,0 +1,6 @@
+def otp_setup(name, account_id)
+  @rodauth = rodauth(name, account_id)
+  @account = @rodauth.rails_account
+
+  mail subject: @rodauth.email_subject_prefix + @rodauth.otp_setup_email_subject
+end

data/lib/generators/rodauth/mailer/otp_unlock_failed.erb

@@ -0,0 +1,6 @@
+def otp_unlock_failed(name, account_id)
+  @rodauth = rodauth(name, account_id)
+  @account = @rodauth.rails_account
+
+  mail subject: @rodauth.email_subject_prefix + @rodauth.otp_unlock_failed_email_subject
+end

data/lib/generators/rodauth/mailer/otp_unlocked.erb

@@ -0,0 +1,6 @@
+def otp_unlocked(name, account_id)
+  @rodauth = rodauth(name, account_id)
+  @account = @rodauth.rails_account
+
+  mail subject: @rodauth.email_subject_prefix + @rodauth.otp_unlocked_email_subject
+end

data/lib/generators/rodauth/mailer/password_changed.erb

@@ -0,0 +1,6 @@
+def password_changed(name, account_id)
+  @rodauth = rodauth(name, account_id)
+  @account = @rodauth.rails_account
+
+  mail subject: @rodauth.email_subject_prefix + @rodauth.password_changed_email_subject
+end

data/lib/generators/rodauth/mailer/reset_password.erb

@@ -0,0 +1,6 @@
+def reset_password(name, account_id, key)
+  @rodauth = rodauth(name, account_id) { @reset_password_key_value = key }
+  @account = @rodauth.rails_account
+
+  mail subject: @rodauth.email_subject_prefix + @rodauth.reset_password_email_subject
+end

data/lib/generators/rodauth/mailer/reset_password_notify.erb

@@ -0,0 +1,6 @@
+def reset_password_notify(name, account_id)
+  @rodauth = rodauth(name, account_id)
+  @account = @rodauth.rails_account
+
+  mail subject: @rodauth.email_subject_prefix + @rodauth.reset_password_notify_email_subject
+end

data/lib/generators/rodauth/mailer/unlock_account.erb

@@ -0,0 +1,6 @@
+def unlock_account(name, account_id, key)
+  @rodauth = rodauth(name, account_id) { @unlock_account_key_value = key }
+  @account = @rodauth.rails_account
+
+  mail subject: @rodauth.email_subject_prefix + @rodauth.unlock_account_email_subject
+end

data/lib/generators/rodauth/mailer/verify_account.erb

@@ -0,0 +1,6 @@
+def verify_account(name, account_id, key)
+  @rodauth = rodauth(name, account_id) { @verify_account_key_value = key }
+  @account = @rodauth.rails_account
+
+  mail subject: @rodauth.email_subject_prefix + @rodauth.verify_account_email_subject
+end

data/lib/generators/rodauth/mailer/verify_login_change.erb

@@ -0,0 +1,7 @@
+def verify_login_change(name, account_id, key)
+  @rodauth = rodauth(name, account_id) { @verify_login_change_key_value = key }
+  @account = @rodauth.rails_account
+  @new_email = @account.login_change_key.login
+
+  mail to: @new_email, subject: @rodauth.email_subject_prefix + @rodauth.verify_login_change_email_subject
+end

data/lib/generators/rodauth/mailer/webauthn_authenticator_added.erb

@@ -0,0 +1,6 @@
+def webauthn_authenticator_added(name, account_id)
+  @rodauth = rodauth(name, account_id)
+  @account = @rodauth.rails_account
+
+  mail subject: @rodauth.email_subject_prefix + @rodauth.webauthn_authenticator_added_email_subject
+end

data/lib/generators/rodauth/mailer/webauthn_authenticator_removed.erb

@@ -0,0 +1,6 @@
+def webauthn_authenticator_removed(name, account_id)
+  @rodauth = rodauth(name, account_id)
+  @account = @rodauth.rails_account
+
+  mail subject: @rodauth.email_subject_prefix + @rodauth.webauthn_authenticator_removed_email_subject
+end

data/lib/generators/rodauth/mailer_generator.rb

@@ -0,0 +1,126 @@
+require "rails/generators/base"
+
+module Rodauth
+  module Rails
+    module Generators
+      class MailerGenerator < ::Rails::Generators::Base
+        source_root "#{__dir__}/templates"
+        namespace "rodauth:mailer"
+
+        argument :selected_features, optional: true, type: :array,
+          desc: "Rodauth features to generate mailer integration for (verify_account, verify_login_change, reset_password etc.)"
+
+        class_option :all, aliases: "-a", type: :boolean,
+          desc: "Generates mailer integration for all Rodauth features",
+          default: false
+
+        class_option :name, aliases: "-n", type: :string,
+          desc: "The configuration name for which to generate mailer configuration",
+          default: nil
+
+        EMAILS = {
+          verify_account:         %w[verify_account],
+          reset_password:         %w[reset_password],
+          verify_login_change:    %w[verify_login_change],
+          email_auth:             %w[email_auth],
+          lockout:                %w[unlock_account],
+          reset_password_notify:  %w[reset_password_notify],
+          change_password_notify: %w[password_changed],
+          otp_modify_email:       %w[otp_setup otp_disabled],
+          otp_lockout_email:      %w[otp_locked_out otp_unlocked otp_unlock_failed],
+          webauthn_modify_email:  %w[webauthn_authenticator_added webauthn_authenticator_removed],
+        }
+
+        TOKENS = %w[reset_password verify_account verify_login_change email_auth unlock_account]
+
+        def copy_mailer_views
+          return unless validate_features
+
+          emails.each do |email|
+            copy_file "app/views/rodauth_mailer/#{email}.text.erb"
+          end
+        end
+
+        def copy_mailer
+          return unless validate_features
+
+          if File.exist?("#{destination_root}/app/mailers/rodauth_mailer.rb") && options.fetch(:skip, true) && !options[:force] && behavior == :invoke
+            say "\nCopy the following lines into your Rodauth mailer:\n\n#{mailer_content}"
+          else
+            template "app/mailers/rodauth_mailer.rb"
+          end
+        end
+
+        def show_configuration
+          return unless behavior == :invoke && validate_features
+
+          say "\nCopy the following lines into your Rodauth configuration:\n\n#{configuration_content}"
+        end
+
+        private
+
+        def mailer_content
+          emails
+            .map { |email| File.read("#{__dir__}/mailer/#{email}.erb") }
+            .map { |content| erb_eval(content) }
+            .join("\n")
+            .indent(2)
+        end
+
+        def configuration_content
+          emails
+            .map { |email| configuration_chunk(email) }
+            .join
+            .indent(2)
+        end
+
+        def configuration_chunk(email)
+          <<~RUBY
+            create_#{email}_email do#{" |_login|" if email == "verify_login_change"}
+              RodauthMailer.#{email}(self.class.configuration_name, account_id#{", #{email}_key_value" if TOKENS.include?(email)})
+            end
+          RUBY
+        end
+
+        def erb_eval(content)
+          if ERB.version[/\d+\.\d+\.\d+/].to_s >= "2.2.0"
+            ERB.new(content, trim_mode: "-").result(binding)
+          else
+            ERB.new(content, 0, "-").result(binding)
+          end
+        end
+
+        def emails
+          features.flat_map { |feature| EMAILS.fetch(feature) }
+        end
+
+        def validate_features
+          if (features - EMAILS.keys).any?
+            say "No available email template for feature(s): #{(features - EMAILS.keys).join(", ")}", :error
+            false
+          else
+            true
+          end
+        end
+
+        def features
+          if options[:all]
+            EMAILS.keys
+          elsif selected_features
+            selected_features.map(&:to_sym)
+          else
+            rodauth_configuration.features & EMAILS.keys
+          end
+        end
+
+        def rodauth_configuration
+          Rodauth::Rails.app.rodauth!(configuration_name)
+        end
+
+        def configuration_name
+          options[:name]&.to_sym
+        end
+      end
+    end
+  end
+end

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

@@ -11,6 +11,6 @@ create_table :<%= table_prefix %>_authentication_audit_logs<%= primary_key_type
 <% else -%>
   t.string :metadata
 <% end -%>
-  t.index [:<%= table_prefix %>_id, :at], name: "audit_<%= table_prefix %>_at_idx"
-  t.index :at, name: "audit_at_idx"
+  t.index [:<%= table_prefix %>_id, :at]
+  t.index :at
 end

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

@@ -3,5 +3,4 @@ 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 :<%= table_prefix %>_id, name: "<%= table_prefix %>_jwt_rk_<%= table_prefix %>_id_idx"
 end

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

@@ -0,0 +1,7 @@
+# Used by the otp_unlock feature
+create_table :<%= table_prefix %>_otp_unlocks, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
+  t.integer :num_successes, null: false, default: 1
+  t.datetime :next_auth_attempt_after, null: false, default: -> { "<%= current_timestamp %>" }
+end

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

@@ -12,6 +12,6 @@ create_table :<%= table_prefix %>_authentication_audit_logs do
 <% else -%>
   String :metadata
 <% end -%>
-  index [:<%= table_prefix %>_id, :at], name: :audit_<%= table_prefix %>_at_idx
-  index :at, name: :audit_at_idx
+  index [:<%= table_prefix %>_id, :at]
+  index :at
 end

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

@@ -4,5 +4,5 @@ create_table :<%= table_prefix %>_jwt_refresh_keys do
   foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, null: false, type: :Bignum
   String :key, null: false
   DateTime :deadline, null: false
-  index :<%= table_prefix %>_id, name: :<%= table_prefix %>_jwt_rk_<%= table_prefix %>_id_idx
+  index :<%= table_prefix %>_id
 end

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

@@ -0,0 +1,6 @@
+# Used by the otp_unlock feature
+create_table :<%= table_prefix %>_otp_unlocks do
+  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
+  Integer :num_successes, null: false, default: 1
+  Time :next_auth_attempt_after, null: false, default: Sequel::CURRENT_TIMESTAMP
+end

data/lib/generators/rodauth/migration_generator.rb

@@ -20,12 +20,12 @@ module Rodauth
           desc: "Name of the generated migration file"
 
         def create_rodauth_migration
-          validate_features or return
+          return unless validate_features
 
           migration_template "db/migrate/create_rodauth.rb", File.join(db_migrate_path, "#{migration_name}.rb")
         end
 
-        def show_instructions
+        def show_configuration
           # 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
@@ -36,7 +36,7 @@ module Rodauth
             .join("\n")
             .indent(2)
 
-          say "\nAdd the following to your Rodauth configuration:\n\n#{configuration}"
+          say "\nCopy the following lines into your Rodauth configuration:\n\n#{configuration}"
         end
 
         private

data/lib/generators/rodauth/templates/INSTRUCTIONS

@@ -39,7 +39,7 @@ Depending on your application's configuration some manual setup may be required:
          ...
        </head>
 
-    * Not required *
+     * Not required *
 
   5. You can copy Rodauth views (for customization) to your app by running:
 
@@ -47,6 +47,12 @@ Depending on your application's configuration some manual setup may be required:
 
        rails g rodauth:views --css=tailwind # tailwind views (requires @tailwindcss/forms plugin)
 
-      * Not required *
+     * Not required *
+
+  6. You can generate email templates and mailer integration by running:
+
+       rails g rodauth:mailer
+
+     * Not required *
 
 ===============================================================================

data/lib/generators/rodauth/templates/app/controllers/rodauth_controller.rb.tt

@@ -1,4 +1,20 @@
 class RodauthController < ApplicationController
-  # used by Rodauth for rendering views, CSRF protection, and running any
-  # registered action callbacks and rescue_from handlers
+  # Used by Rodauth for rendering views, CSRF protection, running any
+  # registered action callbacks and rescue handlers, instrumentation etc.
+
+  # Controller callbacks and rescue handlers will run around Rodauth endpoints.
+  # before_action :verify_captcha, only: :login, if: -> { request.post? }
+  # rescue_from("SomeError") { |exception| ... }
+
+  # Layout can be changed for all Rodauth pages or only certain pages.
+  # layout "authentication"
+  # layout -> do
+  #   case rodauth.current_route
+  #   when :login, :create_account, :verify_account, :verify_account_resend,
+  #        :reset_password, :reset_password_request
+  #     "authentication"
+  #   else
+  #     "application"
+  #   end
+  # end
 end

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

@@ -1,61 +1,15 @@
 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 subject: @rodauth.email_subject_prefix + @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 subject: @rodauth.email_subject_prefix + @rodauth.reset_password_email_subject
-  end
-
-  def verify_login_change(name, account_id, key)
-    @rodauth = rodauth(name, account_id) { @verify_login_change_key_value = key }
-    @account = @rodauth.rails_account
-    @new_email = @account.login_change_key.login
-
-    mail to: @new_email, subject: @rodauth.email_subject_prefix + @rodauth.verify_login_change_email_subject
-  end
-
-  def password_changed(name, account_id)
-    @rodauth = rodauth(name, account_id)
-    @account = @rodauth.rails_account
-
-    mail subject: @rodauth.email_subject_prefix + @rodauth.password_changed_email_subject
-  end
-
-  # def reset_password_notify(name, account_id)
-  #   @rodauth = rodauth(name, account_id)
-  #   @account = @rodauth.rails_account
-
-  #   mail subject: @rodauth.email_subject_prefix + @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 subject: @rodauth.email_subject_prefix + @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 subject: @rodauth.email_subject_prefix + @rodauth.unlock_account_email_subject
-  # end
+<%= mailer_content -%>
 
   private
 
+  # Default URL options are inherited from Action Mailer, but you can override them
+  # ad-hoc by modifying the `rodauth.rails_url_options` hash.
   def rodauth(name, account_id, &block)
     instance = RodauthApp.rodauth(name).allocate
-    instance.instance_eval { @account = account_ds(account_id).first! }
+    instance.account_from_id(account_id)
     instance.instance_eval(&block) if block
     instance
   end