rodauth-rails 0.17.0 → 1.0.0

data/lib/generators/rodauth/install_generator.rb

@@ -10,6 +10,20 @@ module Rodauth
         include ::ActiveRecord::Generators::Migration
         include MigrationHelpers
 
+        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
+
         MAILER_VIEWS = %w[
           email_auth
           password_changed
@@ -26,7 +40,7 @@ module Rodauth
         class_option :jwt, type: :boolean, desc: "Configure JWT support"
 
         def create_rodauth_migration
-          return unless defined?(ActiveRecord::Base)
+          return unless defined?(ActiveRecord::Railtie)
 
           migration_template "db/migrate/create_rodauth.rb"
         end
@@ -36,14 +50,15 @@ module Rodauth
         end
 
         def create_sequel_initializer
-          return unless defined?(ActiveRecord::Base)
+          return unless defined?(ActiveRecord::Railtie)
           return if defined?(Sequel) && !Sequel::DATABASES.empty?
 
           template "config/initializers/sequel.rb"
         end
 
         def create_rodauth_app
-          template "app/lib/rodauth_app.rb"
+          template "app/misc/rodauth_app.rb"
+          template "app/misc/rodauth_main.rb"
         end
 
         def create_rodauth_controller
@@ -51,7 +66,7 @@ module Rodauth
         end
 
         def create_account_model
-          return unless defined?(ActiveRecord::Base)
+          return unless defined?(ActiveRecord::Railtie)
 
           template "app/models/account.rb"
         end
@@ -60,52 +75,42 @@ module Rodauth
           template "app/mailers/rodauth_mailer.rb"
 
           MAILER_VIEWS.each do |view|
-            template "app/views/rodauth_mailer/#{view}.text.erb"
+            copy_file "app/views/rodauth_mailer/#{view}.text.erb"
           end
         end
 
+        def show_instructions
+          readme "INSTRUCTIONS" if behavior == :invoke
+        end
+
         private
 
-        def sequel_uri_scheme
-          if RUBY_ENGINE == "jruby"
-            "jdbc:#{sequel_jdbc_subadapter}"
-          else
-            sequel_adapter
-          end
+        def migration_features
+          features = [:base, :reset_password, :verify_account, :verify_login_change]
+          features << :remember unless jwt?
+          features
         end
 
-        def sequel_adapter
-          case activerecord_adapter
-          when "sqlite3"         then "sqlite"
-          when "oracle_enhanced" then "oracle" # https://github.com/rsim/oracle-enhanced
-          when "sqlserver"       then "tinytds" # https://github.com/rails-sqlserver/activerecord-sqlserver-adapter
-          else
-            activerecord_adapter
-          end
+        def json?
+          options[:json] || api_only? && session_store? && !options[:jwt]
         end
 
-        def sequel_jdbc_subadapter
-          case activerecord_adapter
-          when "sqlite3"         then "sqlite"
-          when "oracle_enhanced" then "oracle" # https://github.com/rsim/oracle-enhanced
-          when "sqlserver"       then "mssql"
-          else
-            activerecord_adapter
-          end
+        def jwt?
+          options[:jwt] || api_only? && !session_store? && !options[:json]
         end
 
-        def json?
-          options[:json]
+        def session_store?
+          !!::Rails.application.config.session_store
         end
 
-        def jwt?
-          options[:jwt] || Rodauth::Rails.api_only?
+        def api_only?
+          Rodauth::Rails.api_only?
         end
 
-        def migration_features
-          features = [:base, :reset_password, :verify_account, :verify_login_change]
-          features << :remember unless jwt?
-          features
+        def sequel_uri_scheme
+          scheme = SEQUEL_ADAPTERS[activerecord_adapter] || activerecord_adapter
+          scheme = "jdbc:#{scheme}" if RUBY_ENGINE == "jruby"
+          scheme
         end
       end
     end

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

@@ -5,11 +5,17 @@ enable_extension "citext"
 create_table :accounts<%= primary_key_type %> do |t|
 <% case activerecord_adapter -%>
 <% when "postgresql" -%>
-  t.citext :email, null: false, index: { unique: true, where: "status IN ('unverified', 'verified')" }
+  t.citext :email, null: false
 <% else -%>
-  t.string :email, null: false, index: { unique: true }
+  t.string :email, null: false
 <% end -%>
   t.string :status, null: false, default: "unverified"
+<% case activerecord_adapter -%>
+<% when "postgresql", "sqlite3" -%>
+  t.index :email, unique: true, where: "status IN ('unverified', 'verified')"
+<% else -%>
+  t.index :email, unique: true
+<% end -%>
 end
 
 # Used if storing password hashes in a separate table (default)

data/lib/generators/rodauth/migration_generator.rb

@@ -16,16 +16,23 @@ module Rodauth
           desc: "Rodauth features to create tables for (otp, sms_codes, single_session, account_expiration etc.)",
           default: %w[]
 
+        class_option :name, optional: true, type: :string,
+          desc: "Name of the generated migration file"
+
         def create_rodauth_migration
-          return unless defined?(ActiveRecord::Base)
+          return unless defined?(ActiveRecord::Railtie)
           return if features.empty?
 
-          migration_template "db/migrate/create_rodauth.rb", "create_rodauth_#{features.join("_")}.rb"
+          migration_template "db/migrate/create_rodauth.rb", "#{migration_name}.rb"
         end
 
         def migration_features
           features
         end
+
+        def migration_name
+          options[:name] || "create_rodauth_#{features.join("_")}"
+        end
       end
     end
   end

data/lib/generators/rodauth/templates/INSTRUCTIONS

@@ -0,0 +1,40 @@
+===============================================================================
+
+Depending on your application's configuration some manual setup may be required:
+
+  1. Ensure you have defined default url options in your environments files. Here
+     is an example of default_url_options appropriate for a development environment
+     in config/environments/development.rb:
+
+       config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+
+     In production, :host should be set to the actual host of your application.
+
+     * Required for all applications. *
+
+  2. Ensure you have defined root_url to *something* in your config/routes.rb.
+     For example:
+
+       root to: "home#index"
+
+     * Not required for API-only Applications *
+
+  3. Ensure you have flash messages in app/views/layouts/application.html.erb.
+     For example:
+
+       <% if notice %>
+         <div class="alert alert-success"><%= notice %></div>
+       <% end %>
+       <% if alert %>
+         <div class="alert alert-danger"><%= alert %></div>
+       <% end %>
+
+     * Not required for API-only Applications *
+
+  4. You can copy Rodauth views (for customization) to your app by running:
+
+       rails g rodauth:views
+
+     * Not required *
+
+===============================================================================

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

@@ -1,37 +1,54 @@
 class RodauthMailer < ApplicationMailer
-  def verify_account(recipient, email_link)
-    @email_link = email_link
+  def verify_account(account_id, key)
+    @email_link = rodauth.verify_account_url(key: email_token(account_id, key))
+    @account = Account.find(account_id)
 
-    mail to: recipient
+    mail to: @account.email, subject: rodauth.verify_account_email_subject
   end
 
-  def reset_password(recipient, email_link)
-    @email_link = email_link
+  def reset_password(account_id, key)
+    @email_link = rodauth.reset_password_url(key: email_token(account_id, key))
+    @account = Account.find(account_id)
 
-    mail to: recipient
+    mail to: @account.email, subject: rodauth.reset_password_email_subject
   end
 
-  def verify_login_change(recipient, old_login, new_login, email_link)
+  def verify_login_change(account_id, old_login, new_login, key)
     @old_login  = old_login
     @new_login  = new_login
-    @email_link = email_link
+    @email_link = rodauth.verify_login_change_url(key: email_token(account_id, key))
+    @account = Account.find(account_id)
 
-    mail to: recipient
+    mail to: new_login, subject: rodauth.verify_login_change_email_subject
   end
 
-  def password_changed(recipient)
-    mail to: recipient
+  def password_changed(account_id)
+    @account = Account.find(account_id)
+
+    mail to: @account.email, subject: rodauth.password_changed_email_subject
   end
 
-  # def email_auth(recipient, email_link)
-  #   @email_link = email_link
-  #
-  #   mail to: recipient
+  # def email_auth(account_id, key)
+  #   @email_link = rodauth.email_auth_url(key: email_token(account_id, key))
+  #   @account = Account.find(account_id)
+
+  #   mail to: @account.email, subject: rodauth.email_auth_email_subject
   # end
 
-  # def unlock_account(recipient, email_link)
-  #   @email_link = email_link
-  #
-  #   mail to: recipient
+  # def unlock_account(account_id, key)
+  #   @email_link = rodauth.unlock_account_url(key: email_token(account_id, key))
+  #   @account = Account.find(account_id)
+
+  #   mail to: @account.email, subject: rodauth.unlock_account_email_subject
   # end
+
+  private
+
+  def email_token(account_id, key)
+    "#{account_id}_#{rodauth.compute_hmac(key)}"
+  end
+
+  def rodauth(name = nil)
+    RodauthApp.rodauth(name).allocate
+  end
 end

data/lib/generators/rodauth/templates/app/misc/rodauth_app.rb

@@ -0,0 +1,38 @@
+class RodauthApp < Rodauth::Rails::App
+  # primary configuration
+  configure RodauthMain
+
+  # secondary configuration
+  # configure RodauthAdmin, :admin
+
+  route do |r|
+<% unless jwt? -%>
+    rodauth.load_memory # autologin remembered users
+
+<% end -%>
+    r.rodauth # route rodauth requests
+
+    # ==> Authenticating Requests
+    # Call `rodauth.require_authentication` for requests that you want to
+    # require authentication for. Some examples:
+    #
+    # next if r.path.start_with?("/docs") # skip authentication for documentation pages
+    # next if session[:admin] # skip authentication for admins
+    #
+    # # authenticate /dashboard/* and /account/* requests
+    # if r.path.start_with?("/dashboard") || r.path.start_with?("/account")
+    #   rodauth.require_authentication
+    # end
+
+    # ==> Secondary configurations
+    # r.on "admin" do
+    #   r.rodauth(:admin)
+    #
+    #   unless rodauth(:admin).logged_in?
+    #     rodauth(:admin).require_http_basic_auth
+    #   end
+    #
+    #   break # allow the Rails app to handle other "/admin/*" requests
+    # end
+  end
+end

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

@@ -1,11 +1,10 @@
-class RodauthApp < Rodauth::Rails::App
+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
 
     # See the Rodauth documentation for the list of available config options:
     # http://rodauth.jeremyevans.net/documentation.html
@@ -52,7 +51,7 @@ class RodauthApp < Rodauth::Rails::App
     # reset_password_autologin? true
 
     # Delete the account record when the user has closed their account.
-    delete_account_on_close? true
+    # delete_account_on_close? true
 
     # Redirect to the app from login and registration pages if already logged in.
     # already_logged_in { redirect login_redirect }
@@ -60,22 +59,22 @@ class RodauthApp < Rodauth::Rails::App
     # ==> Emails
     # Use a custom mailer for delivering authentication emails.
     create_reset_password_email do
-      RodauthMailer.reset_password(email_to, reset_password_email_link)
+      RodauthMailer.reset_password(account_id, reset_password_key_value)
     end
     create_verify_account_email do
-      RodauthMailer.verify_account(email_to, verify_account_email_link)
+      RodauthMailer.verify_account(account_id, verify_account_key_value)
     end
-    create_verify_login_change_email do |login|
-      RodauthMailer.verify_login_change(login, verify_login_change_old_login, verify_login_change_new_login, verify_login_change_email_link)
+    create_verify_login_change_email do |_login|
+      RodauthMailer.verify_login_change(account_id, verify_login_change_old_login, verify_login_change_new_login, verify_login_change_key_value)
     end
     create_password_changed_email do
-      RodauthMailer.password_changed(email_to)
+      RodauthMailer.password_changed(account_id)
     end
     # create_email_auth_email do
-    #   RodauthMailer.email_auth(email_to, email_auth_email_link)
+    #   RodauthMailer.email_auth(account_id, email_auth_key_value)
     # end
     # create_unlock_account_email do
-    #   RodauthMailer.unlock_account(email_to, unlock_account_email_link)
+    #   RodauthMailer.unlock_account(account_id, unlock_account_key_value)
     # end
     send_email do |email|
       # queue email delivery on the mailer after the transaction commits
@@ -153,46 +152,4 @@ class RodauthApp < Rodauth::Rails::App
     # remember_deadline_interval Hash[days: 30]
 <% end -%>
   end
-
-  # ==> Secondary configurations
-  # configure(:admin) do
-  #   # ... enable features ...
-  #   prefix "/admin"
-  #   session_key_prefix "admin_"
-  #   # remember_cookie_key "_admin_remember" # if using remember feature
-  #
-  #   # search views in `app/views/admin/rodauth` directory
-  #   rails_controller { Admin::RodauthController }
-  # end
-
-  route do |r|
-<% unless jwt? -%>
-    rodauth.load_memory # autologin remembered users
-
-<% end -%>
-    r.rodauth # route rodauth requests
-
-    # ==> Authenticating Requests
-    # Call `rodauth.require_authentication` for requests that you want to
-    # require authentication for. Some examples:
-    #
-    # next if r.path.start_with?("/docs") # skip authentication for documentation pages
-    # next if session[:admin] # skip authentication for admins
-    #
-    # # authenticate /dashboard/* and /account/* requests
-    # if r.path.start_with?("/dashboard") || r.path.start_with?("/account")
-    #   rodauth.require_authentication
-    # end
-
-    # ==> Secondary configurations
-    # r.on "admin" do
-    #   r.rodauth(:admin)
-    #
-    #   unless rodauth(:admin).logged_in?
-    #     rodauth(:admin).require_http_basic_auth
-    #   end
-    #
-    #   break # allow the Rails app to handle other "/admin/*" requests
-    # end
-  end
 end

data/lib/generators/rodauth/templates/app/views/rodauth/_email_auth_request_form.html.erb

@@ -1,4 +1,7 @@
-<%%= form_tag <%= rodauth %>.email_auth_request_path, method: :post do %>
-  <%%= render "login_hidden_field" %>
-  <%%= render "submit", value: "Send Login Link Via Email" %>
-<%% end %>
+<%= form_with url: rodauth.email_auth_request_path, method: :post, data: { turbo: false } do |form| %>
+  <%= form.hidden_field rodauth.login_param, value: params[rodauth.login_param] %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.email_auth_request_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/_login_form.html.erb

@@ -1,9 +1,26 @@
-<%%= form_tag <%= rodauth %>.login_path, method: :post do %>
-  <%% if <%= rodauth %>.skip_login_field_on_login? %>
-    <%%= render "login_display" %>
-  <%% else %>
-    <%%= render "login_field" %>
-  <%% end %>
-  <%%= render "password_field" unless <%= rodauth %>.skip_password_field_on_login? %>
-  <%%= render "submit", value: "Login" %>
-<%% end %>
+<%= form_with url: rodauth.login_path, method: :post, data: { turbo: false } do |form| %>
+  <% if rodauth.skip_login_field_on_login? %>
+    <div class="form-group mb-3">
+      <%= form.label "login", rodauth.login_label, class: "form-label" %>
+      <%= form.email_field rodauth.login_param, value: params[rodauth.login_param], id: "login", readonly: true, class: "form-control-plaintext" %>
+    </div>
+  <% else %>
+    <div class="form-group mb-3">
+      <%= form.label "login", rodauth.login_label, class: "form-label" %>
+      <%= form.email_field rodauth.login_param, value: params[rodauth.login_param], id: "login", autocomplete: "email", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.login_param)}", aria: ({ invalid: true, describedby: "login_error_message" } if rodauth.field_error(rodauth.login_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.login_param), class: "invalid-feedback", id: "login_error_message") if rodauth.field_error(rodauth.login_param) %>
+    </div>
+  <% end %>
+
+  <% unless rodauth.skip_password_field_on_login? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.login_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/_login_form_footer.html.erb

