rodauth-rails 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df597e01d85bea28254330ac00e288d569fe709744e11ade3ada370784034b6a
-  data.tar.gz: 2934d9ea6177fa55e383cfbcbfdca6b4b27a36a1afdb7c9971e918fbca76e604
+  metadata.gz: 8f73ab003a11054b2534802c0de9224c867b7a173d8d553888918fa792ee3da4
+  data.tar.gz: 07136b1748df5970d5d263d5d9439596c3c2e083ccd88269ab7145a8cd73fefc
 SHA512:
-  metadata.gz: bf30eabb2fb372e96caf39ceb0e01696dcc45003db00703fd4eaa127bba8378a0e76c4194b0f2161851df82a066f0147ed72cedea25429657a287734f76d4e49
-  data.tar.gz: 40f773856e54971d573995e7f6c11b9a67c42c881ce95e458739fc5a12151a954233b3e80339beff622b82e79bc5485fc6497f7dd90c09cfd42ed2ca1abe3912
+  metadata.gz: bc8c1a0ef2cd7d9c49f9fed9dd6423e92ec4112ddaa65b5a8fa63134f35d5fa9b5f2f1679c4d4d7f4d9f3cd5a71acf840d4d59ce2731b52d82914c200744eb03
+  data.tar.gz: 41f707560dd3ce232f54c80bc83f2210d4667d715c5f25aab812382a54f4115cab03d3e8e23d1c8c8b1e5e572404c91b332b040b741648c2577499779c0bf6a1

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 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)

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
 
@@ -349,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
@@ -855,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
@@ -1227,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

@@ -111,7 +111,7 @@ module Rodauth
         end
 
         def api_only?
-          Rodauth::Rails.api_only?
+          ::Rails.application.config.api_only
         end
 
         def sequel_adapter

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

@@ -2,6 +2,6 @@
 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,12 +1,12 @@
 # Used by the audit logging feature
 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.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

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

@@ -4,5 +4,5 @@ create_table :<%= table_prefix %>_email_auth_keys, id: false do |t|
   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/otp.erb

@@ -4,5 +4,5 @@ create_table :<%= table_prefix %>_otp_keys, id: false do |t|
   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

@@ -2,5 +2,5 @@
 create_table :<%= table_prefix %>_password_change_times, id: false do |t|
   t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.foreign_key :<%= table_prefix.pluralize %>, column: :id
-  t.datetime :changed_at, null: false, default: <%= current_timestamp %>
+  t.datetime :changed_at, null: false, default: -> { "<%= current_timestamp %>" }
 end

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

@@ -4,5 +4,5 @@ create_table :<%= table_prefix %>_password_reset_keys, id: false do |t|
   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/sms_codes.erb

@@ -5,5 +5,5 @@ create_table :<%= table_prefix %>_sms_codes, id: false do |t|
   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

@@ -3,6 +3,6 @@ create_table :<%= table_prefix %>_verification_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 :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/webauthn.erb

@@ -9,5 +9,5 @@ create_table :<%= table_prefix %>_webauthn_keys, primary_key: [:<%= table_prefix
   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_generator.rb

@@ -111,18 +111,6 @@ module Rodauth
 
           MIGRATION_DIR = "#{__dir__}/migration/active_record"
 
-          def db_migrate_path
-            return "db/migrate" unless ActiveRecord.version >= Gem::Version.new("5.0")
-
-            super
-          end
-
-          def migration_version
-            return unless ActiveRecord.version >= Gem::Version.new("5.0")
-
-            "[#{ActiveRecord::Migration.current_version}]"
-          end
-
           def activerecord_adapter
             if ActiveRecord::Base.respond_to?(:connection_db_config)
               ActiveRecord::Base.connection_db_config.adapter
@@ -150,18 +138,10 @@ module Rodauth
             end
           end
 
-          def current_timestamp
-            if ActiveRecord.version >= Gem::Version.new("5.0")
-              %(-> { "#{current_timestamp_literal}" })
-            else
-              %(OpenStruct.new(quoted_id: "#{current_timestamp_literal}"))
-            end
-          end
-
           # Active Record 7+ sets default precision to 6 for timestamp columns,
           # so we need to ensure we match this when setting the default value.
-          def current_timestamp_literal
-            if ActiveRecord.version >= Gem::Version.new("7.0") && activerecord_adapter == "mysql2" && ActiveRecord::Base.connection.supports_datetime_with_precision?
+          def current_timestamp
+            if ActiveRecord.version >= Gem::Version.new("7.0") && ["mysql2", "trilogy"].include?(activerecord_adapter) && ActiveRecord::Base.connection.supports_datetime_with_precision?
               "CURRENT_TIMESTAMP(6)"
             else
               "CURRENT_TIMESTAMP"

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

@@ -5,14 +5,14 @@ class RodauthMailer < ApplicationMailer
     @rodauth = rodauth(name, account_id) { @verify_account_key_value = key }
     @account = @rodauth.rails_account
 
-    mail subject: @rodauth.verify_account_email_subject
+    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.reset_password_email_subject
+    mail subject: @rodauth.email_subject_prefix + @rodauth.reset_password_email_subject
   end
 
   def verify_login_change(name, account_id, key)
@@ -20,35 +20,35 @@ class RodauthMailer < ApplicationMailer
     @account = @rodauth.rails_account
     @new_email = @account.login_change_key.login
 
-    mail to: @new_email, subject: @rodauth.verify_login_change_email_subject
+    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.password_changed_email_subject
+    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.reset_password_notify_email_subject
+  #   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_auth_email_subject
+  #   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.unlock_account_email_subject
+  #   mail subject: @rodauth.email_subject_prefix + @rodauth.unlock_account_email_subject
   # end
 
   private

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

@@ -85,7 +85,7 @@ class RodauthMain < Rodauth::Rails::Auth
     verify_account_set_password? false
 
     # Change some default param keys.
-    # login_param "email"
+    login_param "email"
     # password_confirm_param "confirm_password"
 
     # Redirect back to originally requested location after authentication.

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

@@ -7,7 +7,7 @@
   <% 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)) %>
