rodauth-rails 1.3.0 → 1.4.1

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

@@ -1,14 +1,22 @@
 class RodauthMailer < ApplicationMailer
   def verify_account(account_id, key)
     @email_link = rodauth.verify_account_url(key: email_token(account_id, key))
+<% if defined?(ActiveRecord::Railtie) -%>
     @account = Account.find(account_id)
+<% else -%>
+    @account = Account.with_pk!(account_id)
+<% end -%>
 
     mail to: @account.email, subject: rodauth.verify_account_email_subject
   end
 
   def reset_password(account_id, key)
     @email_link = rodauth.reset_password_url(key: email_token(account_id, key))
+<% if defined?(ActiveRecord::Railtie) -%>
     @account = Account.find(account_id)
+<% else -%>
+    @account = Account.with_pk!(account_id)
+<% end -%>
 
     mail to: @account.email, subject: rodauth.reset_password_email_subject
   end
@@ -17,27 +25,43 @@ class RodauthMailer < ApplicationMailer
     @old_login  = old_login
     @new_login  = new_login
     @email_link = rodauth.verify_login_change_url(key: email_token(account_id, key))
+<% if defined?(ActiveRecord::Railtie) -%>
     @account = Account.find(account_id)
+<% else -%>
+    @account = Account.with_pk!(account_id)
+<% end -%>
 
     mail to: new_login, subject: rodauth.verify_login_change_email_subject
   end
 
   def password_changed(account_id)
+<% if defined?(ActiveRecord::Railtie) -%>
     @account = Account.find(account_id)
+<% else -%>
+    @account = Account.with_pk!(account_id)
+<% end -%>
 
     mail to: @account.email, subject: rodauth.password_changed_email_subject
   end
 
   # def email_auth(account_id, key)
   #   @email_link = rodauth.email_auth_url(key: email_token(account_id, key))
+<% if defined?(ActiveRecord::Railtie) -%>
   #   @account = Account.find(account_id)
+<% else -%>
+  #   @account = Account.with_pk!(account_id)
+<% end -%>
 
   #   mail to: @account.email, subject: rodauth.email_auth_email_subject
   # end
 
   # def unlock_account(account_id, key)
   #   @email_link = rodauth.unlock_account_url(key: email_token(account_id, key))
+<% if defined?(ActiveRecord::Railtie) -%>
   #   @account = Account.find(account_id)
+<% else -%>
+  #   @account = Account.with_pk!(account_id)
+<% end -%>
 
   #   mail to: @account.email, subject: rodauth.unlock_account_email_subject
   # end

data/lib/generators/rodauth/templates/app/models/account.rb

@@ -1,3 +1,4 @@
+<% if defined?(ActiveRecord::Railtie) -%>
 class Account < ApplicationRecord
   include Rodauth::Rails.model
 <% if ActiveRecord.version >= Gem::Version.new("7.0") -%>
@@ -6,3 +7,9 @@ class Account < ApplicationRecord
   enum status: { unverified: 1, verified: 2, closed: 3 }
 <% end -%>
 end
+<% else -%>
+class Account < Sequel::Model
+  plugin :enum
+  enum :status, unverified: 1, verified: 2, closed: 3
+end
+<% end -%>

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

@@ -1,5 +1,13 @@
+<% if defined?(::ActiveRecord::Railtie) -%>
 class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   def change
 <%= migration_content -%>
   end
 end
+<% else -%>
+Sequel.migration do
+  change do
+<%= migration_content -%>
+  end
+end
+<% end -%>

data/lib/rodauth/rails/app.rb

@@ -5,17 +5,21 @@ module Rodauth
   module Rails
     # The superclass for creating a Rodauth middleware.
     class App < Roda