@@ -1,8 +1,9 @@
-<%% unless <%= rodauth %>.login_form_footer_links.empty? %>
-  <h2>Other Options</h2>
+<% unless rodauth.login_form_footer_links.empty? %>
+  <%== rodauth.login_form_footer_links_heading %>
+
   <ul>
-    <%% <%= rodauth %>.login_form_footer_links.sort.each do |_, link, text| %>
-      <li><%%= link_to text, link %></li>
-    <%% end %>
+    <% rodauth.login_form_footer_links.sort.each do |_, link, text| %>
+      <li><%= link_to text, link %></li>
+    <% end %>
   </ul>
-<%% end %>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/_login_form_header.html.erb

@@ -1,3 +1,3 @@
-<%% if <%= rodauth %>.field_error("password") && <%= rodauth %>.features.include?(:reset_password) %>
-  <%%= render template: "<%= directory %>/reset_password_request", layout: false %>
-<%% end %>
+<% if rodauth.field_error(rodauth.password_param) && rodauth.features.include?(:reset_password) %>
+  <%= render template: "rodauth/reset_password_request", layout: false %>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/add_recovery_codes.html.erb

@@ -1,6 +1,8 @@
-<pre id="recovery-codes"><%%= <%= rodauth %>.recovery_codes.map { |s| h(s) }.join("\n\n") %></pre>
+<% content_for :title, rodauth.add_recovery_codes_page_title %>
 
