rodauth-rails 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00d7ab9dd749cbae17cddc2788005d8570d8d46f89f427ad624c7e61fe177665
-  data.tar.gz: d62aed32823b0be9c74d7281de80650b8faf600c01db22ad941a35f30bfeb002
+  metadata.gz: 9805b35cefee7e30cc6f7190e2ace9e7ea75c20f40651eb364edafea2f2382f7
+  data.tar.gz: 503b821866aaf2b6aa108265ed8015869a8c8a6a73e910aa3c38b35c5a542ac1
 SHA512:
-  metadata.gz: 7ab0afe5e95fab1af706b64ef5c494252fac49481d49dad1c2ef3510c17ca96050c58bf0832a36af761673137f2fd63d7d49a692656bcf06748840de96f60875
-  data.tar.gz: 729bf3b5887647c23f4b11d821d3829c4b4d290c546d2f19ba6b393dd47bf0b357d128577e877ac3e0a4352972b79325d4217d62935d4a683e78ff8e910d13a2
+  metadata.gz: 5a3e69b6d62f20ee5bc5a13c89acd2974401830a4f0f8917cc7716c9a5ccaad021a20c0f3269a211336b648bd8eb65ae60094c90a039fa1d3968eaf322ec2e47
+  data.tar.gz: 567cf154e656f7062029e207d92149fa8cf2c87404d1ba72fef6327cb31f928d0bcf453a4a0d55f71740251cb74f8b6829b8c775373daec4fe638690cd702104

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.6.1 (2020-11-25)
+
+* Generate the Rodauth controller for API-only Rails apps as well (@janko)
+
+* Fix remember cookie deadline not extending in remember feature (@janko)
+
 ## 0.6.0 (2020-11-22)
 
 * Add `Rodauth::Rails.rodauth` method for retrieving Rodauth instance outside of request context (@janko)

data/README.md

@@ -381,7 +381,7 @@ end
 
 You can then uncomment the lines in your Rodauth configuration to have it call
 your mailer. If you've enabled additional authentication features that send
-emails, make sure to override their `send_*_email` methods as well.
+emails, make sure to override their `create_*_email` methods as well.
 
 ```rb
 # app/lib/rodauth_app.rb
@@ -389,37 +389,38 @@ class RodauthApp < Rodauth::Rails::App
   # ...
   configure do
     # ...
-    send_reset_password_email do
-      mailer_send(:reset_password, email_to, reset_password_email_link)
+    create_reset_password_email do
+      RodauthMailer.reset_password(email_to, reset_password_email_link)
     end
-    send_verify_account_email do
-      mailer_send(:verify_account, email_to, verify_account_email_link)
+    create_verify_account_email do
+      RodauthMailer.verify_account(email_to, verify_account_email_link)
     end
-    send_verify_login_change_email do |login|
-      mailer_send(:verify_login_change, login, verify_login_change_old_login, verify_login_change_new_login, verify_login_change_email_link)
+    create_verify_login_change_email do |login|
+      RodauthMailer.verify_login_change(login, verify_login_change_old_login, verify_login_change_new_login, verify_login_change_email_link)
     end
-    send_password_changed_email do
-      mailer_send(:password_changed, email_to)
+    create_password_changed_email do
+      RodauthMailer.password_changed(email_to)
     end
-    # send_email_auth_email do
-    #   mailer_send(:email_auth, email_to, email_auth_email_link)
+    # create_email_auth_email do
+    #   RodauthMailer.email_auth(email_to, email_auth_email_link)
     # end
-    # send_unlock_account_email do
-    #   mailer_send(:unlock_account, email_to, unlock_account_email_link)
+    # create_unlock_account_email do
+    #   RodauthMailer.unlock_account(email_to, unlock_account_email_link)
     # end
-    auth_class_eval do
+    send_email do |email|
       # queue email delivery on the mailer after the transaction commits
-      def mailer_send(type, *args)
-        db.after_commit do
-          RodauthMailer.public_send(type, *args).deliver_later
-        end
-      end
+      db.after_commit { email.deliver_later }
     end
     # ...
   end
 end
 ```
 
+This approach can be used even if you're using a 3rd-party service for
+transactional emails, where emails are sent via API requests instead of
+SMTP. Whatever the `create_*_email` block returns will be passed to
+`send_email`, so you can be creative.
+
 ### Migrations
 
 The install generator will create a migration for tables used by the Rodauth

data/lib/generators/rodauth/install_generator.rb

@@ -35,8 +35,6 @@ module Rodauth
         end
 
         def create_rodauth_controller
-          return if api_only?
-
           template "app/controllers/rodauth_controller.rb"
         end
 

data/lib/generators/rodauth/templates/app/controllers/rodauth_controller.rb

@@ -1,3 +1,4 @@
 class RodauthController < ApplicationController
-  # used by Rodauth for rendering views and CSRF protection
+  # used by Rodauth for rendering views, CSRF protection, and running any
+  # registered action callbacks and rescue_from handlers
 end

data/lib/generators/rodauth/templates/app/lib/rodauth_app.rb

@@ -15,11 +15,9 @@ class RodauthApp < Rodauth::Rails::App
     # Defaults to Rails `secret_key_base`, but you can use your own secret key.
     # hmac_secret "<%= SecureRandom.hex(64) %>"
 
-<% unless api_only? -%>
     # Specify the controller used for view rendering and CSRF verification.
     rails_controller { RodauthController }
 
-<% end -%>
     # Store account status in a text column.
     account_status_column :status
     account_unverified_status_value "unverified"
@@ -59,31 +57,27 @@ class RodauthApp < Rodauth::Rails::App
 
     # ==> Emails
     # Uncomment the lines below once you've imported mailer views.
