passwordless 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2242a4b95f1a99d5be1b889539dc6dd9f1eda711ce616f3b090f12dd68337254
-  data.tar.gz: afd9ea1fd2d3b3f15f10a4772d231c53adfd524e22de00d833a9183b34d69397
+  metadata.gz: 6dc17e0a0f2696a647ba5f5dffaededf6494a48f4cd3393135e041c91b3955f0
+  data.tar.gz: b27244139169a60b25c1251321aa6576d7fbbe7e9e122cb5886041f7a60a4886
 SHA512:
-  metadata.gz: 9b2ceb4c68972744e10ac6dd56e2e863b5e229bb31053b7159a16c020a2cfa55ffe1affcbef92ca52ee03de79d4d675cb5b3f4340e1c888e064e9ab246f3e455
-  data.tar.gz: 7dd102d25dd4cbb60ab73d30732f78a6cd1d6757e345e3b304c9b1abe4394b6b1d883c1368bd7eaa12ecee986ecdfabf3d82cea081048694807388fc5a1bfd69
+  metadata.gz: 66be83e8a5b1f8cd06d83196d94ce42e9fe25dbbd49a650ca553c8874ac47503758c782b10831187d7005666fbe73e1468fea82a9c6cdad21dae8abe85cfca22
+  data.tar.gz: 266ec15bbc186604c4ab0eda90171499052fa22e11d8eeb0c8f96196fe3363ee45c42d183d76a16dc90670308a1ae9a7bc84bfbb321a8c01fca815ae7e24b6cf

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
@@ -120,10 +120,14 @@ module Passwordless
     end
 
     def passwordless_success_redirect_path
-      return Passwordless.config.success_redirect_path unless Passwordless.config.redirect_back_after_sign_in
+      success_redirect_path = call_or_return(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 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
@@ -164,6 +168,10 @@ module Passwordless
       authenticatable_type.constantize
     end
 
+    def call_or_return(value)
+      value.respond_to?(:call) ? value.call : value
+    end
+
     def find_authenticatable
       if authenticatable_class.respond_to?(:fetch_resource_for_passwordless)
         authenticatable_class.fetch_resource_for_passwordless(normalized_email_param)

data/lib/passwordless/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passwordless
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails