lockie 0.4.5 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86eac2be7c9981eb52904045b83103de633140c29fe6c1f8a58a05509ae10d2f
-  data.tar.gz: fa61c62cfc66f650bb288f8d29fa6b45a9d515635da2051fd50943ff2ac4cb8c
+  metadata.gz: 2da2a367021890a8009a299c6cefac92ca7d1fc055b897c8d2b0c4f3f0481cab
+  data.tar.gz: 53f535b09619b31b69c2ed14592651ab6d5838e47781cd759a4ef520332432fa
 SHA512:
-  metadata.gz: 567d4b868e544121f9f62274634e6b50319774d4b8f8c479c04112016e669d3a930e4d74ea5d68bf5b8097a7ff9fc71201e1026a259c5eee40fba993b79a17e6
-  data.tar.gz: 24c141be113f8cc783c9a03ad9fb01e2cc139393215580e6703194cdb70cdbb537a5fe2e9420959c9200807eb7f99925a369a3338b842e5e891fbbd145a9e215
+  metadata.gz: 3c443dc6a9e865104f8d1795a4b6e46660a8eb6439da16d5950448d1a67382289a81775b2e5875150b160d6860718584fa6ad06f073b2ba0896e7fd3728f745b
+  data.tar.gz: 540634facbc3d3a5f8910794543a5e457317d887108e78b6d522a64c28ed9b348a767bfe8028f89a56a3d3e9654eee48cc086336aa69ad58ccbc8bc216fb3598

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/melvinsembrano/lockie.svg?branch=master)](https://travis-ci.org/melvinsembrano/lockie)
+[![Build Status](https://github.com/melvinsembrano/lockie/actions/workflows/00_test.yml/badge.svg)](https://github.com/melvinsembrano/lockie/actions/workflows/00_test.yml)
 [![Gem Version](https://badge.fury.io/rb/lockie.svg)](https://badge.fury.io/rb/lockie)
 
 # Lockie
@@ -9,7 +9,7 @@ A drop-in, none assuming warden based Password and JWT authentication for Rails
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'lockie', '~> 0.3.3'
+gem 'lockie', '~> 0.5.2'
 ```
 
 And then execute:
@@ -82,6 +82,7 @@ Lockie.configure do |c|
   c.model_name = "Account" # default to 'User'
   c.unauthenticated_path = "/some/login/path" # default to '/login'
   c.hash_algorithm = "HS512" # default to 'HS256'
+  c.session_timeout = 14.days
   
   # add custom warden strategy, default strategies and priority are [:email_password, :jwt]
   c.default_strategies = [:auth0, :jwt]

data/lib/lockie/failure_app.rb

@@ -13,7 +13,7 @@ module Lockie
     def unauthenticated
       if request.xhr?
         api_response(:text)
-      elsif request.format.to_sym == :json || request.content_type.to_s.split("/").last == 'json'
+      elsif request.format.to_sym == :json || request.media_type.to_s.split("/").last == 'json'
         api_response(:json)
       else
         html_response
@@ -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/rails.rb

@@ -5,7 +5,7 @@ module Lockie
 
     config.app_middleware.use Warden::Manager do |manager|
         manager.default_strategies Lockie.config.default_strategies
-        manager.failure_app = Lockie::FailureApp
+        manager.failure_app = Lockie.config.failure_app
 
         if Lockie.config.serialize_session
           serializer_to_session = Lockie.config.serializer_to_session || proc { |u| [u.class.name, u.id] }

data/lib/lockie/version.rb

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

data/lib/lockie.rb

@@ -1,6 +1,7 @@
 require 'rails'
 require 'warden'
 require_relative "lockie/rails"
+require_relative "lockie/failure_app"
 require_relative "lockie/log_helper"
 require_relative "lockie/model_helper"
 require_relative "lockie/controller_helper"
@@ -9,7 +10,6 @@ require_relative "lockie/strategies/jwt"
 require_relative "lockie/strategies/failed"
 
 module Lockie
-  autoload :FailureApp, 'lockie/failure_app'
 
   class Configuration
     attr_accessor :model_name
@@ -22,6 +22,7 @@ module Lockie
     attr_accessor :scopes
     attr_accessor :serializer_to_session, :serializer_from_session
     attr_accessor :session_timeout
+    attr_accessor :failure_app
 
     def initialize
       @model_name = "User"
@@ -34,6 +35,7 @@ module Lockie
       @serializer_to_session = nil
       @serializer_from_session = nil
       @session_timeout = 3.hours
+      @failure_app = Lockie::FailureApp
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockie
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.3
 platform: ruby
 authors:
 - Melvin Sembrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-23 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.0.3.1
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Drop in password and JWT token authentication for Ruby on Rails