-      require "rodauth/rails/app/middleware"
-      plugin Middleware
+      plugin :middleware, forward_response_headers: true do |middleware|
+        middleware.class_eval do
+          def self.inspect
+            "#{superclass}::Middleware"
+          end
+
+          def inspect
+            "#<#{self.class.inspect} request=#{request.inspect} response=#{response.inspect}>"
+          end
+        end
+      end
 
       plugin :hooks
       plugin :render, layout: false
 
-      unless Rodauth::Rails.api_only?
-        require "rodauth/rails/app/flash"
-        plugin Flash
-      end
-
       def self.configure(*args, **options, &block)
         auth_class = args.shift if args[0].is_a?(Class)
         name       = args.shift if args[0].is_a?(Symbol)
@@ -35,6 +39,14 @@ module Rodauth
         end
       end
 
+      after do
+        rails_request.commit_flash
+      end unless ActionPack.version < Gem::Version.new("5.0")
+
+      def flash
+        rails_request.flash
+      end
+
       def rails_routes
         ::Rails.application.routes.url_helpers
       end

data/lib/rodauth/rails/controller_methods.rb

@@ -18,6 +18,15 @@ module Rodauth
 
       private
 
+      # Adds response status to instrumentation payload for logging,
+      # when calling a halting rodauth method inside a controller.
+      def append_info_to_payload(payload)
+        super
+        if request.env["rodauth.rails.status"]
+          payload[:status] = request.env.delete("rodauth.rails.status")
+        end
+      end
+
       def rodauth_response
         res = catch(:halt) { return yield }
 

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

@@ -54,6 +54,16 @@ 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)

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

@@ -10,6 +10,14 @@ module Rodauth
 
         def redirect(*)
           rails_instrument_redirection { super }
+        ensure
+          request.env["rodauth.rails.status"] = response.status
+        end
+
+        def return_response(*)
+          super
+        ensure
+          request.env["rodauth.rails.status"] = response.status
         end
 
         def rails_render(*)

data/lib/rodauth/rails/middleware.rb

@@ -9,6 +9,8 @@ module Rodauth
       end
 
       def call(env)
+        return @app.call(env) if asset_request?(env)
+
         app = Rodauth::Rails.app.new(@app)
 
         # allow the Rails app to call Rodauth methods that throw :halt
@@ -16,6 +18,13 @@ module Rodauth
           app.call(env)
         end
       end
