intra 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf985d8472b139ca940b7bc455f3d375c7b9ca77ca89fac60eaee241819ed15f
-  data.tar.gz: 415cd8474d33c5723929227b88276d5e38dc2db190f01932052d0bbd7fa8b57a
+  metadata.gz: 0f45d8079fd761223276219cedbbc2c601658aa791af0b911349c33281fe8e2a
+  data.tar.gz: 567436e5ef554627a46a80b8ceac8e1c7ae3bc9896dc8bca7a3028a227178ed1
 SHA512:
-  metadata.gz: 9e4e394b9d3e97cdc2e51e320c4aecfb638029b4c854755f278e6e7aec9c6be3154d7541fc7ec79f5ce1650f4f2810d5da4fd997c49ec419ff826db5c4908f76
-  data.tar.gz: 40446b8b4658eac5bdf101958224d87dccc74d9b76451fe5cd16aebb2e5347bd904d34d9dcc644c6fea761a5338b6d1082fedb3c9798b923d353d3144a5928e9
+  metadata.gz: eaa01a2d6d4f1968e518662211c6e910cb887563cc429fa92f1a451fd41f0d2a1663b007a78ddb673d66805ff1109da232144b3418ce2234fcfbe5167646f994
+  data.tar.gz: e430fb2159fa71d8f186532562a541aaf697598af19137c96f017f8cd527325cbaf044f165c43fe85fc62afcf3e6a8e8f080bff6ce202de88a1c11134de23936

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    intra (0.1.1)
+    intra (0.1.2)
       omniauth
       omniauth-google-oauth2
       rails
@@ -136,6 +136,7 @@ GEM
     sqlite3 (1.4.1)
     thor (0.20.3)
     thread_safe (0.3.6)
+    timecop (0.9.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     websocket-driver (0.7.1)
@@ -152,6 +153,7 @@ DEPENDENCIES
   minitest (~> 5.0)
   rake (~> 10.0)
   sqlite3
+  timecop
 
 BUNDLED WITH
    2.0.1

data/intra.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "byebug"
+  spec.add_development_dependency "timecop"
 end

data/lib/intra.rb

@@ -1,8 +1,8 @@
-require 'logger' unless defined?(Logger)
-require 'rails/engine' unless defined?(Rails::Engine)
+require 'logger'
+require 'rails/engine'
+require 'action_dispatch'
 require 'omniauth'
 require 'omniauth-google-oauth2'
-require 'action_dispatch'
 
 require 'intra/version'
 require 'intra/session'
@@ -13,30 +13,24 @@ require 'intra/request_forgery_protection'
 require 'intra/engine'
 
 module Intra
-  # Configure the path to redirect unauthenticated session. Default '/sign_in'
-  def self.sign_in_path(path)
-    @@sign_in_path = path
-  end
-
-  def self.sign_in_path
-    @@sign_in_path ||= '/sign_in'
-  end
+  # Configure the path to redirect unauthenticated session. Default '/sign_in'.
+  mattr_accessor :sign_in_path
+  @@sign_in_path = '/sign_in'
 
   # Configure the user class. Default 'User'
-  def self.user_class=(user_class)
-    @@user_class = user_class
-  end
+  mattr_accessor :user_class
+  @@user_class = 'User'
 
-  def self.user_class
-    @@user_class ||= 'User'
-  end
+  # Configure the logger Intra will use. Defaults to Logger.new($STDOUT).
+  mattr_accessor :logger
+  @@logger = Logger.new($STDOUT)
 
-  # Configure the logger Intra will use. Defaults to Logger.new($STDOUT)
-  def self.logger=(logger)
-    @@logger = logger
-  end
+  # The session cookie expiration.
+  mattr_accessor :remember_for
+  @@remember_for = 2.weeks
 
-  def self.logger
-    @@logger ||= Logger.new($STDOUT)
-  end
+  # Time interval to timeout the user sesion without activity.
+  # Set this to nil if you do not want to timeout the user serssion.
+  mattr_accessor :timeout_in
+  @@timeout_in = 30.minutes
 end

data/lib/intra/session.rb

@@ -4,12 +4,15 @@ module Intra
       @env = env
       @current_user = nil
       @cookies = nil
+      check_timeout
     end
 
     def add_cookie_to_headers(headers)
       if current_user&.remember_token
-        options = cookie_options.merge value: current_user.remember_token
-        Rack::Utils.set_cookie_header! headers, COOKIE_NAME, options
+        value = cookie_value
+        value['remember_token'] = current_user.remember_token
+        options = cookie_options.merge value: value.to_json
+        Rack::Utils.set_cookie_header! headers, INTRA_COOKIE, options
       end
     end
 
@@ -28,7 +31,7 @@ module Intra
       current_user.reset_remember_token! if signed_in?
 
       @current_user = nil
-      cookies.delete COOKIE_NAME
+      cookies.delete INTRA_COOKIE
     end
 
     def signed_in?
@@ -39,29 +42,55 @@ module Intra
       !signed_in?
     end
 
+    def check_timeout
+      sign_out if timed_out?
+    end
+
     private
 
-    def user_model
-      Intra.user_class.constantize
+    def timed_out?
+      return false unless Intra.timeout_in.present?
+      return false unless last_activity_at.present?
+
+      Time.current - Intra.timeout_in > last_activity_at
+    end
+
+    def cookie
+      @cookie ||= JSON.parse cookies[INTRA_COOKIE] rescue {}
+    end
+
+    def remember_token
+      cookie['remember_token']
+    end
+
+    def last_activity_at
+      cookie['last_activity_at']
     end
 
     def cookies
       @cookies ||= ActionDispatch::Request.new(@env).cookie_jar
     end
 
-    def remember_token
-      cookies[COOKIE_NAME]
+    def user_model
+      Intra.user_class.constantize
     end
 
     def cookie_options
       {
-        expires: 1.week.from_now,
+        expires: Intra.remember_for.from_now,
         path: '/',
         secure: Rails.env.production?,
-        value: remember_token
+        value: cookie_value.to_json
+      }
+    end
+
+    def cookie_value
+      {
+        remember_token: remember_token,
+        last_activity_at: Time.current
       }
     end
 
-    COOKIE_NAME = 'remember_token'.freeze
+    INTRA_COOKIE = '_intra_cookie'.freeze
   end
 end

data/lib/intra/version.rb

@@ -1,3 +1,3 @@
 module Intra
-  VERSION = "0.1.1"
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intra
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Scott Serok
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !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'
 description: Many companies have internal apps to support their day to day operations.
   This library is a drop-in Google OAuth authentication and session management library
   so you don't have to install Devise.