passwordless 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2242a4b95f1a99d5be1b889539dc6dd9f1eda711ce616f3b090f12dd68337254
-  data.tar.gz: afd9ea1fd2d3b3f15f10a4772d231c53adfd524e22de00d833a9183b34d69397
+  metadata.gz: 472a9d736665b6a1e1a71bf5175214f3acc414e0c918a33825c98a1d7ac02624
+  data.tar.gz: 9e12898751e19fc7104c62826eaf7c9ee4e17a14a12efc66419eab4850dae720
 SHA512:
-  metadata.gz: 9b2ceb4c68972744e10ac6dd56e2e863b5e229bb31053b7159a16c020a2cfa55ffe1affcbef92ca52ee03de79d4d675cb5b3f4340e1c888e064e9ab246f3e455
-  data.tar.gz: 7dd102d25dd4cbb60ab73d30732f78a6cd1d6757e345e3b304c9b1abe4394b6b1d883c1368bd7eaa12ecee986ecdfabf3d82cea081048694807388fc5a1bfd69
+  metadata.gz: 58b5bac3c0260d68a86fc7d9c3258457405a3670e0f8333959aa1ee54774ab68774728522d2e40c5d3b67a430f3b952af8903bb5d29b4ee12b6a291e3415fd17
+  data.tar.gz: 42252595f95f48896cd08ec1be77a28657553ae287cc52213bed5cc343c38121bf12c8aba1db8ea002237ea8b5c1d706a8fc8f10dc7b9522c72c80218e4d35a5

data/README.md

@@ -70,7 +70,7 @@ class ApplicationController < ActionController::Base
   def require_user!
     return if current_user
     save_passwordless_redirect_location!(User) # <-- optional, see below
-    redirect_to root_path, flash: { error: 'You are not worthy!' }
+    redirect_to root_path, alert: "You are not worthy!"
   end
 end
 ```
@@ -237,7 +237,7 @@ class ApplicationController < ActionController::Base
   def require_user!
     return if current_user
     save_passwordless_redirect_location!(User) # <-- this one!
-    redirect_to root_path, flash: {error: 'You are not worthy!'}
+    redirect_to root_path, alert: "You are not worthy!"
   end
 end
 ```

data/app/controllers/passwordless/sessions_controller.rb

@@ -105,11 +105,11 @@ module Passwordless
     protected
 
     def passwordless_sign_out_redirect_path
-      Passwordless.config.sign_out_redirect_path
+      call_or_return(Passwordless.config.sign_out_redirect_path)
     end
 
     def passwordless_failure_redirect_path
-      Passwordless.config.failure_redirect_path
+      call_or_return(Passwordless.config.failure_redirect_path)
     end
 
     def passwordless_query_redirect_path
@@ -119,11 +119,22 @@ module Passwordless
       nil
     end
 
-    def passwordless_success_redirect_path
-      return Passwordless.config.success_redirect_path unless Passwordless.config.redirect_back_after_sign_in
+    def passwordless_success_redirect_path(authenticatable)
+      success_redirect_path = Passwordless.config.success_redirect_path
 
-      session_redirect_url = reset_passwordless_redirect_location!(authenticatable_class)
-      passwordless_query_redirect_path || session_redirect_url || 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)
+        return passwordless_query_redirect_path || session_redirect_url || success_redirect_path
+      end
+
+      success_redirect_path
     end
 
     private
@@ -138,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")
@@ -164,6 +179,14 @@ module Passwordless
       authenticatable_type.constantize
     end
 
+    def call_or_return(value, *args)
+      if value.respond_to?(:call)
+        instance_exec(*args, &value)
+      else
+        value
+      end
+    end
+
     def find_authenticatable
       if authenticatable_class.respond_to?(:fetch_resource_for_passwordless)
         authenticatable_class.fetch_resource_for_passwordless(normalized_email_param)

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.3.0"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passwordless
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-24 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.