lockie 0.2.12 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dac3acfaeeeb25086363798a25f30236b2aa4421c592ec2a9a19f4d6b67a4f85
-  data.tar.gz: 96ca18b9450ad04e852ed8ecea300857aa62473bf628e720d33e5d56ddf3017e
+  metadata.gz: 4891f7485ad02efb026b823bc53c1975f05661eca97414310fdf89a93305188d
+  data.tar.gz: 4ba661f6c8e3e40415695f9fecd2fe7fb7e3d9d2ef5542af7420792575c7d399
 SHA512:
-  metadata.gz: 30689a81b8ebc05008d54b60b570ac85eae14913b2d6e89878324fffe1d27ed8e7bcf83f992ca3c22e44800603d7d58eafb26b66d595e4853fcb5318a90fee48
-  data.tar.gz: 86040b9b8a51c3e51ff30ccf258680e8a580edf2f79ebc32cefc0cfa6de5e86077b4fa2557ab046dfb65709aff1368b5aedea2219cbcbdd0ebd3c27a3ae47f44
+  metadata.gz: a1d92c0e6f02c98dcd46adc5fdb9559e9593f7c6f90f513eca1569d00ea77fa14c6b58afa41470806477b57bb786b191cd9e29d5fd3e9b1dbdd351bc46186f16
+  data.tar.gz: 70ae39adb0997816279aac2880cdc274dd1b2e1e253ac4008aa7bcd0cd50348fc1a6ac2731c9714c96a9a857b0a04e5f62ddfb976052393f739e464a2960a5b6

data/README.md

@@ -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.2.11'
+gem 'lockie', '~> 0.3.1'
 ```
 
 And then execute:
@@ -89,7 +89,8 @@ Lockie.configure do |c|
   # set custom scopes
   c.scopes = [
     [:api, { store: false, strategies: [:jwt]}],
-    [:web, { store: true, strategies: [:email_password]}]
+    [:web, { store: true, strategies: [:email_password]}],
+    [:admin, { store: true, strategies: [:email_password], unauthenticated_path: "/login-admin" }]
   ]
 end
 ```
@@ -101,12 +102,12 @@ Using `Warden::Test::Helpers` https://github.com/wardencommunity/warden/wiki/tes
 ```
 include Warden::Test::Helpers
 
-before do
+setup do
   @user = users(:one)
   login_as @user
   
 end
-after { Warden.test_reset! }
+teardown { Warden.test_reset! }
 ```
 
 ### Testing JSON Api with token

data/lib/lockie.rb

@@ -21,6 +21,7 @@ module Lockie
     attr_accessor :callback_url
     attr_accessor :scopes
     attr_accessor :serializer_to_session, :serializer_from_session
+    attr_accessor :session_timeout
 
     def initialize
       @model_name = "User"
@@ -32,6 +33,7 @@ module Lockie
       @scopes = []
       @serializer_to_session = nil
       @serializer_from_session = nil
+      @session_timeout = 3.hours
     end
   end
 

data/lib/lockie/controller_helper.rb

@@ -30,6 +30,7 @@ module Lockie
       def authenticated?(*args)
         warden.authenticated?(*args)
       end
+
       alias logged_in? authenticated?
 
       def logout(*args)
@@ -38,5 +39,6 @@ module Lockie
       end
 
     end
+
   end
 end

data/lib/lockie/failure_app.rb

@@ -35,7 +35,7 @@ module Lockie
       self.status = 302
       if Lockie.config.callback_url
         callback_url = request.base_url + request.original_fullpath
-        uri = URI(Lockie.config.unauthenticated_path)
+        uri = URI(warden_options[:unauthenticated_path] || Lockie.config.unauthenticated_path)
         uri.query = (uri.query.to_s.split("&") << "callback_url=#{ callback_url }").join("&")
         redirect_to uri.to_s
       else
@@ -56,7 +56,7 @@ module Lockie
     end
 
     def warden
-      env['warden']
+      request.env['warden']
     end
 
   end

data/lib/lockie/rails.rb

@@ -8,19 +8,33 @@ module Lockie
         manager.failure_app = Lockie::FailureApp
 
         if Lockie.config.serialize_session
-          serializer_to_session = Lockie.config.serializer_to_session || proc { |u| u.email }
+          serializer_to_session = Lockie.config.serializer_to_session || proc { |u| [u.class.name, u.id] }
           manager.serialize_into_session(&serializer_to_session)
-          serializer_from_session = Lockie.config.serializer_from_session || proc { |email| Lockie.config.model_name.classify.constantize.find_by_email(email) }
+          serializer_from_session = Lockie.config.serializer_from_session || proc { |s| s.first.constantize.find(s.last) }
           manager.serialize_from_session(&serializer_from_session)
         end
 
         Lockie.config.scopes.each do |scope|
-          manager.scope_defaults *scope
+          manager.scope_defaults(*scope)
         end
 
       end
   end
 end
 
+Warden::Manager.after_authentication do |record, warden, options|
+  session_key = "warden.uls-#{record.class.name.underscore}-#{record.id}"
+  warden.request.session[session_key] = (Time.now + Lockie.config.session_timeout).to_s
+end
+
 Warden::Manager.after_set_user do |record, warden, options|
+  session_key = "warden.uls-#{record.class.name.underscore}-#{record.id}"
+  last_session_access = warden.request.session[session_key]
+
+  if last_session_access && Time.parse(last_session_access) < Time.now
+    # session expired
+    warden.logout
+  end
+
+  warden.request.session[session_key] = Time.now + Lockie.config.session_timeout
 end

data/lib/lockie/version.rb

@@ -1,3 +1,3 @@
 module Lockie
-  VERSION = '0.2.12'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockie
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.3.1
 platform: ruby
 authors:
 - Melvin Sembrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.7
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 11.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 11.1.3
 description: Drop in password and JWT token authentication for Ruby on Rails
 email:
 - melvinsembrano@gmail.com
@@ -135,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Drop in password and JWT token authentication for Ruby on Rails