rodauth-rails 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e268594e5890725cbba25ee24ab158df204ada3789aeebe428b737307128d9e
-  data.tar.gz: dca778863032dc428ac44b5feca48fe430ef55ea64f4e10050293d1c1a3d95c6
+  metadata.gz: 8b5fb22e3d8c84eafedffa3463b4e0ecdf481189b8b48adc2d31005f86251d87
+  data.tar.gz: 142e229b7c9a9b078f773f99885117268e759df2eb49e5252ce21754dcf61763
 SHA512:
-  metadata.gz: 9008b2381959811820eca625f68c5df7ec2021319ceb2c7bdf6c75412f32ea51f01ffabd716da73f6565e263e0a74699c2c940a70296adf0b9c0b8576ef8e3de
-  data.tar.gz: 4b0d70d43ff624b610bcded93a528b089d103f11975b7fdec9c8bd38b1f81b5c003de2fa1e4068f2c2006841f91783044280fa575ec5951b2ae319f4836a49b7
+  metadata.gz: b1c30c5b1714a80466ad3775720be50d2f02b8d06d016638e6d1ebfb7515cd6060463b975f9810977fe74eb7330ce12b9c6ff81839e41b2e4044615c606ca7bb
+  data.tar.gz: 4a532058b27cfc07d2ed234457b880a609c7b35186db976a547be2e83d1c18df7ac72402a9d52155819f2d97edb63b0e7742e908b6cb3ed1b40c2deae18e7e2e

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.4.0 (2022-05-04)
+
+* Move association definitions to `#associations` Rodauth method, allowing external features to extend them (@janko)
+
+* Add Sequel support for generating database migrations, model, and mailer (@janko)
+
+* Skip calling Rodauth app on asset requests when using Sprockets or Propshaft (@janko)
+
 ## 1.3.1 (2022-04-22)
 
 * Ensure response status is logged when calling a halting rodauth method inside a controller (@janko)

data/README.md