+
+      # Check whether it's a request to an asset managed by Sprockets or Propshaft.
+      def asset_request?(env)
+        return false unless ::Rails.application.config.respond_to?(:assets)
+
+        env["PATH_INFO"] =~ %r(\A/{0,2}#{::Rails.application.config.assets.prefix})
+      end
     end
   end
 end

data/lib/rodauth/rails/model.rb

@@ -1,101 +1,6 @@
 module Rodauth
   module Rails
-    class Model < Module
-      require "rodauth/rails/model/associations"
-
-      def initialize(auth_class, association_options: {})
-        @auth_class = auth_class
-        @association_options = association_options
-
-        define_methods
-      end
-
-      def included(model)
-        fail Rodauth::Rails::Error, "must be an Active Record model" unless model < ActiveRecord::Base
-
-        define_associations(model)
-      end
-
-      private
-
-      def define_methods
-        rodauth = @auth_class.allocate.freeze
-
-        attr_reader :password
-
-        define_method(:password=) do |password|
-          @password = password
-          password_hash = rodauth.send(:password_hash, password) if password
-          set_password_hash(password_hash)
-        end
-
-        define_method(:set_password_hash) do |password_hash|
-          if rodauth.account_password_hash_column
-            public_send(:"#{rodauth.account_password_hash_column}=", password_hash)
-          else
-            if password_hash
-              record = self.password_hash || build_password_hash
-              record.public_send(:"#{rodauth.password_hash_column}=", password_hash)
-            else
-              self.password_hash&.mark_for_destruction
-            end
-          end
-        end
-      end
-
-      def define_associations(model)
-        define_password_hash_association(model) unless rodauth.account_password_hash_column
-
-        feature_associations.each do |association|
-          define_association(model, **association)
-        end
-      end
-
-      def define_password_hash_association(model)
-        password_hash_id_column = rodauth.password_hash_id_column
-        scope = -> { select(password_hash_id_column) } if rodauth.send(:use_database_authentication_functions?)
-
-        define_association model,
-          type: :has_one,
-          name: :password_hash,
-          table: rodauth.password_hash_table,
-          foreign_key: password_hash_id_column,
-          scope: scope,
-          autosave: true
-      end
-
-      def define_association(model, type:, name:, table:, foreign_key:, scope: nil, **options)
-        associated_model = Class.new(model.superclass)
-        associated_model.table_name = table
-        associated_model.belongs_to :account,
-          class_name: model.name,
-          foreign_key: foreign_key,
-          inverse_of: name
-
-        model.const_set(name.to_s.singularize.camelize, associated_model)
-
-        model.public_send type, name, scope,
-          class_name: associated_model.name,
-          foreign_key: foreign_key,
-          dependent: type == :has_many ? :delete_all : :delete,
-          inverse_of: :account,
-          **options,
-          **association_options(name)
-      end
-
-      def feature_associations
-        Rodauth::Rails::Model::Associations.call(rodauth)
-      end
-
-      def association_options(name)
-        options = @association_options
-        options = options.call(name) if options.respond_to?(:call)
-        options || {}
-      end
-
-      def rodauth
-        @auth_class.allocate
-      end
-    end
+    Model = Rodauth::Model
+    deprecate_constant :Model
   end
 end

data/lib/rodauth/rails/version.rb

@@ -1,5 +1,5 @@
 module Rodauth
   module Rails
-    VERSION = "1.3.0"
+    VERSION = "1.4.1"
   end
 end

data/lib/rodauth/rails.rb

@@ -1,5 +1,6 @@
 require "rodauth/rails/version"
 require "rodauth/rails/railtie"
+require "rodauth/model"
 
 module Rodauth
   module Rails
@@ -43,7 +44,7 @@ module Rodauth
       end
 
       def model(name = nil, **options)
-        Rodauth::Rails::Model.new(app.rodauth!(name), **options)
+        Rodauth::Model.new(app.rodauth!(name), **options)
       end
 
       # routing constraint that requires authentication

data/rodauth-rails.gemspec

@@ -17,8 +17,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "railties", ">= 4.2", "< 8"
-  spec.add_dependency "rodauth", "~> 2.19"
+  spec.add_dependency "rodauth", "~> 2.23"
+  spec.add_dependency "roda", "~> 3.55"
   spec.add_dependency "sequel-activerecord_connection", "~> 1.1"
+  spec.add_dependency "rodauth-model", "~> 0.1"
   spec.add_dependency "tilt"
   spec.add_dependency "bcrypt"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -36,14 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.19'
+        version: '2.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.19'
+        version: '2.23'
+- !ruby/object:Gem::Dependency
+  name: roda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.55'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.55'
 - !ruby/object:Gem::Dependency
   name: sequel-activerecord_connection
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rodauth-model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -153,26 +181,43 @@ files:
 - LICENSE.txt
 - README.md
 - lib/generators/rodauth/install_generator.rb
-- lib/generators/rodauth/migration/account_expiration.erb
-- lib/generators/rodauth/migration/active_sessions.erb
-- lib/generators/rodauth/migration/audit_logging.erb
-- lib/generators/rodauth/migration/base.erb
-- lib/generators/rodauth/migration/disallow_password_reuse.erb
-- lib/generators/rodauth/migration/email_auth.erb
-- lib/generators/rodauth/migration/jwt_refresh.erb
-- lib/generators/rodauth/migration/lockout.erb
-- lib/generators/rodauth/migration/otp.erb
-- lib/generators/rodauth/migration/password_expiration.erb
-- lib/generators/rodauth/migration/recovery_codes.erb
-- lib/generators/rodauth/migration/remember.erb
-- lib/generators/rodauth/migration/reset_password.erb
-- lib/generators/rodauth/migration/single_session.erb
-- lib/generators/rodauth/migration/sms_codes.erb
-- lib/generators/rodauth/migration/verify_account.erb
-- lib/generators/rodauth/migration/verify_login_change.erb
-- lib/generators/rodauth/migration/webauthn.erb
+- lib/generators/rodauth/migration/active_record/account_expiration.erb
+- lib/generators/rodauth/migration/active_record/active_sessions.erb
+- lib/generators/rodauth/migration/active_record/audit_logging.erb
+- lib/generators/rodauth/migration/active_record/base.erb
+- lib/generators/rodauth/migration/active_record/disallow_password_reuse.erb
+- lib/generators/rodauth/migration/active_record/email_auth.erb
+- lib/generators/rodauth/migration/active_record/jwt_refresh.erb
+- lib/generators/rodauth/migration/active_record/lockout.erb
+- lib/generators/rodauth/migration/active_record/otp.erb
+- lib/generators/rodauth/migration/active_record/password_expiration.erb
+- lib/generators/rodauth/migration/active_record/recovery_codes.erb
+- lib/generators/rodauth/migration/active_record/remember.erb
+- lib/generators/rodauth/migration/active_record/reset_password.erb
+- lib/generators/rodauth/migration/active_record/single_session.erb
+- lib/generators/rodauth/migration/active_record/sms_codes.erb
+- lib/generators/rodauth/migration/active_record/verify_account.erb
+- lib/generators/rodauth/migration/active_record/verify_login_change.erb
+- lib/generators/rodauth/migration/active_record/webauthn.erb
+- lib/generators/rodauth/migration/sequel/account_expiration.erb
+- lib/generators/rodauth/migration/sequel/active_sessions.erb
+- lib/generators/rodauth/migration/sequel/audit_logging.erb
+- lib/generators/rodauth/migration/sequel/base.erb
+- lib/generators/rodauth/migration/sequel/disallow_password_reuse.erb
+- lib/generators/rodauth/migration/sequel/email_auth.erb
+- lib/generators/rodauth/migration/sequel/jwt_refresh.erb
+- lib/generators/rodauth/migration/sequel/lockout.erb
+- lib/generators/rodauth/migration/sequel/otp.erb
+- lib/generators/rodauth/migration/sequel/password_expiration.erb
+- lib/generators/rodauth/migration/sequel/recovery_codes.erb
+- lib/generators/rodauth/migration/sequel/remember.erb
+- lib/generators/rodauth/migration/sequel/reset_password.erb
+- lib/generators/rodauth/migration/sequel/single_session.erb
+- lib/generators/rodauth/migration/sequel/sms_codes.erb
+- lib/generators/rodauth/migration/sequel/verify_account.erb
+- lib/generators/rodauth/migration/sequel/verify_login_change.erb
+- lib/generators/rodauth/migration/sequel/webauthn.erb
 - lib/generators/rodauth/migration_generator.rb
-- lib/generators/rodauth/migration_helpers.rb
 - lib/generators/rodauth/templates/INSTRUCTIONS
 - lib/generators/rodauth/templates/app/controllers/rodauth_controller.rb
 - lib/generators/rodauth/templates/app/mailers/rodauth_mailer.rb
@@ -230,8 +275,6 @@ files:
 - lib/rodauth-rails.rb
 - lib/rodauth/rails.rb
 - lib/rodauth/rails/app.rb
-- lib/rodauth/rails/app/flash.rb
-- lib/rodauth/rails/app/middleware.rb
 - lib/rodauth/rails/auth.rb
 - lib/rodauth/rails/controller_methods.rb
 - lib/rodauth/rails/feature.rb
@@ -244,7 +287,6 @@ files:
 - lib/rodauth/rails/feature/render.rb
 - lib/rodauth/rails/middleware.rb
 - lib/rodauth/rails/model.rb
-- lib/rodauth/rails/model/associations.rb
 - lib/rodauth/rails/railtie.rb
 - lib/rodauth/rails/tasks.rake
 - lib/rodauth/rails/test.rb

data/lib/generators/rodauth/migration_helpers.rb

@@ -1,77 +0,0 @@
-require "erb"
-
-module Rodauth
-  module Rails
-    module Generators
-      module MigrationHelpers
-        attr_reader :migration_class_name
-
-        def migration_template(source, destination = File.basename(source))
-          @migration_class_name = destination.chomp(".rb").camelize
-
-          super source, File.join(db_migrate_path, destination)
-        end
-
-        private
-
-        def migration_content
-          migration_features
-            .select { |feature| File.exist?("#{__dir__}/migration/#{feature}.erb") }
-            .map { |feature| File.read("#{__dir__}/migration/#{feature}.erb") }
-            .map { |content| erb_eval(content) }
-            .join("\n")
-            .indent(4)
-        end
-
-        def activerecord_adapter
-          if ActiveRecord::Base.respond_to?(:connection_db_config)
-            ActiveRecord::Base.connection_db_config.adapter
-          else
-            ActiveRecord::Base.connection_config.fetch(:adapter)
-          end
-        end
-
-        def migration_version
-          return unless ActiveRecord.version >= Gem::Version.new("5.0")
-
-          "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
-        end
-
-        def db_migrate_path
-          return "db/migrate" unless ActiveRecord.version >= Gem::Version.new("5.0")
-
-          super
-        end
-
-        def primary_key_type(key = :id)
-          generators  = ::Rails.application.config.generators
-          column_type = generators.options[:active_record][:primary_key_type]
-
-          return unless column_type
-
-          if key
-            ", #{key}: :#{column_type}"
-          else
-            column_type
-          end
-        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 current_timestamp
-          if ActiveRecord.version >= Gem::Version.new("5.0")
-            %(-> { "CURRENT_TIMESTAMP" })
-          else
-            %(OpenStruct.new(quoted_id: "CURRENT_TIMESTAMP"))
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rodauth/rails/app/flash.rb

@@ -1,45 +0,0 @@
-module Rodauth
-  module Rails
-    class App
-      # Roda plugin that sets up Rails flash integration.
-      module Flash
-        def self.load_dependencies(app)
-          app.plugin :hooks
-        end
-
-        def self.configure(app)
-          app.after { request.commit_flash }
-        end
-
-        module InstanceMethods
-          def flash
-            request.flash
-          end
-        end
-
-        module RequestMethods
-          # If the redirect would bubble up outside of the Roda app, the after
-          # hook would never get called, so we make sure to commit the flash.
-          def redirect(*)
-            commit_flash
-            super
-          end
-
-          def flash
-            scope.rails_request.flash
-          end
-
-          if ActionPack.version >= Gem::Version.new("5.0")
-            def commit_flash
-              scope.rails_request.commit_flash
-            end
-          else
-            def commit_flash
-              # ActionPack 4.2 automatically commits flash
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rodauth/rails/app/middleware.rb

@@ -1,36 +0,0 @@
-module Rodauth
-  module Rails
-    class App
-      # Roda plugin that extends middleware plugin by propagating response headers.
-      module Middleware
-        def self.configure(app)
-          handle_result = -> (env, res) do
-            if headers = env.delete("rodauth.rails.headers")
-              res[1] = headers.merge(res[1])
-            end
-          end
-
-          app.plugin :middleware, handle_result: handle_result do |middleware|
-            middleware.plugin :hooks
-
-            middleware.after do
-              if response.empty? && response.headers.any?
-                env["rodauth.rails.headers"] = response.headers
-              end
-            end
-
-            middleware.class_eval do
-              def self.inspect
-                "#{superclass}::Middleware"
-              end
-
-              def inspect
-                "#<#{self.class.inspect} request=#{request.inspect} response=#{response.inspect}>"
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end