lockie 0.2.13 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d202a04abf27c03afdd6a0de047d4f40789aeaa9ac42927762fa2ad83029d491
-  data.tar.gz: ff63303453740b70b984b8adab5cf0bcf987e1bc9ee839d9baae25e665f635c0
+  metadata.gz: 4d9b6208ff552c48fcd48bf7dac345af06b688c598d8007248aa0b1801959b99
+  data.tar.gz: b597f952ff77c9881ef7e4ab6f8a79f424c3265c3d84e673e0a1743725d5b733
 SHA512:
-  metadata.gz: 681a8fe65fc80668b554ea412a7278d86207db37278e044832b056003ff3cb7ab17ddcb073481d3c23c9efd4d3c30fc9ce469d602cc337eee8c167ea7d6d62ab
-  data.tar.gz: 195ae8d4d102b15017c6c56a343a69799361a8b643da26c48be9f587fd72fdb6415c0bad4851f1904c3e3595d9e915f2a0ca2131c93ef1e33fe5ef94b3aaa879
+  metadata.gz: 7878cb4bfe31f051b5f063c4467b52bde16494f8dde23661012414b5562b3dd65dfc20d005210582a0854fff51240b64faee18669b5355e67b4e27ebc4e40818
+  data.tar.gz: f7967811725b81454729fdb33711e69441e843efe65affb96dca44d266add3c7897f52c746898f163affa1061580d3aeb183d1c2b6409a4983f8ab82c30aabe8

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.3'
 ```
 
 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.13'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockie
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.3.3
 platform: ruby
 authors:
 - Melvin Sembrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 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