effective_logging 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ffec40703187b420ab31ea83ccb1c7d54f480c5
-  data.tar.gz: 1d61908e31c154fb6b61250f6b9ca8a521eae13f
+  metadata.gz: 7403fe3327b28b8f84977469b565964981bc0608
+  data.tar.gz: 41d3d0730dfcc1ea9618bab4e9e39c098ad50a52
 SHA512:
-  metadata.gz: 9dcf971011fb02748255f89d58f5c534bbe7a5b8c694e39077589db39775efc4f41ee57a74b6590cefda73dcba32fb1b7453adfc5afdcbd420338ff1ea47b316
-  data.tar.gz: 29e2c73f69b919bb725ea5a15727dd8667017f66754e5b208ae77cbd0a4d9f3179226ad0ab8fdbfb233533a6a7c02d05f1a030649ff5243fa27d94cd6435ed6e
+  metadata.gz: fd177c572ef4d57f23dbfc9ac8d5d38bea1a56b3476f99955a52753241aabdc0dcb27d27ea6882c7e58e3733dd47e48ad7331d24eecb02a63a3b62b8986bdc07
+  data.tar.gz: 31f23fec3d1b5347423fe0b539c7b874ea0af6ba5797b10f2a37325d72aa35536d7bc4eb0be043d083e58b0a019f9dfe8ae79c3edd47aa207dcfce31ecf32052

data/README.md

@@ -99,9 +99,9 @@ This behaviour can be disabled in the config/initializers/effective_logging.rb i
 If the TO email address match a User, the :user will be set appropriately.
 
 
-### Automatic Logging of User Logins
+### Automatic Logging of User Login and Logout
 
-Any successful User logins via Devise will be automatically logged.
+Any successful User logins and logouts via Devise will be automatically logged.
 
 This behaviour can be disabled in the config/initializers/effective_logging.rb initializer.
 

data/lib/effective_logging/engine.rb

@@ -35,12 +35,9 @@ module EffectiveLogging
       if EffectiveLogging.user_logins_enabled == true
         ActiveSupport.on_load :active_record do
           if defined?(Devise)
-            User.instance_eval do
-              alias_method :original_after_database_authentication, :after_database_authentication
-              define_method(:after_database_authentication) { Effective::UserLogger.successful_login(self) ; original_after_database_authentication() }
-            end
+            EffectiveLogging::UserLogger.create_warden_hooks()
           else
-            raise ArgumentError.new("EffectiveLogging.user_logins_enabled only works with Devise and a user class defined as User")
+            raise ArgumentError.new("EffectiveLogging.user_logins_enabled only works with Devise")
           end
         end
       end

data/lib/effective_logging/user_logger.rb

@@ -0,0 +1,37 @@
+module EffectiveLogging
+  class UserLogger
+    def self.create_warden_hooks
+      Warden::Manager.after_authentication do |user, warden, opts|
+        EffectiveLogger.success('user login',
+          :user => user,
+          :ip => warden.request.ip.presence,
+          :referrer => warden.request.referrer,
+          :user_agent => warden.request.user_agent
+        )
+      end
+
+      Warden::Manager.before_logout do |user, warden, opts|
+        if user.respond_to?(:timedout?) && user.respond_to?(:timeout_in)
+          scope = opts[:scope]
+          last_request_at = (warden.request.session["warden.#{scope}.#{scope}.session"]['last_request_at'] rescue Time.zone.now)
+
+          # As per Devise
+          if last_request_at.is_a? Integer
+            last_request_at = Time.at(last_request_at).utc
+          elsif last_request_at.is_a? String
+            last_request_at = Time.parse(last_request_at)
+          end
+
+          if user.timedout?(last_request_at) && !warden.request.env['devise.skip_timeout']
+            EffectiveLogger.success('user logout', :user => user, :timedout => true)
+          else
+            EffectiveLogger.success('user logout', :user => user)
+          end
+        else # User does not respond to timedout
+          EffectiveLogger.success('user logout', :user => user)
+        end
+      end
+
+    end
+  end
+end

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/effective_logging.rb

@@ -1,6 +1,7 @@
 require "effective_logging/engine"
 require "effective_logging/version"
 require "effective_logging/log_page_views"
+require "effective_logging/user_logger"
 
 module EffectiveLogging
   # The following are all valid config keys

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -99,7 +99,6 @@ files:
 - app/models/effective/access_denied.rb
 - app/models/effective/datatables/logs.rb
 - app/models/effective/log.rb
-- app/models/effective/user_logger.rb
 - app/models/effective_logger.rb
 - app/views/active_admin/effective_logging/logs/index.html.haml
 - app/views/active_admin/effective_logging/logs/show.html.haml
@@ -114,6 +113,7 @@ files:
 - lib/effective_logging/email_logger.rb
 - lib/effective_logging/engine.rb
 - lib/effective_logging/log_page_views.rb
+- lib/effective_logging/user_logger.rb
 - lib/effective_logging/version.rb
 - lib/generators/effective_logging/install_generator.rb
 - lib/generators/templates/README

data/app/models/effective/user_logger.rb

@@ -1,7 +0,0 @@
-module Effective
-  class UserLogger
-    def self.successful_login(user)
-      EffectiveLogger.success("user login from #{user.try(:current_sign_in_ip) || 'unknown IP'}", :user => user)
-    end
-  end
-end