-<%% if <%= rodauth %>.can_add_recovery_codes? %>
-  <h2>Add Additional Recovery Codes</h2>
-  <%%= render "recovery_codes_form" %>
-<%% end %>
+<pre id="recovery-codes"><%= rodauth.recovery_codes.map { |s| h(s) }.join("\n\n") %></pre>
+
+<% if rodauth.can_add_recovery_codes? %>
+  <%== rodauth.add_recovery_codes_heading %>
+  <%= render template: "rodauth/recovery_codes", layout: false %>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/change_login.html.erb

@@ -1,6 +1,29 @@
-<%%= form_tag <%= rodauth %>.change_login_path, method: :post do %>
-  <%%= render "login_field" %>
-  <%%= render "login_confirm_field" if <%= rodauth %>.require_login_confirmation? %>
-  <%%= render "password_field" if <%= rodauth %>.change_login_requires_password? %>
-  <%%= render "submit", value: "Change Login" %>
-<%% end %>
+<% content_for :title, rodauth.change_login_page_title %>
+
+<%= form_with url: rodauth.change_login_path, method: :post, data: { turbo: false } do |form| %>
+  <div class="form-group mb-3">
+    <%= form.label "login", rodauth.login_label, class: "form-label" %>
+    <%= form.email_field rodauth.login_param, value: params[rodauth.login_param], id: "login", autocomplete: "email", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.login_param)}", aria: ({ invalid: true, describedby: "login_error_message" } if rodauth.field_error(rodauth.login_param)) %>
+    <%= content_tag(:span, rodauth.field_error(rodauth.login_param), class: "invalid-feedback", id: "login_error_message") if rodauth.field_error(rodauth.login_param) %>
+  </div>
+
+  <% if rodauth.require_login_confirmation? %>
+    <div class="form-group mb-3">
+      <%= form.label "login-confirm", rodauth.login_confirm_label, class: "form-label" %>
+      <%= form.email_field rodauth.login_confirm_param, value: params[rodauth.login_confirm_param], id: "login-confirm", autocomplete: "email", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.login_confirm_param)}", aria: ({ invalid: true, describedby: "login-confirm_error_message" } if rodauth.field_error(rodauth.login_confirm_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.login_confirm_param), class: "invalid-feedback", id: "login-confirm_error_message") if rodauth.field_error(rodauth.login_confirm_param) %>
+    </div>
+  <% end %>
+
+  <% if rodauth.change_login_requires_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.change_login_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/change_password.html.erb

