effective_logging 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dba3d7067bb00cdfd22bf82b4e2d22b5eb93c510
-  data.tar.gz: d0c1fcd66775d2429ff202a9456c17d704ecb56b
+  metadata.gz: ad6d1fb9c0e708830f7ec12173354a1e6692fa0a
+  data.tar.gz: 89c073378f6b6f441a2daa78ce034671a6e92db3
 SHA512:
-  metadata.gz: 3e3dae72ea8a9be3248c387de264f5dc764e34de170e2b6972b5498eb1cf3ceaff850101bfd30b0c46a7137476f1e475ec15ac93e71bf1f1ee98495bbe599bb7
-  data.tar.gz: 2f71d15d724c34eb6c34025def23b8e7912d55174bc6e6ecc519c16ea9af3a388f4948b2fbb964b72a56d96be4b210f8af757ffdaf2b9b0b63ea159af88ab841
+  metadata.gz: 50d647c3c66443229c8a0aa26a2c58086e5a24d8f662753b2d5567d4ab9315a79bdc4c72d4b0882849611c26057a79f5c02a100083376f2aa2aa735096cc952e
+  data.tar.gz: 33a0d6419f26c57ccae3abe1491273c5dfa6680ec26b3be93bd1615630560a94747a2b161110738c3fb4a64ff5933af14b5fbd96ec056fce4adb7b987b3e9f43

data/lib/effective_logging/engine.rb

@@ -48,7 +48,7 @@ module EffectiveLogging
 
     # This has to be run after initialization or User hasn't been loaded yet
     config.after_initialize do
-      if EffectiveLogging.user_logins_enabled == true
+      if EffectiveLogging.user_logins_enabled || EffectiveLogging.user_logouts_enabled
         ActiveSupport.on_load :active_record do
           if defined?(Devise)
             EffectiveLogging::UserLogger.create_warden_hooks()

data/lib/effective_logging/user_logger.rb

@@ -2,51 +2,51 @@ module EffectiveLogging
   class UserLogger
     def self.create_warden_hooks
       Warden::Manager.after_authentication do |user, warden, opts|
-        return if EffectiveLogging.supressed?
-
-        ::EffectiveLogger.success('user login',
-          :user => user,
-          :ip => warden.request.ip.presence,
-          :referrer => warden.request.referrer,
-          :user_agent => warden.request.user_agent
-        )
-      end
-
-      Warden::Manager.after_set_user do |user, warden, opts|
-        return if EffectiveLogging.supressed?
-
-        if (opts[:event] == :set_user rescue false) # User has just reset their password and signed in
+        if EffectiveLogging.user_logins_enabled && !EffectiveLogging.supressed?
           ::EffectiveLogger.success('user login',
             :user => user,
             :ip => warden.request.ip.presence,
             :referrer => warden.request.referrer,
-            :user_agent => warden.request.user_agent,
-            :notes => 'after password reset'
+            :user_agent => warden.request.user_agent
           )
         end
       end
 
-      Warden::Manager.before_logout do |user, warden, opts|
-        return if EffectiveLogging.supressed?
-
-        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)
+      Warden::Manager.after_set_user do |user, warden, opts|
+        if EffectiveLogging.user_logins_enabled && !EffectiveLogging.supressed?
+          if (opts[:event] == :set_user rescue false) # User has just reset their password and signed in
+            ::EffectiveLogger.success('user login',
+              :user => user,
+              :ip => warden.request.ip.presence,
+              :referrer => warden.request.referrer,
+              :user_agent => warden.request.user_agent,
+              :notes => 'after password reset'
+            )
           end
+        end
+      end
 
-          if user.timedout?(last_request_at) && !warden.request.env['devise.skip_timeout']
-            ::EffectiveLogger.success('user logout', :user => user, :timedout => true)
-          else
+      Warden::Manager.before_logout do |user, warden, opts|
+        if EffectiveLogging.user_logouts_enabled && !EffectiveLogging.supressed?
+          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
-        else # User does not respond to timedout
-          ::EffectiveLogger.success('user logout', :user => user)
         end
       end
 

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '1.5.7'.freeze
+  VERSION = '1.5.8'.freeze
 end

data/lib/effective_logging.rb

@@ -14,6 +14,7 @@ module EffectiveLogging
 
   mattr_accessor :emails_enabled
   mattr_accessor :user_logins_enabled
+  mattr_accessor :user_logouts_enabled
 
   def self.setup
     yield self

data/lib/generators/templates/effective_logging.rb

@@ -42,5 +42,6 @@ EffectiveLogging.setup do |config|
 
   # Log all successful user login attempts
   config.user_logins_enabled = true
+  config.user_logouts_enabled = false
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - Code and Effect