+      <%= form.email_field rodauth.login_param, value: params[rodauth.login_param], id: "login", autocomplete: rodauth.login_field_autocomplete_value, 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 %>

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

@@ -1,3 +1,3 @@
-<%= render "login_form_header" %>
+<%== rodauth.login_form_header %>
 <%= render "login_form" %>
-<%= render "login_form_footer" %>
+<%== rodauth.login_form_footer %>

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

@@ -1,3 +1,3 @@
-<%= render "login_form_header" %>
+<%== rodauth.login_form_header %>
 <%== rodauth.render_multi_phase_login_forms %>
-<%= render "login_form_footer" %>
+<%== rodauth.login_form_footer %>

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

@@ -7,7 +7,7 @@
   <% else %>
     <div class="mb-6">
       <%= form.label "login", rodauth.login_label, class: "block text-sm font-semibold" %>
-      <%= form.email_field rodauth.login_param, value: params[rodauth.login_param], id: "login", autocomplete: "email", required: true, class: "mt-2 text-sm w-full px-3 py-2 border rounded-md dark:bg-gray-900 dark:text-gray-100 dark:focus:bg-gray-800 #{rodauth.field_error(rodauth.login_param) ? "border-red-600 focus:ring-red-600 focus:border-red-600 dark:border-red-400 dark:focus:ring-red-400" : "border-gray-300 dark:border-gray-700 dark:focus:border-emerald-400 dark:focus:ring-emerald-400" }", aria: ({ invalid: true, describedby: "login_error_message" } if rodauth.field_error(rodauth.login_param)) %>
+      <%= form.email_field rodauth.login_param, value: params[rodauth.login_param], id: "login", autocomplete: rodauth.login_field_autocomplete_value, required: true, class: "mt-2 text-sm w-full px-3 py-2 border rounded-md dark:bg-gray-900 dark:text-gray-100 dark:focus:bg-gray-800 #{rodauth.field_error(rodauth.login_param) ? "border-red-600 focus:ring-red-600 focus:border-red-600 dark:border-red-400 dark:focus:ring-red-400" : "border-gray-300 dark:border-gray-700 dark:focus:border-emerald-400 dark:focus:ring-emerald-400" }", aria: ({ invalid: true, describedby: "login_error_message" } if rodauth.field_error(rodauth.login_param)) %>
       <%= content_tag(:span, rodauth.field_error(rodauth.login_param), class: "block mt-1 text-red-600 text-xs dark:text-red-400", id: "login_error_message") if rodauth.field_error(rodauth.login_param) %>
     </div>
   <% end %>

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

@@ -1,5 +1,5 @@
 <div class="flex-1 space-y-4">
-  <%= render "login_form_header" %>
+  <%== rodauth.login_form_header %>
   <%= render "login_form" %>
-  <%= render "login_form_footer" %>
+  <%== rodauth.login_form_footer %>
 </div>

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

@@ -1,5 +1,5 @@
 <div class="flex-1 space-y-4">
-  <%= render "login_form_header" %>
+  <%== rodauth.login_form_header %>
   <%== rodauth.render_multi_phase_login_forms %>
-  <%= render "login_form_footer" %>
+  <%== rodauth.login_form_footer %>
 </div>

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

