rodauth-rails 0.11.0 → 0.15.0

data/lib/rodauth/rails/model/associations.rb

@@ -0,0 +1,195 @@
+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

data/lib/rodauth/rails/railtie.rb

@@ -1,6 +1,5 @@
 require "rodauth/rails/middleware"
 require "rodauth/rails/controller_methods"
-require "rodauth/rails/log_subscriber"
 
 require "rails"
 
@@ -17,10 +16,6 @@ module Rodauth
         end
       end
 
-      initializer "rodauth.log_subscriber" do
-        Rodauth::Rails::LogSubscriber.attach_to :rodauth
-      end
-
       initializer "rodauth.test" do
         # Rodauth uses RACK_ENV to set the default bcrypt hash cost
         ENV["RACK_ENV"] = "test" if ::Rails.env.test?

data/lib/rodauth/rails/tasks.rake

@@ -4,15 +4,15 @@ namespace :rodauth do
 
     puts "Routes handled by #{app}:"
 
-    app.opts[:rodauths].each_key do |rodauth_name|
-      rodauth = Rodauth::Rails.rodauth(rodauth_name)
+    app.opts[:rodauths].each do |configuration_name, auth_class|
+      auth_class.configure { enable :path_class_methods }
 
-      routes = rodauth.class.routes.map do |handle_method|
+      routes = auth_class.routes.map do |handle_method|
         path_method = "#{handle_method.to_s.sub(/\Ahandle_/, "")}_path"
 
         [
-          rodauth.public_send(path_method),
-          "rodauth#{rodauth_name && "(:#{rodauth_name})"}.#{path_method}",
+          auth_class.public_send(path_method),
+          "rodauth#{configuration_name && "(:#{configuration_name})"}.#{path_method}",
         ]
       end
 

data/lib/rodauth/rails/version.rb

@@ -1,5 +1,5 @@
 module Rodauth
   module Rails
-    VERSION = "0.11.0"
+    VERSION = "0.15.0"
   end
 end

data/rodauth-rails.gemspec

@@ -17,10 +17,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "railties", ">= 4.2", "< 7"
-  spec.add_dependency "rodauth", "~> 2.11"
+  spec.add_dependency "rodauth", "~> 2.15"
   spec.add_dependency "sequel-activerecord_connection", "~> 1.1"
   spec.add_dependency "tilt"
   spec.add_dependency "bcrypt"
 
   spec.add_development_dependency "jwt"
+  spec.add_development_dependency "rotp"
+  spec.add_development_dependency "rqrcode"
+  spec.add_development_dependency "webauthn" unless RUBY_ENGINE == "jruby"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-rails
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.15'
 - !ruby/object:Gem::Dependency
   name: sequel-activerecord_connection
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rotp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rqrcode
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webauthn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides Rails integration for Rodauth.
 email:
 - janko.marohnic@gmail.com
@@ -207,8 +249,16 @@ files:
 - lib/rodauth/rails/auth.rb
 - lib/rodauth/rails/controller_methods.rb
 - lib/rodauth/rails/feature.rb
-- lib/rodauth/rails/log_subscriber.rb
+- lib/rodauth/rails/feature/base.rb
+- lib/rodauth/rails/feature/callbacks.rb
+- lib/rodauth/rails/feature/csrf.rb
+- lib/rodauth/rails/feature/email.rb
+- lib/rodauth/rails/feature/instrumentation.rb
+- lib/rodauth/rails/feature/internal_request.rb
+- 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/version.rb
@@ -232,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Provides Rails integration for Rodauth.

data/lib/rodauth/rails/log_subscriber.rb

@@ -1,34 +0,0 @@
-module Rodauth
-  module Rails
-    class LogSubscriber < ActiveSupport::LogSubscriber
-      def start_processing(event)
-        rodauth = event.payload[:rodauth]
-        app_class = rodauth.scope.class.superclass
-        format = rodauth.rails_request.format.ref
-        format = format.to_s.upcase if format.is_a?(Symbol)
-        format = "*/*" if format.nil?
-
-        info "Processing by #{app_class} as #{format}"
-      end
-
-      def process_request(event)
-        status = event.payload[:status]
-
-        additions = ActionController::Base.log_process_action(event.payload)
-        if ::Rails.gem_version >= Gem::Version.new("6.0")
-          additions << "Allocations: #{event.allocations}"
-        end
-
-        message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in #{event.duration.round}ms"
-        message << " (#{additions.join(" | ")})"
-        message << "\n\n" if defined?(::Rails.env) && ::Rails.env.development?
-
-        info message
-      end
-
-      def logger
-        ::Rails.logger
-      end
-    end
-  end
-end