rodauth-rails 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1f519c5d15eb6c70585c8cfa625106dec267b4e7f666daeeb9499ef61c656e7
-  data.tar.gz: 1bc84d1dba6ab9ab884a56f47419e207655c90f1d71d32b009575ab169fc0b3d
+  metadata.gz: 4e268594e5890725cbba25ee24ab158df204ada3789aeebe428b737307128d9e
+  data.tar.gz: dca778863032dc428ac44b5feca48fe430ef55ea64f4e10050293d1c1a3d95c6
 SHA512:
-  metadata.gz: 88ccdb974fe6b6dd0e797cf5307656c80d7038c820eab897b277b6c22bd1bc61cc00e7e39295d2a98fc313530ad658c6be80e043dde595d3514c3a51fa0572a4
-  data.tar.gz: d17fc8142a16f18ff485446d94e68ed4672faa64edfa8aaac3b400e9060f9638575a577ff232b83a1360a58e8655199c1ab88972f77a3af0f45d76f3514b7df5
+  metadata.gz: 9008b2381959811820eca625f68c5df7ec2021319ceb2c7bdf6c75412f32ea51f01ffabd716da73f6565e263e0a74699c2c940a70296adf0b9c0b8576ef8e3de
+  data.tar.gz: 4b0d70d43ff624b610bcded93a528b089d103f11975b7fdec9c8bd38b1f81b5c003de2fa1e4068f2c2006841f91783044280fa575ec5951b2ae319f4836a49b7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.1 (2022-04-22)
+
+* Ensure response status is logged when calling a halting rodauth method inside a controller (@janko)
+
 ## 1.3.0 (2022-04-01)
 
 * Store password hash on the `accounts` table in generated Rodauth migration and configuration (@janko)

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/version.rb

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

data/rodauth-rails.gemspec

@@ -17,7 +17,8 @@ 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 "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.3.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-04-22 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
@@ -230,8 +244,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

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