session-check 0.2.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24830dfb42af4ee2bde0875deb428f69c7990ab75de29aaf35c6a153622a306d
-  data.tar.gz: eb214d1d4b3b430b11287cc96fcb69f7afb4712d92c35f927cde90e7fdf023f3
+  metadata.gz: 3c086b705a832734d76b4abdeb2e2ce98c3b3278629efce7a7dd0714cedf0134
+  data.tar.gz: 4059cbfc502675d24fbb5360e4c3e9de0917690165aaab8a1a39f2ea51f0c33d
 SHA512:
-  metadata.gz: d2064b4a1d4e1bc4568bbeae4caa652e8a35a666f36c62c713d0a66a1540575b9fb42c5ee2a011386442ea1f49156995e02979bc10b4b365b3b35b3284dce54e
-  data.tar.gz: 970f0aab87a62de6e2634f4261512dbbab144637a7e39dfb3a2a0b300535da8a62e81e117b30e7b6d5c23653ba0b0b70ca9ee3b0838e8c42051e24640f831f6a
+  metadata.gz: f330839b1cee46fb05e160c0c5f3174a38611a8711a113533a41102016f2cdc6b833787fc95835a33cc07f6dd3bb36e2bd895066b905d429df68428ec48c8106
+  data.tar.gz: c0f2cac5d5f86949e0a6c924d35badafdc2bab9c9ae435eae1f5990745476a1d8be383b7ff24f82c623f35ca9a4cc9e2ed3d00b476c4f0e1f575bc1c71548722

data/README.md

@@ -31,4 +31,5 @@ their browser, you can start the ping process by calling:
 
 # Changelog
 
-Version 0.2.1 : Added explicit reference to Devise (which is required)
+Version 1.1.0 : Added optional nonce
+Version 0.2.1 : Added explicit reference to Devise (which is required)

data/app/controllers/session/check/session_checks_controller.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Session
+  module Check
+    class SessionChecksController < ActionController::Base
+      skip_authorization_check if defined?(CanCan)
+
+      prepend_before_action :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
+        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 = calculate_session_expires_in
+        end
+        render json: { session_exists: session_exists, session_expires_in: session_expires_in }
+      end
+
+      # This ensures this request ping doesn't update their last access time.
+      private def dont_update_request_time
+        request.env['devise.skip_trackable'] = true
+      end
+
+      private def calculate_session_expires_in
+        User.timeout_in -
+          Time.now.utc.to_i.seconds +
+          SessionChecksController.time_of_last_warden_request(session).to_i.seconds
+      rescue => _e
+        1000000.seconds
+      end
+
+      class << self
+        def time_of_last_warden_request(session)
+          session['warden.user.user.session']['last_request_at']
+        rescue => _e
+          Time.zone.now
+        end
+      end
+    end
+  end
+end

data/app/helpers/session/check/session_check_helper.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'devise'
+
+module Session
+  module Check
+    module SessionCheckHelper
+      def session_check(options = {})
+        locals = {
+          session_time: Devise.timeout_in,
+          check_every: 10,
+          reset_counter_on_ajax: true,
+          logged_out_url: '/users/sign_in',
+          current_user: current_user
+        }.merge options
+
+        ActionController::Base.render(partial: '/session_check', locals: locals)
+      end
+    end
+  end
+end

data/app/views/_session_check.html.erb

@@ -1,4 +1,4 @@
-<script>
+<script<% if local_assigns[:nonce] %> nonce="<%= nonce %>"<% end %>>
     var SessionCheck = {
         should_session_check: <%= !current_user.nil? %>
     };

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
-  get 'session_check/time_to_session_expiry', to: 'session_checks#time_to_session_expiry'
+  get 'session_check/time_to_session_expiry', to: 'session/check/session_checks#time_to_session_expiry'
 end

data/lib/session/check/engine.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 require 'rails'
 
 module Session
   module Check
     class Engine < ::Rails::Engine
-      initializer "session-check.loader" do
+      config.to_prepare do
         ActiveSupport.on_load :action_controller do
-          helper SessionCheckHelper
+          include Session::Check::SessionCheckHelper
           helper_method :session_check
         end
       end
     end
   end
 end
-

data/lib/session/check/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Session
   module Check
-    VERSION = '0.2.4'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: session-check
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Harry Lascelles
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,7 +37,90 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email:
 - harry@harrylascelles.com
 executables: []
@@ -46,19 +128,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- app/controllers/session_checks_controller.rb
-- app/helpers/session_check_helper.rb
+- app/controllers/session/check/session_checks_controller.rb
+- app/helpers/session/check/session_check_helper.rb
 - app/views/_session_check.html.erb
 - config/routes.rb
 - lib/session-check.rb
 - lib/session/check.rb
 - lib/session/check/engine.rb
 - lib/session/check/version.rb
-homepage: https://github.com/firstbanco/session-check
+homepage: https://github.com/bambooengineering/session-check
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -73,8 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A gem for JS clients to check if their session has expired.
 test_files: []

data/app/controllers/session_checks_controller.rb

@@ -1,23 +0,0 @@
-class SessionChecksController < ActionController::Base
-
-  skip_authorization_check if defined?(CanCan)
-
-  prepend_before_action :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
-    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 request ping doesn't update their last access time.
-  def dont_update_request_time
-    request.env['devise.skip_trackable'] = true
-  end
-end

data/app/helpers/session_check_helper.rb

@@ -1,15 +0,0 @@
-require 'devise'
-
-module SessionCheckHelper
-
-  def session_check(options = {})
-    locals = {
-      session_time: Devise.timeout_in,
-      check_every: 10,
-      reset_counter_on_ajax: true,
-      logged_out_url: '/users/sign_in'
-    }.merge options
-    render :partial => '/session_check', locals: locals
-  end
-
-end