rails-automaticlogout 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 886bac714ec7c95fef68f92b348d4efaa3c6a81c
-  data.tar.gz: 926892faf3a86b51ee29e46f98065019b4e9fd96
+  metadata.gz: 0c8e1435e67f34868aa59b47da980d0314ed0b39
+  data.tar.gz: 49647ce23fdbc6c37a488061ccc0b2fe7fcadcef
 SHA512:
-  metadata.gz: 5132ad23ef7b9f2836765ff32c2eed36abdff1bcd1c9be911a1c8c1e0b1291ccd7b9acd0effa5179c45efb762609bcd442fc1e6d112d8e190a83c0fc2c851776
-  data.tar.gz: 96a56ccee0dd739254710d14f79d539bf2641c6a42274a6d07b24796dad01b082616803f67fdc48303b0fd3b2696b9faf92208ff0e8f0307ece53c5fa7ef19b6
+  metadata.gz: 92a73343a68b45a2384cf0fa95210ffcc89e3acaefc33221e870ba5127e25c13b876e9b7f806a37c01ccdf84074a9689c1a43dad83dcc31f634125dc42a72350
+  data.tar.gz: 72886b67e1a151ffaa4d58e06314ee62f0e1e83256fcb5f4fe87d60eae64e58095a07604346e5cde8b4919ba1a985c022a8b0f89d2bd3fdec660b37ebfcfbe54

data/app/assets/javascripts/automatic_logout.js

@@ -32,8 +32,7 @@ AutomaticLogout.regressiveTimer = function(){;
    * @param  {[type]} '.regressive-timer' [description]
    * @return {[type]}                     [description]
    */
-  var data_timer = $('.regressive-timer').data('expires-at'),
-      data_message = $('.regressive-timer').data('message'),
+  var data_message = $('.regressive-timer').data('message'),
       data_seconds = $('.regressive-timer').data('seconds'),
       current_time = new Date().getTime();
 
@@ -124,18 +123,21 @@ AutomaticLogout.ajaxSessionTimeout = function(){
     $.ajax({
       url: '/status_automatic_logout',
       success: function(data) {
-        if (data.timeout !== "null" && data.live === true){
-          var response_timeout = (new Date(data.timeout).getTime());
-
-          setInterval(function(){
-            var now_time = (new Date().getTime());
-
-            if ((response_timeout < now_time) === true){
+        if (data.seconds !== "null" && data.live === true){
+          
+          var data_message = data.message, data_seconds = data.seconds;
+
+          var timerDecrement = setInterval(function(){    
+            if (data_seconds == 0) { 
+              clearInterval(timerDecrement); 
+              // limpa a sessão após o ok do alertify
               alertify.alert(data_message, function () {
-                window.location.href = '/destroy_automatic_logout';
+                AutomaticLogout.destroySession();
               });
             }
-          }, (data.seconds / 2) * 1000) // utiliza o mesmo valor em seconds que a pessoa irá ficar logado
+            
+            data_seconds -= 1;
+          }, 1000)
         }
       }
     });

data/app/views/automatic_logout/_timer.html.erb

@@ -1,5 +1,4 @@
 <div class="regressive-timer"
-  data-expires-at="<%= session[:auto_session_expires_at] %>"
   data-seconds="<%= session[:seconds] %>"
   data-message="<%= session[:message] %>">
 </div>

data/lib/rails/automaticlogout/controllers/helpers.rb

@@ -15,21 +15,17 @@ module Rails::AutomaticLogout
       end
 
       def expires_at_in_seconds(time)
-        # ((current_time + time)).strftime("%s").to_i
         time.seconds.to_i
       end
 
       module ClassMethods
         def automatic_logout_at(time: 1.hour, message: "Session expired! You will be redirect.")
           prepend_before_filter do |c|
-            if c.session[:auto_session_expires_at].present? && c.session[:auto_session_expires_at] < current_time
-              c.send :reset_session
+            if current_user
+              c.session[:seconds] = expires_at_in_seconds(time)
+              c.session[:message] = message
             else
-              if current_user
-                c.session[:auto_session_expires_at] = expires_at(time)
-                c.session[:seconds] = expires_at_in_seconds(time)
-                c.session[:message] = message
-              end
+              c.send :reset_session
             end
           end
         end

data/lib/rails/automaticlogout/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module AutomaticLogout
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-automaticlogout
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Thadeu Esteves Jr