-    # send_reset_password_email do
-    #   mailer_send(:reset_password, email_to, reset_password_email_link)
+    # create_reset_password_email do
+    #   RodauthMailer.reset_password(email_to, reset_password_email_link)
     # end
-    # send_verify_account_email do
-    #   mailer_send(:verify_account, email_to, verify_account_email_link)
+    # create_verify_account_email do
+    #   RodauthMailer.verify_account(email_to, verify_account_email_link)
     # end
-    # send_verify_login_change_email do |login|
-    #   mailer_send(:verify_login_change, login, verify_login_change_old_login, verify_login_change_new_login, verify_login_change_email_link)
+    # create_verify_login_change_email do |login|
+    #   RodauthMailer.verify_login_change(login, verify_login_change_old_login, verify_login_change_new_login, verify_login_change_email_link)
     # end
-    # send_password_changed_email do
-    #   mailer_send(:password_changed, email_to)
+    # create_password_changed_email do
+    #   RodauthMailer.password_changed(email_to)
     # end
-    # # send_email_auth_email do
-    # #   mailer_send(:email_auth, email_to, email_auth_email_link)
+    # # create_email_auth_email do
+    # #   RodauthMailer.email_auth(email_to, email_auth_email_link)
     # # end
-    # # send_unlock_account_email do
-    # #   mailer_send(:unlock_account, email_to, unlock_account_email_link)
+    # # create_unlock_account_email do
+    # #   RodauthMailer.unlock_account(email_to, unlock_account_email_link)
     # # end
-    # auth_class_eval do
+    # send_email do |email|
     #   # queue email delivery on the mailer after the transaction commits
-    #   def mailer_send(type, *args)
-    #     db.after_commit do
-    #       RodauthMailer.public_send(type, *args).deliver_later
-    #     end
-    #   end
+    #   db.after_commit { email.deliver_later }
     # end
 
     # In the meantime you can tweak settings for emails created by Rodauth

data/lib/rodauth/rails/app.rb

@@ -4,13 +4,15 @@ module Rodauth
   module Rails
     # The superclass for creating a Rodauth middleware.
     class App < Roda
-      plugin :middleware
+      require "rodauth/rails/app/middleware"
+      plugin Middleware
+
       plugin :hooks
       plugin :render, layout: false
 
       def self.configure(name = nil, **options, &block)
         unless options[:json] == :only
-          require "rodauth/rails/flash"
+          require "rodauth/rails/app/flash"
           plugin Flash
         end
 

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

@@ -0,0 +1,50 @@
+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.before { request.flash }        # load flash
+          app.after  { request.commit_flash } # save 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
+            rails_request.flash
+          end
+
+          def commit_flash
+            if ActionPack.version >= Gem::Version.new("5.0")
+              rails_request.commit_flash
+            else
+              # ActionPack 4.2 automatically commits flash
+            end
+          end
+
+          private
+
+          def rails_request
+            ActionDispatch::Request.new(env)
+          end
+        end
+      end
+    end
+  end
+end

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

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

data/lib/rodauth/rails/feature.rb

@@ -145,23 +145,34 @@ module Rodauth
 
     # Instances of the configured controller with current request's env hash.
     def _rails_controller_instance
-      request  = ActionDispatch::Request.new(scope.env)
-      instance = rails_controller.new
+      controller    = rails_controller.new
+      rails_request = ActionDispatch::Request.new(scope.env)
 
-      if ActionPack.version >= Gem::Version.new("5.0")
-        instance.set_request! request
-        instance.set_response! rails_controller.make_response!(request)
-      else
-        instance.send(:set_response!, request)
-        instance.instance_variable_set(:@_request, request)
-      end
+      prepare_rails_controller(controller, rails_request)
 
-      instance
+      controller
     end
 
-    # Controller class to use for rendering and CSRF protection.
-    def rails_controller
-      ActionController::Base
+    if ActionPack.version >= Gem::Version.new("5.0")
+      # Controller class to use for view rendering, CSRF protection, and
+      # running any registered action callbacks and rescue_from handlers.
+      def rails_controller
+        only_json? ? ActionController::API : ActionController::Base
+      end
+
+      def prepare_rails_controller(controller, rails_request)
+        controller.set_request! rails_request
+        controller.set_response! rails_controller.make_response!(rails_request)
+      end
+    else
+      def rails_controller
+        ActionController::Base
+      end
+
+      def prepare_rails_controller(controller, rails_request)
+        controller.send(:set_response!, rails_request)
+        controller.instance_variable_set(:@_request, rails_request)
+      end
     end
 
     # ActionMailer subclass for correct email delivering.

data/lib/rodauth/rails/version.rb

@@ -1,5 +1,5 @@
 module Rodauth
   module Rails
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -190,9 +190,10 @@ files:
 - lib/rodauth/features/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/controller_methods.rb
 - lib/rodauth/rails/feature.rb
-- lib/rodauth/rails/flash.rb
 - lib/rodauth/rails/middleware.rb
 - lib/rodauth/rails/railtie.rb
 - lib/rodauth/rails/tasks.rake

data/lib/rodauth/rails/flash.rb

@@ -1,48 +0,0 @@
-module Rodauth
-  module Rails
-    # Roda plugin that sets up Rails flash integration.
-    module Flash
-      def self.load_dependencies(app)
-        app.plugin :hooks
-      end
-
-      def self.configure(app)
-        app.before { request.flash }        # load flash
-        app.after  { request.commit_flash } # save 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
-          rails_request.flash
-        end
-
-        def commit_flash
-          if ActionPack.version >= Gem::Version.new("5.0")
-            rails_request.commit_flash
-          else
-            # ActionPack 4.2 automatically commits flash
-          end
-        end
-
-        private
-
-        def rails_request
-          ActionDispatch::Request.new(env)
-        end
-      end
-    end
-  end
-end