lockie 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27d5888160628cbede6cdddc542ea8f8638500e787f2eda93be425b1f556ab2e
-  data.tar.gz: 5897d3386ab1e1e7834a6884a113684910eb1d083af02791e39bad53010fb98a
+  metadata.gz: 2da2a367021890a8009a299c6cefac92ca7d1fc055b897c8d2b0c4f3f0481cab
+  data.tar.gz: 53f535b09619b31b69c2ed14592651ab6d5838e47781cd759a4ef520332432fa
 SHA512:
-  metadata.gz: 5a1d6bdc871802e2eea30cbafd49588e7c4f52299e270066239ff7fdc82d780a177890681437c57b186fbe25b20148e52002c4d2539a8dbe89d48247bc352fb7
-  data.tar.gz: b99066c6de4ca0648ed2817681968109b9cdd2650f32c5d6c8ca981e2789d03a56932c09b8947166c9ddcecf4404ceb519e5c33697b06379a25bbbec13c6971b
+  metadata.gz: 3c443dc6a9e865104f8d1795a4b6e46660a8eb6439da16d5950448d1a67382289a81775b2e5875150b160d6860718584fa6ad06f073b2ba0896e7fd3728f745b
+  data.tar.gz: 540634facbc3d3a5f8910794543a5e457317d887108e78b6d522a64c28ed9b348a767bfe8028f89a56a3d3e9654eee48cc086336aa69ad58ccbc8bc216fb3598

data/lib/lockie/failure_app.rb

@@ -33,21 +33,28 @@ module Lockie
     def html_response
       flash[type] = message if message
       self.status = 302
+
+      unauthenticated_path = if warden_options[:scope]
+        warden.config.dig(:scope_defaults, warden_options[:scope], :unauthenticated_path) || Lockie.config.unauthenticated_path
+      else
+        Lockie.config.unauthenticated_path
+      end
+
+      uri = URI(unauthenticated_path)
+
       if Lockie.config.callback_url
-        uri = URI(warden_options[:unauthenticated_path] || Lockie.config.unauthenticated_path)
         # only add callback_url if original path is not the same with login path
         unless request.original_fullpath == uri.path
           callback_url = request.base_url + request.original_fullpath
           uri.query = (uri.query.to_s.split("&") << "callback_url=#{ callback_url }").join("&")
         end
-        redirect_to uri.to_s
-      else
-        redirect_to Lockie.config.unauthenticated_path
       end
+
+      redirect_to uri.to_s
     end
 
     def message
-      @message ||= request.env['warden.message'] 
+      @message ||= request.env['warden.message']
     end
 
     def warden_options

data/lib/lockie/version.rb

@@ -1,3 +1,3 @@
 module Lockie
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockie
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Melvin Sembrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-15 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Drop in password and JWT token authentication for Ruby on Rails