@@ -1,6 +1,29 @@
-<%%= form_tag <%= rodauth %>.change_password_path, method: :post do %>
-  <%%= render "password_field" if <%= rodauth %>.change_password_requires_password? %>
-  <%%= render "new_password_field" %>
-  <%%= render "password_confirm_field" if <%= rodauth %>.require_password_confirmation? %>
-  <%%= render "submit", value: "Change Password" %>
-<%% end %>
+<% content_for :title, rodauth.change_password_page_title %>
+
+<%= form_with url: rodauth.change_password_path, method: :post, data: { turbo: false } do |form| %>
+  <% if rodauth.change_password_requires_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.label "new-password", rodauth.new_password_label, class: "form-label" %>
+    <%= form.password_field rodauth.new_password_param, value: "", id: "new-password", autocomplete: "new-password", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.new_password_param)}", aria: ({ invalid: true, describedby: "new-password_error_message" } if rodauth.field_error(rodauth.new_password_param)) %>
+    <%= content_tag(:span, rodauth.field_error(rodauth.new_password_param), class: "invalid-feedback", id: "new-password_error_message") if rodauth.field_error(rodauth.new_password_param) %>
+  </div>
+
+  <% if rodauth.require_password_confirmation? %>
+    <div class="form-group mb-3">
+      <%= form.label "password-confirm", rodauth.password_confirm_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_confirm_param, value: "", id: "password-confirm", autocomplete: "new-password", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_confirm_param)}", aria: ({ invalid: true, describedby: "password-confirm_error_message" } if rodauth.field_error(rodauth.password_confirm_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_confirm_param), class: "invalid-feedback", id: "password-confirm_error_message") if rodauth.field_error(rodauth.password_confirm_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.change_password_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/close_account.html.erb

@@ -1,4 +1,15 @@
-<%%= form_tag <%= rodauth %>.close_account_path, method: :post do %>
-  <%%= render "password_field" if <%= rodauth %>.close_account_requires_password? %>
-  <%%= render "submit", value: "Close Account", class: "btn btn-danger" %>
-<%% end %>
+<% content_for :title, rodauth.close_account_page_title %>
+
+<%= form_with url: rodauth.close_account_path, method: :post, data: { turbo: false } do |form| %>
+  <% if rodauth.close_account_requires_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.close_account_button, class: "btn btn-danger" %>
+  </div>
+<% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/confirm_password.html.erb

@@ -1,4 +1,13 @@
-<%%= form_tag <%= rodauth %>.confirm_password_path, method: :post do %>
-  <%%= render "password_field" %>
-  <%%= render "submit", value: "Confirm Password" %>
-<%% end %>
+<% content_for :title, rodauth.confirm_password_page_title %>
+
+<%= form_with url: rodauth.confirm_password_path, method: :post, data: { turbo: false } do |form| %>
+  <div class="form-group mb-3">
+    <%= form.label "password", rodauth.password_label, class: "form-label" %>
+    <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+    <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+  </div>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.confirm_password_button, class: "btn btn-primary" %>
+  </div>
+<% end %>