@@ -0,0 +1,10 @@
+<% cred = rodauth.webauthn_credential_options_for_get %>
+
+<%= form_with url: rodauth.webauthn_login_path, method: :post, id: "webauthn-login-form", data: { credential_options: cred.as_json.to_json, turbo: false } do |form| %>
+  <%= form.hidden_field rodauth.webauthn_auth_challenge_param, value: cred.challenge %>
+  <%= form.hidden_field rodauth.webauthn_auth_challenge_hmac_param, value: rodauth.compute_hmac(cred.challenge) %>
+  <%= form.text_field rodauth.webauthn_auth_param, value: "", id: "webauthn-auth", class: "hidden", aria: { hidden: "true" } %>
+  <%= form.submit rodauth.webauthn_auth_button, class: "hidden" %>
+<% end %>
+
+<%= javascript_include_tag rodauth.webauthn_autofill_js_path, extname: false %>

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

@@ -0,0 +1,10 @@
+<% cred = rodauth.webauthn_credential_options_for_get %>
+
+<%= form_with url: rodauth.webauthn_login_path, method: :post, id: "webauthn-login-form", data: { credential_options: cred.as_json.to_json, turbo: false } do |form| %>
+  <%= form.hidden_field rodauth.webauthn_auth_challenge_param, value: cred.challenge %>
+  <%= form.hidden_field rodauth.webauthn_auth_challenge_hmac_param, value: rodauth.compute_hmac(cred.challenge) %>
+  <%= form.text_field rodauth.webauthn_auth_param, value: "", id: "webauthn-auth", class: "d-none", aria: { hidden: "true" } %>
+  <%= form.submit rodauth.webauthn_auth_button, class: "d-none" %>
+<% end %>
+
+<%= javascript_include_tag rodauth.webauthn_autofill_js_path, extname: false %>

data/lib/generators/rodauth/templates/app/views/rodauth_mailer/unlock_account.text.erb

@@ -1,4 +1,4 @@
-Someone has requested a that the account with this email be unlocked.
+Someone has requested that the account with this email be unlocked.
 If you did not request the unlocking of this account, please ignore this
 message.  If you requested the unlocking of this account, please go to
 <%= @rodauth.unlock_account_email_link %>

data/lib/generators/rodauth/templates/db/migrate/create_rodauth.rb.tt

@@ -1,5 +1,5 @@
 <% if defined?(::ActiveRecord::Railtie) -%>
-class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def change
 <%= migration_content -%>
   end

data/lib/generators/rodauth/views_generator.rb

@@ -23,7 +23,7 @@ module Rodauth
           default: nil
 
         VIEWS = {
-          login:               %w[_login_form _login_form_footer _login_form_header login multi_phase_login],
+          login:               %w[_login_form _login_form_footer login multi_phase_login],
           create_account:      %w[create_account],
           logout:              %w[logout],
           reset_password:      %w[reset_password_request reset_password],
@@ -40,13 +40,7 @@ module Rodauth
           sms_codes:           %w[sms_setup sms_confirm sms_auth sms_request sms_disable],
           recovery_codes:      %w[recovery_codes add_recovery_codes recovery_auth],
           webauthn:            %w[webauthn_setup webauthn_auth webauthn_remove],
-        }
-
-        DEPENDENCIES = {
-          otp:            :two_factor_base,
-          sms_codes:      :two_factor_base,
-          recovery_codes: :two_factor_base,
-          webauthn:       :two_factor_base,
+          webauthn_autofill:   %w[webauthn_autofill],
         }
 
         def create_views
@@ -65,10 +59,7 @@ module Rodauth
         private
 
         def views
-          features.inject([]) do |list, feature|
-            list |= VIEWS.fetch(feature)
-            list |= VIEWS[DEPENDENCIES[feature]] || []
-          end
+          features.flat_map { |feature| VIEWS.fetch(feature) }
         end
 
         def validate_features

data/lib/rodauth/rails/app.rb

@@ -43,7 +43,7 @@ module Rodauth
 
       after do
         rails_request.commit_flash
-      end unless ActionPack.version < Gem::Version.new("5.0")
+      end
 
       def flash
         rails_request.flash
@@ -92,14 +92,12 @@ module Rodauth
           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
+        # 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

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

@@ -13,16 +13,7 @@ module Rodauth
         end
 
         def rails_account
-          return unless account || logged_in?
-
-          account_from_session unless account
-
-          unless account
-            clear_session
-            return
-          end
-
-          @rails_account ||= instantiate_rails_account
+          @rails_account ||= instantiate_rails_account if account!
         end
 
         # Reset Rails session to protect from session fixation attacks.
