passwordless 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dc17e0a0f2696a647ba5f5dffaededf6494a48f4cd3393135e041c91b3955f0
-  data.tar.gz: b27244139169a60b25c1251321aa6576d7fbbe7e9e122cb5886041f7a60a4886
+  metadata.gz: 472a9d736665b6a1e1a71bf5175214f3acc414e0c918a33825c98a1d7ac02624
+  data.tar.gz: 9e12898751e19fc7104c62826eaf7c9ee4e17a14a12efc66419eab4850dae720
 SHA512:
-  metadata.gz: 66be83e8a5b1f8cd06d83196d94ce42e9fe25dbbd49a650ca553c8874ac47503758c782b10831187d7005666fbe73e1468fea82a9c6cdad21dae8abe85cfca22
-  data.tar.gz: 266ec15bbc186604c4ab0eda90171499052fa22e11d8eeb0c8f96196fe3363ee45c42d183d76a16dc90670308a1ae9a7bc84bfbb321a8c01fca815ae7e24b6cf
+  metadata.gz: 58b5bac3c0260d68a86fc7d9c3258457405a3670e0f8333959aa1ee54774ab68774728522d2e40c5d3b67a430f3b952af8903bb5d29b4ee12b6a291e3415fd17
+  data.tar.gz: 42252595f95f48896cd08ec1be77a28657553ae287cc52213bed5cc343c38121bf12c8aba1db8ea002237ea8b5c1d706a8fc8f10dc7b9522c72c80218e4d35a5

data/app/controllers/passwordless/sessions_controller.rb

@@ -119,8 +119,15 @@ module Passwordless
       nil
     end
 
-    def passwordless_success_redirect_path
-      success_redirect_path = call_or_return(Passwordless.config.success_redirect_path)
+    def passwordless_success_redirect_path(authenticatable)
+      success_redirect_path = Passwordless.config.success_redirect_path
+
+      if success_redirect_path.respond_to?(:call)
+        success_redirect_path = call_or_return(
+          success_redirect_path,
+          *[authenticatable].first(success_redirect_path.arity)
+        )
+      end
 
       if Passwordless.config.redirect_back_after_sign_in
         session_redirect_url = reset_passwordless_redirect_location!(authenticatable_class)
@@ -142,7 +149,11 @@ module Passwordless
     def authenticate_and_sign_in(session, token)
       if session.authenticate(token)
         sign_in(session)
-        redirect_to(passwordless_success_redirect_path, status: :see_other, **redirect_to_options)
+        redirect_to(
+          passwordless_success_redirect_path(session.authenticatable),
+          status: :see_other,
+          **redirect_to_options
+        )
       else
         flash[:error] = I18n.t("passwordless.sessions.errors.invalid_token")
         render(status: :forbidden, action: "show")
@@ -168,8 +179,12 @@ module Passwordless
       authenticatable_type.constantize
     end
 
-    def call_or_return(value)
-      value.respond_to?(:call) ? value.call : value
+    def call_or_return(value, *args)
+      if value.respond_to?(:call)
+        instance_exec(*args, &value)
+      else
+        value
+      end
     end
 
     def find_authenticatable

data/app/mailers/passwordless/mailer.rb

@@ -10,7 +10,7 @@ module Passwordless
     # @param session [Session] An instance of Passwordless::Session
     # @param token [String] The token in plaintext. Falls back to `session.token` hoping it
     # is still in memory (optional)
-    def sign_in(session, token = nil)
+    def sign_in(session, token = nil, url_options = {})
       @token = token || session.token
 
       @magic_link = Passwordless.context.url_for(
@@ -18,6 +18,7 @@ module Passwordless
         action: "confirm",
         id: session.to_param,
         token: @token,
+        **url_options,
         **default_url_options
       )
 

data/lib/passwordless/test_helpers.rb

@@ -75,6 +75,10 @@ if defined?(ActionDispatch::SystemTestCase)
   ActionDispatch::SystemTestCase.send(:include, ::Passwordless::TestHelpers::SystemTestCase)
 end
 
+if defined?(ActionDispatch::IntegrationTest)
+  ActionDispatch::IntegrationTest.send(:include, ::Passwordless::TestHelpers::RequestTestCase)
+end
+
 if defined?(RSpec)
   RSpec.configure do |config|
     config.include(::Passwordless::TestHelpers::ControllerTestCase, type: :controller)

data/lib/passwordless/version.rb

@@ -2,5 +2,5 @@
 
 module Passwordless
   # :nodoc:
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passwordless
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-26 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Add authentication to your app without all the ickyness of passwords.