diff --git a/CHANGELOG.md b/CHANGELOG.md index d6a6410..670e41a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## 1.3.0 + +### Changed + +- The default `from` of the parent mailer won't be overridden if the `default_from_address` option is set to `nil` (#198) + +### Added + +- Added `paranoid` option to display the email sent notice even when the resource is not found (#196) +- Added `parent_controller` option to set the `SessionsController` parent class (#199) +- Added `only_path` param to `SystemTestCase#passwordless_sign_in` and `SystemTestCase#passwordless_sign_out` (#197) + + ## 1.2.0 ### Added diff --git a/app/controllers/passwordless/sessions_controller.rb b/app/controllers/passwordless/sessions_controller.rb index 8838aab..63a71bc 100644 --- a/app/controllers/passwordless/sessions_controller.rb +++ b/app/controllers/passwordless/sessions_controller.rb @@ -179,7 +179,7 @@ def normalized_email_param def handle_resource_not_found if Passwordless.config.paranoid @resource = authenticatable_class.new(email: normalized_email_param) - @disable_after_session_save_callback = true + @skip_after_session_save_callback = true else raise( ActiveRecord::RecordNotFound, @@ -189,7 +189,7 @@ def handle_resource_not_found end def call_after_session_save - return if @disable_after_session_save_callback + return if @skip_after_session_save_callback if Passwordless.config.after_session_save.arity == 2 Passwordless.config.after_session_save.call(@session, request)