@@ -41,7 +32,7 @@ module Rodauth
         end
 
         def rails_controller
-          if only_json? && Rodauth::Rails.api_only?
+          if only_json? && ::Rails.application.config.api_only
             ActionController::API
           else
             ActionController::Base
@@ -70,28 +61,13 @@ module Rodauth
           end
         end
 
-        # Instances of the configured controller with current request's env hash.
+        # Instance of the configured controller with current request's env hash.
         def _rails_controller_instance
           controller = rails_controller.new
-          prepare_rails_controller(controller, rails_request)
+          controller.set_request! rails_request
+          controller.set_response! rails_controller.make_response!(controller.request)
           controller
         end
-
-        if ActionPack.version >= Gem::Version.new("5.0")
-          def prepare_rails_controller(controller, rails_request)
-            controller.set_request! rails_request
-            controller.set_response! rails_controller.make_response!(rails_request)
-          end
-        else
-          def prepare_rails_controller(controller, rails_request)
-            controller.send(:set_response!, rails_request)
-            controller.instance_variable_set(:@_request, rails_request)
-          end
-        end
-
-        def rails_api_controller?
-          defined?(ActionController::API) && rails_controller <= ActionController::API
-        end
       end
     end
   end

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

@@ -32,7 +32,7 @@ module Rodauth
 
         # Calls the Rails renderer, returning nil if a template is missing.
         def rails_render(*args)
-          return if rails_api_controller?
+          return if rails_controller <= ActionController::API
 
           rails_controller_instance.render_to_string(*args)
         rescue ActionView::MissingTemplate

data/lib/rodauth/rails/railtie.rb

@@ -23,12 +23,8 @@ module Rodauth
         # Rodauth uses RACK_ENV to set the default bcrypt hash cost
         ENV["RACK_ENV"] = "test" if ::Rails.env.test?
 
-        if ActionPack.version >= Gem::Version.new("5.0")
-          ActiveSupport.on_load(:action_controller_test_case) do
-            include Rodauth::Rails::Test::Controller
-          end
-        else
-          ActionController::TestCase.include Rodauth::Rails::Test::Controller
+        ActiveSupport.on_load(:action_controller_test_case) do
+          include Rodauth::Rails::Test::Controller
         end
       end
 

data/lib/rodauth/rails/version.rb

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

data/lib/rodauth/rails.rb

@@ -66,16 +66,6 @@ module Rodauth
         end
       end
 
-      if ::Rails.gem_version >= Gem::Version.new("5.0")
-        def api_only?
-          ::Rails.application.config.api_only
-        end
-      else
-        def api_only?
-          false
-        end
-      end
-
       def configure
         yield self
       end

data/rodauth-rails.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |spec|
   spec.files         = Dir["README.md", "LICENSE.txt", "CHANGELOG.md", "lib/**/*", "*.gemspec"]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "railties", ">= 4.2", "< 8"
-  spec.add_dependency "rodauth", "~> 2.28"
+  spec.add_dependency "railties", ">= 5.0", "< 8"
+  spec.add_dependency "rodauth", "~> 2.30"
   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.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-25 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.28'
+        version: '2.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.28'
+        version: '2.30'
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +227,6 @@ files:
 - 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
-- lib/generators/rodauth/templates/app/views/rodauth/_login_form_header.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/add_recovery_codes.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/change_login.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/change_password.html.erb
@@ -254,7 +253,6 @@ files:
 - lib/generators/rodauth/templates/app/views/rodauth/tailwind/_email_auth_request_form.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/tailwind/_login_form.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/tailwind/_login_form_footer.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/tailwind/_login_form_header.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/tailwind/add_recovery_codes.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/tailwind/change_login.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/tailwind/change_password.html.erb
@@ -287,6 +285,7 @@ files:
 - lib/generators/rodauth/templates/app/views/rodauth/tailwind/verify_account_resend.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/tailwind/verify_login_change.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/tailwind/webauthn_auth.html.erb
+- lib/generators/rodauth/templates/app/views/rodauth/tailwind/webauthn_autofill.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/tailwind/webauthn_remove.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/tailwind/webauthn_setup.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/two_factor_auth.html.erb
@@ -298,6 +297,7 @@ files:
 - lib/generators/rodauth/templates/app/views/rodauth/verify_account_resend.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/verify_login_change.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/webauthn_auth.html.erb
+- lib/generators/rodauth/templates/app/views/rodauth/webauthn_autofill.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/webauthn_remove.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/webauthn_setup.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth_mailer/email_auth.text.erb
@@ -351,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Provides Rails integration for Rodauth.

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

@@ -1,3 +0,0 @@
-<% 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/tailwind/_login_form_header.html.erb

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