@@ -614,6 +614,33 @@ Rodauth::Rails.model(association_options: -> (name) {
 })
 ```
 
+#### Extending Associations
+
+External features can extend the list of associations with their own
+definitions, which the model mixin will pick up and declare the new associations
+on the model.
+
+```rb
+# lib/rodauth/features/foo.rb
+module Rodauth
+  Feature.define(:foo, :Foo) do
+    auth_value_method :foo_table, :account_foos
+    auth_value_method :foo_id_column, :id
+
+    def associations
+      list = super
+      list << {
+        name: :foo, # will define `Account::Foo` model
+        type: :one, # or :many
+        table: foo_table,
+        foreign_key: foo_id_column
+      }
+      list
+    end
+  end
+end
+```
+
 ## Multiple configurations
 
 If you need to handle multiple types of accounts that require different

data/lib/generators/rodauth/install_generator.rb

@@ -1,15 +1,10 @@
 require "rails/generators/base"
-require "rails/generators/active_record/migration"
-require "generators/rodauth/migration_helpers"
 require "securerandom"
 
 module Rodauth
   module Rails
     module Generators
       class InstallGenerator < ::Rails::Generators::Base
-        include ::ActiveRecord::Generators::Migration
-        include MigrationHelpers
-
         if RUBY_ENGINE == "jruby"
           SEQUEL_ADAPTERS = {
             "sqlite3"         => "sqlite",
@@ -40,9 +35,7 @@ module Rodauth
         class_option :jwt, type: :boolean, desc: "Configure JWT support"
 
         def create_rodauth_migration
-          return unless defined?(ActiveRecord::Railtie)
-
-          migration_template "db/migrate/create_rodauth.rb"
+          invoke "rodauth:migration", migration_features, name: "create_rodauth"
         end
 
         def create_rodauth_initializer
@@ -66,8 +59,6 @@ module Rodauth
         end
 
         def create_account_model
-          return unless defined?(ActiveRecord::Railtie)
-
           template "app/models/account.rb"
         end
 
@@ -112,6 +103,14 @@ module Rodauth
           scheme = "jdbc:#{scheme}" if RUBY_ENGINE == "jruby"
           scheme
         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
       end
     end
   end

data/lib/generators/rodauth/migration/{disallow_password_reuse.erb → active_record/disallow_password_reuse.erb}

@@ -1,4 +1,4 @@
-# Used by the disallow_password_reuse feature
+# Used by the disallow password reuse feature
 create_table :account_previous_password_hashes do |t|
   t.references :account, foreign_key: true<%= primary_key_type(:type) %>
   t.string :password_hash, null: false

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

@@ -0,0 +1,7 @@
+# Used by the account expiration feature
+create_table :account_activity_times do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  DateTime :last_activity_at, null: false
+  DateTime :last_login_at, null: false
+  DateTime :expired_at
+end

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

@@ -0,0 +1,8 @@
+# Used by the active sessions feature
+create_table :account_active_session_keys do
+  foreign_key :account_id, :accounts, type: :Bignum
+  String :session_id
+  Time :created_at, null: false, default: Sequel::CURRENT_TIMESTAMP
+  Time :last_use, null: false, default: Sequel::CURRENT_TIMESTAMP
+  primary_key [:account_id, :session_id]
+end

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

@@ -0,0 +1,17 @@
+# Used by the audit logging feature
+create_table :account_authentication_audit_logs do
+  primary_key :id, type: :Bignum
+  foreign_key :account_id, :accounts, null: false, type: :Bignum
+  DateTime :at, null: false, default: Sequel::CURRENT_TIMESTAMP
+  String :message, null: false
+<% case db.database_type -%>
+<% when :postgres -%>
+  jsonb :metadata
+<% when :sqlite, :mysql -%>
+  json :metadata
+<% else -%>
+  String :metadata
+<% end -%>
+  index [:account_id, :at], name: :audit_account_at_idx
+  index :at, name: :audit_at_idx
+end

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

@@ -0,0 +1,25 @@
+<% if db.database_type == :postgres -%>
+enable_extension "citext"
+
+<% end -%>
+create_table :accounts do
+  primary_key :id, type: :Bignum
+<% if db.database_type == :postgres -%>
+  citext :email, null: false
+  constraint :valid_email, email: /^[^,;@ \r\n]+@[^,@; \r\n]+\.[^,@; \r\n]+$/
+<% else -%>
+  String :email, null: false
+<% end -%>
+  String :status, null: false, default: "unverified"
+<% if db.supports_partial_indexes? -%>
+  index :email, unique: true, where: { status: ["unverified", "verified"] }
+<% else -%>
+  index :email, unique: true
+<% end -%>
+end
+
+# Used if storing password hashes in a separate table (default)
+create_table :account_password_hashes do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  String :password_hash, null: false
+end

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

@@ -0,0 +1,6 @@
+# Used by the disallow password reuse feature
+create_table :account_previous_password_hashes do
+  primary_key :id, type: :Bignum
+  foreign_key :account_id, :accounts, type: :Bignum
+  String :password_hash, null: false
+end

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

@@ -0,0 +1,7 @@
+# Used by the email auth feature
+create_table :account_email_auth_keys do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  String :key, null: false
+  DateTime :deadline, null: false
+  DateTime :email_last_sent, null: false, default: Sequel::CURRENT_TIMESTAMP
+end

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

@@ -0,0 +1,8 @@
+# Used by the jwt refresh feature
+create_table :account_jwt_refresh_keys do
+  primary_key :id, type: :Bignum
+  foreign_key :account_id, :accounts, null: false, type: :Bignum
+  String :key, null: false
+  DateTime :deadline, null: false
+  index :account_id, name: :account_jwt_rk_account_id_idx
+end

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

@@ -0,0 +1,11 @@
+# Used by the lockout feature
+create_table :account_login_failures do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  Integer :number, null: false, default: 1
+end
+create_table :account_lockouts do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  String :key, null: false
+  DateTime :deadline, null: false
+  DateTime :email_last_sent
+end

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

@@ -0,0 +1,7 @@
+# Used by the otp feature
+create_table :account_otp_keys do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  String :key, null: false
+  Integer :num_failures, null: false, default: 0
+  Time :last_use, null: false, default: Sequel::CURRENT_TIMESTAMP
+end

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

@@ -0,0 +1,5 @@
+# Used by the password expiration feature
+create_table :account_password_change_times do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  DateTime :changed_at, null: false, default: Sequel::CURRENT_TIMESTAMP
+end

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

@@ -0,0 +1,6 @@
+# Used by the recovery codes feature
+create_table :account_recovery_codes do
+  foreign_key :id, :accounts, type: :Bignum
+  String :code
+  primary_key [:id, :code]
+end

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

@@ -0,0 +1,6 @@
+# Used by the remember me feature
+create_table :account_remember_keys do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  String :key, null: false
+  DateTime :deadline, null: false
+end

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

@@ -0,0 +1,7 @@
+# Used by the password reset feature
+create_table :account_password_reset_keys do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  String :key, null: false
+  DateTime :deadline, null: false
+  DateTime :email_last_sent, null: false, default: Sequel::CURRENT_TIMESTAMP
+end

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

@@ -0,0 +1,5 @@
+# Used by the single session feature
+create_table :account_session_keys do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  String :key, null: false
+end

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

@@ -0,0 +1,8 @@
+# Used by the sms codes feature
+create_table :account_sms_codes do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  String :phone_number, null: false
+  Integer :num_failures
+  String :code
+  DateTime :code_issued_at, null: false, default: Sequel::CURRENT_TIMESTAMP
+end

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

@@ -0,0 +1,7 @@
+# Used by the account verification feature
+create_table :account_verification_keys do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  String :key, null: false
+  DateTime :requested_at, null: false, default: Sequel::CURRENT_TIMESTAMP
+  DateTime :email_last_sent, null: false, default: Sequel::CURRENT_TIMESTAMP
+end

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

@@ -0,0 +1,7 @@
+# Used by the verify login change feature
+create_table :account_login_change_keys do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  String :key, null: false
+  String :login, null: false
+  DateTime :deadline, null: false
+end

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

@@ -0,0 +1,13 @@
+# Used by the webauthn feature
+create_table :account_webauthn_user_ids do
+  foreign_key :id, :accounts, primary_key: true, type: :Bignum
+  String :webauthn_id, null: false
+end
+create_table :account_webauthn_keys do
+  foreign_key :account_id, :accounts, type: :Bignum
+  String :webauthn_id
+  String :public_key, null: false
+  Integer :sign_count, null: false
+  Time :last_use, null: false, default: Sequel::CURRENT_TIMESTAMP
+  primary_key [:account_id, :webauthn_id]
+end

data/lib/generators/rodauth/migration_generator.rb

@@ -1,14 +1,11 @@
 require "rails/generators/base"
 require "rails/generators/active_record/migration"
-require "generators/rodauth/migration_helpers"
+require "erb"
 
 module Rodauth
   module Rails
     module Generators
       class MigrationGenerator < ::Rails::Generators::Base
-        include ::ActiveRecord::Generators::Migration
-        include MigrationHelpers
-
         source_root "#{__dir__}/templates"
         namespace "rodauth:migration"
 
@@ -20,19 +17,102 @@ module Rodauth
           desc: "Name of the generated migration file"
 
         def create_rodauth_migration
-          return unless defined?(ActiveRecord::Railtie)
           return if features.empty?
 
-          migration_template "db/migrate/create_rodauth.rb", "#{migration_name}.rb"
+          migration_template "db/migrate/create_rodauth.rb", File.join(db_migrate_path, "#{migration_name}.rb")
         end
 
-        def migration_features
-          features
-        end
+        private
 
         def migration_name
           options[:name] || "create_rodauth_#{features.join("_")}"
         end
+
+        def migration_content
+          features
+            .select { |feature| File.exist?(migration_chunk(feature)) }
+            .map { |feature| File.read(migration_chunk(feature)) }
+            .map { |content| erb_eval(content) }
+            .join("\n")
+            .indent(4)
+        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
+
+        if defined?(::ActiveRecord::Railtie) # Active Record
+          include ::ActiveRecord::Generators::Migration
+
+          def db_migrate_path
+            return "db/migrate" unless ActiveRecord.version >= Gem::Version.new("5.0")
+
+            super
+          end
+
+          def migration_chunk(feature)
+            "#{__dir__}/migration/active_record/#{feature}.erb"
+          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
+            else
+              ActiveRecord::Base.connection_config.fetch(:adapter)
+            end
+          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 current_timestamp
+            if ActiveRecord.version >= Gem::Version.new("5.0")
+              %(-> { "CURRENT_TIMESTAMP" })
+            else
+              %(OpenStruct.new(quoted_id: "CURRENT_TIMESTAMP"))
+            end
+          end
+        else # Sequel
+          include ::Rails::Generators::Migration
+
+          def self.next_migration_number(dirname)
+            next_migration_number = current_migration_number(dirname) + 1
+            [Time.now.utc.strftime('%Y%m%d%H%M%S'), format('%.14d', next_migration_number)].max
+          end
+
+          def db_migrate_path
+            "db/migrate"
+          end
+
+          def migration_chunk(feature)
+            "#{__dir__}/migration/sequel/#{feature}.erb"
+          end
+
+          def db
+            db = ::Sequel::DATABASES.first if defined?(::Sequel)
+            db or fail Rodauth::Rails::Error, "missing Sequel database connection"
+          end
+        end
       end
     end
   end

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/feature/associations.rb

@@ -0,0 +1,54 @@
+module Rodauth
+  module Rails
+    module Feature
+      module Associations
+        def associations
+          list = []
+
+          features.each do |feature|
+            case feature
+            when :remember
+              list << { name: :remember_key, type: :one, table: remember_table, foreign_key: remember_id_column }
+            when :verify_account
+              list << { name: :verification_key, type: :one, table: verify_account_table, foreign_key: verify_account_id_column }
+            when :reset_password
+              list << { name: :password_reset_key, type: :one, table: reset_password_table, foreign_key: reset_password_id_column }
+            when :verify_login_change
+              list << { name: :login_change_key, type: :one, table: verify_login_change_table, foreign_key: verify_login_change_id_column }
+            when :lockout
+              list << { name: :lockout, type: :one, table: account_lockouts_table, foreign_key: account_lockouts_id_column }
+              list << { name: :login_failure, type: :one, table: account_login_failures_table, foreign_key: account_login_failures_id_column }
+            when :email_auth
+              list << { name: :email_auth_key, type: :one, table: email_auth_table, foreign_key: email_auth_id_column }
+            when :account_expiration
+              list << { name: :activity_time, type: :one, table: account_activity_table, foreign_key: account_activity_id_column }
+            when :active_sessions
+              list << { name: :active_session_keys, type: :many, table: active_sessions_table, foreign_key: active_sessions_account_id_column }
+            when :audit_logging
+              list << { name: :authentication_audit_logs, type: :many, table: audit_logging_table, foreign_key: audit_logging_account_id_column }
+            when :disallow_password_reuse
+              list << { name: :previous_password_hashes, type: :many, table: previous_password_hash_table, foreign_key: previous_password_account_id_column }
+            when :jwt_refresh
+              list << { name: :jwt_refresh_keys, type: :many, table: jwt_refresh_token_table, foreign_key: jwt_refresh_token_account_id_column }
+            when :password_expiration
+              list << { name: :password_change_time, type: :one, table: password_expiration_table, foreign_key: password_expiration_id_column }
+            when :single_session
+              list << { name: :session_key, type: :one, table: single_session_table, foreign_key: single_session_id_column }
+            when :otp
+              list << { name: :otp_key, type: :one, table: otp_keys_table, foreign_key: otp_keys_id_column }
+            when :sms_codes
+              list << { name: :sms_code, type: :one, table: sms_codes_table, foreign_key: sms_id_column }
+            when :recovery_codes
+              list << { name: :recovery_codes, type: :many, table: recovery_codes_table, foreign_key: recovery_codes_id_column }
+            when :webauthn
+              list << { name: :webauthn_user_id, type: :one, table: webauthn_user_ids_table, foreign_key: webauthn_user_ids_account_id_column }
+              list << { name: :webauthn_keys, type: :many, table: webauthn_keys_table, foreign_key: webauthn_keys_account_id_column }
+            end
+          end
+
+          list
+        end
+      end
+    end
+  end
+end

data/lib/rodauth/rails/feature.rb

@@ -11,6 +11,7 @@ module Rodauth
     require "rodauth/rails/feature/email"
     require "rodauth/rails/feature/instrumentation"
     require "rodauth/rails/feature/internal_request"
+    require "rodauth/rails/feature/associations"
 
     include Rodauth::Rails::Feature::Base
     include Rodauth::Rails::Feature::Callbacks
@@ -19,5 +20,6 @@ module Rodauth
     include Rodauth::Rails::Feature::Email
     include Rodauth::Rails::Feature::Instrumentation
     include Rodauth::Rails::Feature::InternalRequest
+    include Rodauth::Rails::Feature::Associations
   end
 end

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,7 +1,7 @@
 module Rodauth
   module Rails
     class Model < Module
-      require "rodauth/rails/model/associations"
+      ASSOCIATION_TYPES = { one: :has_one, many: :has_many }
 
       def initialize(auth_class, association_options: {})
         @auth_class = auth_class
@@ -46,8 +46,8 @@ module Rodauth
       def define_associations(model)
         define_password_hash_association(model) unless rodauth.account_password_hash_column
 
-        feature_associations.each do |association|
-          define_association(model, **association)
+        rodauth.associations.each do |association|
+          define_association(model, **association, type: ASSOCIATION_TYPES.fetch(association[:type]))
         end
       end
 
@@ -74,19 +74,19 @@ module Rodauth
 
         model.const_set(name.to_s.singularize.camelize, associated_model)
 
+        unless name == :authentication_audit_logs
+          dependent = type == :has_many ? :delete_all : :delete
+        end
+
         model.public_send type, name, scope,
           class_name: associated_model.name,
           foreign_key: foreign_key,
-          dependent: type == :has_many ? :delete_all : :delete,
+          dependent: dependent,
           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)

data/lib/rodauth/rails/version.rb

@@ -1,5 +1,5 @@
 module Rodauth
   module Rails
-    VERSION = "1.3.1"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -167,26 +167,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
@@ -247,6 +264,7 @@ files:
 - lib/rodauth/rails/auth.rb
 - lib/rodauth/rails/controller_methods.rb
 - lib/rodauth/rails/feature.rb
+- lib/rodauth/rails/feature/associations.rb
 - lib/rodauth/rails/feature/base.rb
 - lib/rodauth/rails/feature/callbacks.rb
 - lib/rodauth/rails/feature/csrf.rb
@@ -256,7 +274,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/model/associations.rb

@@ -1,195 +0,0 @@
-module Rodauth
-  module Rails
-    class Model
-      class Associations
-        attr_reader :rodauth
-
-        def self.call(rodauth)
-          new(rodauth).call
-        end
-
-        def initialize(rodauth)
-          @rodauth = rodauth
-        end
-
-        def call
-          rodauth.features
-            .select { |feature| respond_to?(feature, true) }
-            .flat_map { |feature| send(feature) }
-        end
-
-        private
-
-        def remember
-          {
-            name: :remember_key,
-            type: :has_one,
-            table: rodauth.remember_table,
-            foreign_key: rodauth.remember_id_column,
-          }
-        end
-
-        def verify_account
-          {
-            name: :verification_key,
-            type: :has_one,
-            table: rodauth.verify_account_table,
-            foreign_key: rodauth.verify_account_id_column,
-          }
-        end
-
-        def reset_password
-          {
-            name: :password_reset_key,
-            type: :has_one,
-            table: rodauth.reset_password_table,
-            foreign_key: rodauth.reset_password_id_column,
-          }
-        end
-
-        def verify_login_change
-          {
-            name: :login_change_key,
-            type: :has_one,
-            table: rodauth.verify_login_change_table,
-            foreign_key: rodauth.verify_login_change_id_column,
-          }
-        end
-
-        def lockout
-          [
-            {
-              name: :lockout,
-              type: :has_one,
-              table: rodauth.account_lockouts_table,
-              foreign_key: rodauth.account_lockouts_id_column,
-            },
-            {
-              name: :login_failure,
-              type: :has_one,
-              table: rodauth.account_login_failures_table,
-              foreign_key: rodauth.account_login_failures_id_column,
-            }
-          ]
-        end
-
-        def email_auth
-          {
-            name: :email_auth_key,
-            type: :has_one,
-            table: rodauth.email_auth_table,
-            foreign_key: rodauth.email_auth_id_column,
-          }
-        end
-
-        def account_expiration
-          {
-            name: :activity_time,
-            type: :has_one,
-            table: rodauth.account_activity_table,
-            foreign_key: rodauth.account_activity_id_column,
-          }
-        end
-
-        def active_sessions
-          {
-            name: :active_session_keys,
-            type: :has_many,
-            table: rodauth.active_sessions_table,
-            foreign_key: rodauth.active_sessions_account_id_column,
-          }
-        end
-
-        def audit_logging
-          {
-            name: :authentication_audit_logs,
-            type: :has_many,
-            table: rodauth.audit_logging_table,
-            foreign_key: rodauth.audit_logging_account_id_column,
-            dependent: nil,
-          }
-        end
-
-        def disallow_password_reuse
-          {
-            name: :previous_password_hashes,
-            type: :has_many,
-            table: rodauth.previous_password_hash_table,
-            foreign_key: rodauth.previous_password_account_id_column,
-          }
-        end
-
-        def jwt_refresh
-          {
-            name: :jwt_refresh_keys,
-            type: :has_many,
-            table: rodauth.jwt_refresh_token_table,
-            foreign_key: rodauth.jwt_refresh_token_account_id_column,
-          }
-        end
-
-        def password_expiration
-          {
-            name: :password_change_time,
-            type: :has_one,
-            table: rodauth.password_expiration_table,
-            foreign_key: rodauth.password_expiration_id_column,
-          }
-        end
-
-        def single_session
-          {
-            name: :session_key,
-            type: :has_one,
-            table: rodauth.single_session_table,
-            foreign_key: rodauth.single_session_id_column,
-          }
-        end
-
-        def otp
-          {
-            name: :otp_key,
-            type: :has_one,
-            table: rodauth.otp_keys_table,
-            foreign_key: rodauth.otp_keys_id_column,
-          }
-        end
-
-        def sms_codes
-          {
-            name: :sms_code,
-            type: :has_one,
-            table: rodauth.sms_codes_table,
-            foreign_key: rodauth.sms_id_column,
-          }
-        end
-
-        def recovery_codes
-          {
-            name: :recovery_codes,
-            type: :has_many,
-            table: rodauth.recovery_codes_table,
-            foreign_key: rodauth.recovery_codes_id_column,
-          }
-        end
-
-        def webauthn
-          [
-            {
-              name: :webauthn_user_id,
-              type: :has_one,
-              table: rodauth.webauthn_user_ids_table,
-              foreign_key: rodauth.webauthn_user_ids_account_id_column,
-            },
-            {
-              name: :webauthn_keys,
-              type: :has_many,
-              table: rodauth.webauthn_keys_table,
-              foreign_key: rodauth.webauthn_keys_account_id_column,
-            }
-          ]
-        end
-      end
-    end
-  end
-end