lockie 0.2.14 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fbe268cb9149d19e62b0e508449c3c805f735162911db10c1e14469ce4598ea
-  data.tar.gz: 8192dc9af5ca2a778be648bbe364b1ed005a8fd5b13edf966662056acb387877
+  metadata.gz: 5ee73ebd0d83d510942864ae11dad538c578fa4b396fad352d6c4f1602fdfbd5
+  data.tar.gz: 5fce20025be471f55631caa7d6d9ce874b640b838e517662e0d26acd6f576e42
 SHA512:
-  metadata.gz: 8820f4ffe9b93814b235eab3faea5f110c2d13d5f339a62e1b22476ceb8cb4c43bd5907f1e1b1e04cab6558e05a01a09f2c233100f25b146bfeb87022286506d
-  data.tar.gz: ab3109f87d1f6204a455c50b38dcf4895e48ca2c205fa2407e839f427e689a7ad1cffdca5cbb074db84bb989713b55f137ef403afab7e17b929b52bd964091d2
+  metadata.gz: 5005acb3551a23b03aa7e6e1a87e0224c054fde2e1768cf84c3d278064ab1f9ff8b525d0a4c209dfa48cf11340b74935e13a14cdaa04f7b12c6b69c7c27a71b8
+  data.tar.gz: a002a2bd09c46b611a0d1ac544f65c74dd93bc69c632da534d12cc3e869e93cc73bd10d1056645d6c00c63ad18474eaebc759125cc2e4331a7aa87df08449b12

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.14'
+gem 'lockie', '~> 0.3.3'
 ```
 
 And then execute:

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

@@ -34,9 +34,12 @@ module Lockie
       flash[type] = message if message
       self.status = 302
       if Lockie.config.callback_url
-        callback_url = request.base_url + request.original_fullpath
         uri = URI(warden_options[:unauthenticated_path] || Lockie.config.unauthenticated_path)
-        uri.query = (uri.query.to_s.split("&") << "callback_url=#{ callback_url }").join("&")
+        # 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

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.14'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockie
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.3.4
 platform: ruby
 authors:
 - Melvin Sembrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -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