session-check 0.1.6 → 0.1.7

data/app/controllers/session_checks_controller.rb

@@ -3,12 +3,23 @@ require 'session_off'
 class SessionChecksController < ActionController::Base
 
   skip_authorization_check if defined?(CanCan)
-  session :off # Don't keep the session alive
+
+  prepend_before_filter :dont_update_request_time
 
   # Find it there is a session, and if it has any warden information. If so, the user is logged in.
   def time_to_session_expiry
-    sid = request.cookies['_session_id']
-    sess = Redis.current.get("#{REDIS_SESSION_NAMESPACE}:#{sid}")
-    render json: {session_exists: (sess && sess.include?('warden'))}
+    session_exists = false
+    session_expires_in = 0
+    if current_user
+      session_exists = true
+      # This calculates how many seconds there are until they are logged out
+      session_expires_in = User.timeout_in - Time.now.utc.to_i + session['warden.user.user.session']['last_request_at'].to_i rescue 1000000
+    end
+    render json: {session_exists: session_exists, session_expires_in: session_expires_in}
+  end
+
+  # This ensures this requeust ping doesn't update their last access time.
+  def dont_update_request_time
+    env['devise.skip_trackable'] = true
   end
 end

data/app/views/_session_check.html.erb

@@ -13,13 +13,15 @@
                         .done(function (d) {
                             if (!d.session_exists) {
                                 force_sign_in();
+                            } else {
+                                session_time_left = d.session_expires_in;
                             }
                         })
                         .fail(force_sign_in);
             }
-            setTimeout(session_check, check_every_s * 1000);
+            setTimeout(session_check, check_every_s * 5000);
         };
-        setTimeout(session_check, check_every_s * 1000);
+        setTimeout(session_check, check_every_s * 5000);
         <% if reset_counter_on_ajax %>
         $.ajaxSetup({
             complete: function (xhr) {

data/lib/session/check/version.rb

@@ -1,5 +1,5 @@
 module Session
   module Check
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: session-check
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  type: :runtime
-  name: session_off
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - harry@harrylascelles.com