rodauth-rails 1.7.1 → 1.9.0

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

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
@@ -60,16 +51,6 @@ module Rodauth
 
         private
 
-        unless ActionPack.version < Gem::Version.new("5.0")
-          # When calling a Rodauth method that redirects inside the Rails
-          # router, Roda's after hook that commits the flash would never get
-          # called, so we make sure to commit the flash beforehand.
-          def redirect(*)
-            rails_request.commit_flash
-            super
-          end
-        end
-
         def instantiate_rails_account
           if defined?(ActiveRecord::Base) && rails_account_model < ActiveRecord::Base
             rails_account_model.instantiate(account.stringify_keys)
@@ -80,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.7.1"
+    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.27"
+  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.7.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-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.27'
+        version: '2.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.27'
+        version: '2.30'
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement
@@ -219,15 +219,14 @@ files:
 - lib/generators/rodauth/migration/sequel/webauthn.erb
 - lib/generators/rodauth/migration_generator.rb
 - lib/generators/rodauth/templates/INSTRUCTIONS
-- lib/generators/rodauth/templates/app/controllers/rodauth_controller.rb
-- lib/generators/rodauth/templates/app/mailers/rodauth_mailer.rb
-- lib/generators/rodauth/templates/app/misc/rodauth_app.rb
-- lib/generators/rodauth/templates/app/misc/rodauth_main.rb
-- lib/generators/rodauth/templates/app/models/account.rb
+- lib/generators/rodauth/templates/app/controllers/rodauth_controller.rb.tt
+- lib/generators/rodauth/templates/app/mailers/rodauth_mailer.rb.tt
+- lib/generators/rodauth/templates/app/misc/rodauth_app.rb.tt
+- lib/generators/rodauth/templates/app/misc/rodauth_main.rb.tt
+- lib/generators/rodauth/templates/app/models/account.rb.tt
 - lib/generators/rodauth/templates/app/views/rodauth/_email_auth_request_form.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/_login_form.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/_login_form_footer.html.erb
-- 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
@@ -307,10 +307,9 @@ files:
 - lib/generators/rodauth/templates/app/views/rodauth_mailer/unlock_account.text.erb
 - lib/generators/rodauth/templates/app/views/rodauth_mailer/verify_account.text.erb
 - lib/generators/rodauth/templates/app/views/rodauth_mailer/verify_login_change.text.erb
-- lib/generators/rodauth/templates/config/initializers/rodauth.rb
-- lib/generators/rodauth/templates/config/initializers/sequel.rb
-- lib/generators/rodauth/templates/db/migrate/create_rodauth.rb
-- lib/generators/rodauth/templates/test/fixtures/accounts.yml
+- lib/generators/rodauth/templates/config/initializers/rodauth.rb.tt
+- lib/generators/rodauth/templates/db/migrate/create_rodauth.rb.tt
+- lib/generators/rodauth/templates/test/fixtures/accounts.yml.tt
 - lib/generators/rodauth/views_generator.rb
 - lib/rodauth-rails.rb
 - lib/rodauth/rails.rb
@@ -352,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
+rubygems_version: 3.4.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 %>

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

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