devise-automaticlogout 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2008453655dc78f8394d6a44b70cbe62674dc346
-  data.tar.gz: 0fefddc297a1c6cd6a2c771eee550c5ae2574bb2
+SHA256:
+  metadata.gz: 7376a12b6138d60c5313dff7b3920fd377680f4158600517f73ae3697d7d08c9
+  data.tar.gz: 252322e067196b1ec2d6ed3d2972a51a510251ab9af83efa380fdf39524e25a8
 SHA512:
-  metadata.gz: 997771f4b8c85f34bae60b6d5245ad3e61af19945ae91dfb4d2ee0072b2556628d29a51114bbcbc6eb33c499a3a1bff651321e7424b6081490ae106dc11de998
-  data.tar.gz: 3b2227414fe9b8571d0197e0fda5124d39d156190a2c7c56bb42207e471d9c09033be751313e5260877a72186ae1422fa63ec4bd33256c079bf3fbd9a86fe415
+  metadata.gz: f291157a5b46de703a70cf80cd5c231a9c918bb8652f5c2ac77cd6c9a7bbbc13d0157361900946a74dbdf7da0d51bd14f5e67db21620d54e4101dc4ca7f44249
+  data.tar.gz: 6baba66024afd9be78928af7bcb99ffe7b7c8b7bf536b5d3b14c18cc37b85427096d290546166be2bb05a354bcb8f90b4954881dcde6304bf29a30e746130cdd

data/app/controllers/automaticlogout_controller.rb

@@ -0,0 +1,9 @@
+class AutomaticlogoutController < ::ApplicationController
+  def destroy
+    session[:devise_autl_seconds] = nil
+    session[:live] = !current_user.nil?
+    reset_session
+
+    redirect_to '/', notice: session[:devise_autl_message]
+  end
+end

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

@@ -1,5 +1,7 @@
 <span class="regressive-timer"
+  style="<%= "display: #{visible ? 'block' : 'none'}" %>"
   data-visible="<%= visible %>"
-  data-seconds="<%= session[:seconds] %>"
-  data-message="<%= session[:message] %>">
+  data-alert="<%= alert.presence || false %>"
+  data-seconds="<%= session[:devise_autl_seconds] %>"
+  data-message="<%= session[:devise_autl_message] %>">
 </span>

data/config/routes.rb

@@ -1,4 +1,3 @@
 Rails.application.routes.draw do
-  get 'devise/automatic_logout/status'  => 'application#automatic_logout_status'
-  get 'devise/automatic_logout/destroy' => 'application#automatic_logout_destroy'
+  get 'automatic_logout/destroy' => 'automaticlogout#destroy'
 end

data/lib/assets/javascripts/automatic_logout.js

@@ -2,98 +2,105 @@
  * Module AutomaticLogout for JS Files
  * @type {[type]}
  */
-var AutomaticLogout = AutomaticLogout || {};
+window.AutomaticLogout = {};
 
-AutomaticLogout.load = function(){
-  var $regressiveTimer = document.querySelectorAll('.regressive-timer')[0];
-  
-  if((!!$regressiveTimer) && ($regressiveTimer.dataset.seconds != '')){
+AutomaticLogout.load = function () {
+  var $regressiveTimer = document.querySelectorAll(".regressive-timer")[0];
+
+  if (!!$regressiveTimer && $regressiveTimer.dataset.seconds != "") {
+    console.log("[AutomaticLogout] regressiveTimer started");
     AutomaticLogout.regressiveTimer();
   }
-}
+};
 
 /**
  * Send request for destroy session current_user
  * @return {[type]} [description]
  */
-AutomaticLogout.destroySession = function(message){
+AutomaticLogout.destroySession = function (message) {
   var xhr = new XMLHttpRequest();
-  xhr.open('GET','/devise/automatic_logout/destroy', true);
-  xhr.onload = function(){
-    if(xhr.status == 200){  
-      if(message) alert(message)
-      return window.location.href = '/';
+  xhr.open("GET", "/automatic_logout/destroy", true);
+
+  xhr.onload = function () {
+    if (xhr.status == 200) {
+      var $wrapper = document.querySelectorAll(".regressive-timer")[0];
+
+      if ($wrapper && eval($wrapper.dataset.alert) && message) {
+        window.alert(message);
+      }
+
+      return (window.location.href = "/");
     }
-  }
+  };
   xhr.send();
-}
+};
 
 /**
  * Method regressive time based in session auto expired at.
  * @param  {[type]} date_session [description]
  * @return {[type]}              [description]
  */
-AutomaticLogout.regressiveTimer = function(){
-
+AutomaticLogout.regressiveTimer = function () {
   /**
    * Define o que vai ser impresso no DOM.
-   * @param {DOM Object} container 
-   * @param {Boolean} visible 
-   * @param {String} textContent 
+   * @param {DOM Object} container
+   * @param {Boolean} visible
+   * @param {String} textContent
    */
-  var visibleTimer = function(container, visible, textContent){
-    if (!visible) visible = 'false';
-    if (!textContent) textContent = '00:00:00';
+  var visibleTimer = function (container, visible, textContent) {
+    if (!visible) visible = "false";
+    if (!textContent) textContent = "00:00:00";
 
-    if (visible == 'true'){
-      return container.textContent = textContent;
+    if (visible == "true") {
+      return (container.textContent = textContent);
     }
-  }
-  
+  };
+
   /**
    * Variables used
    * @param  {[type]} '.regressive-timer' [description]
    * @return {[type]}                     [description]
    */
-  var $regressiveTimer = document.querySelector('.regressive-timer'),
-      data_message = String($regressiveTimer.dataset.message),
-      data_seconds = Number($regressiveTimer.dataset.seconds),
-      current_time = new Date().getTime();
-    
-  visibleTimer(
-    $regressiveTimer, 
-    $regressiveTimer.dataset.visible
-  );
+  var $regressiveTimer = document.querySelector(".regressive-timer"),
+    data_message = String($regressiveTimer.dataset.message),
+    data_seconds = Number($regressiveTimer.dataset.seconds),
+    current_time = new Date().getTime();
+
+  visibleTimer($regressiveTimer, $regressiveTimer.dataset.visible);
 
   var time_expired = new Date();
   time_expired.setSeconds(time_expired.getSeconds() + data_seconds);
 
-  if (data_seconds != 0 && data_seconds != ''){
-    var timerDecrement = setInterval(function(){
-      
-      if (data_seconds == 0) { 
-        clearInterval(timerDecrement); 
+  if (data_seconds != 0 && data_seconds != "") {
+    var timerDecrement = setInterval(function () {
+      if (data_seconds == 0) {
+        clearInterval(timerDecrement);
         // limpa a sessão após o ok
         AutomaticLogout.destroySession(data_message);
-      }else{
+      } else {
         //tempo descrecente
         time_expired.setSeconds(time_expired.getSeconds() - 1);
-        
+
         var seconds_integer = (time_expired.getTime() - current_time) / 1000,
-            date_format = AutomaticLogout.parseDate(seconds_integer),
-            output_date_format = date_format.hours + ':' + date_format.minutes + ':' + date_format.seconds;
+          date_format = AutomaticLogout.parseDate(seconds_integer),
+          output_date_format =
+            date_format.hours +
+            ":" +
+            date_format.minutes +
+            ":" +
+            date_format.seconds;
 
         visibleTimer(
-          $regressiveTimer, 
-          $regressiveTimer.dataset.visible, 
+          $regressiveTimer,
+          $regressiveTimer.dataset.visible,
           output_date_format
         );
       }
-      
+
       data_seconds -= 1;
-    }, 1000)
+    }, 1000);
   }
-}
+};
 
 /**
  * Parse Date
@@ -105,12 +112,8 @@ AutomaticLogout.regressiveTimer = function(){
  *   seconds: seconds
  * }
  */
-AutomaticLogout.parseDate = function(seconds_float){
-
-  var days,
-      hours,
-      minutes,
-      seconds;
+AutomaticLogout.parseDate = function (seconds_float) {
+  var days, hours, minutes, seconds;
 
   days = parseInt(seconds_float / 86400);
   seconds_float = seconds_float % 86400;
@@ -121,24 +124,24 @@ AutomaticLogout.parseDate = function(seconds_float){
   minutes = parseInt(seconds_float / 60);
   seconds = parseInt(seconds_float % 60);
 
-  if(hours < 10){
-    hours = "0"+hours;
+  if (hours < 10) {
+    hours = "0" + hours;
     hours = hours.substr(0, 2);
   }
 
-  if(minutes < 10){
-    minutes = "0"+minutes;
+  if (minutes < 10) {
+    minutes = "0" + minutes;
     minutes = minutes.substr(0, 2);
   }
 
-  if(seconds <=9){
-    seconds = "0"+seconds;
+  if (seconds <= 9) {
+    seconds = "0" + seconds;
   }
 
   return {
     days: days,
     hours: hours,
     minutes: minutes,
-    seconds: seconds
-  }
-}
+    seconds: seconds,
+  };
+};

data/lib/devise/automaticlogout/controllers.rb

@@ -1,34 +1,30 @@
 module Devise
-  module AutomaticLogout
+  module Automaticlogout
     module Controllers
       extend ActiveSupport::Concern
 
-      included do
-        ::ApplicationController.before_action do |c|
-          if current_user.present?
-            key_classify = Devise.mappings.keys.first
-            resource_name = Devise.mappings[key_classify].class_name.to_s
-            # get instance for class using devise
-            c.session[:seconds] = resource_name.classify.constantize.timeout_in.seconds.to_i
-            # I18n.t devise.automaticlogout.message
-            c.session[:message] = I18n.t 'devise.automaticlogout.message' || 'Session expired!'
-          end
+      DEFAULT_MESSAGE = 'Session expired! You will be redirect.'.freeze
 
-          ::ApplicationController.send :define_method, :automatic_logout_status do
-            Rails.logger.info 'Sessão atualizada'
-            render json: {
-              live: !current_user.nil?,
-              message: session[:message],
-              seconds: session[:seconds]
-            }, status: :ok
-          end
+      module ClassMethods
+        def devise_automatic_logout(options = {})
+          prepend_before_action do |c|
+            time = options.fetch(:time, nil)
+            message = options.fetch(:message, DEFAULT_MESSAGE)
+            scope = options.fetch(:scope, 'user')
+
+            seconds = if time&.positive?
+                        time
+                      else
+                        mapping = Devise.mappings[scope.to_sym]
+                        return unless mapping
+
+                        mapping.to.timeout_in.seconds.to_i
+                      end
 
-          ::ApplicationController.send :define_method, :automatic_logout_destroy do
-            Rails.logger.info 'Sessão destruída'
-            session[:seconds] = ''
-            session[:live] = !current_user.nil?
-            reset_session
-            redirect_to '/', notice: session[:message]
+            if seconds
+              c.session[:devise_autl_message] = message
+              c.session[:devise_autl_seconds] = seconds
+            end
           end
         end
       end

data/lib/devise/automaticlogout/engine.rb

@@ -1,14 +1,14 @@
 module Devise
-  module AutomaticLogout
+  module Automaticlogout
     class Engine < ::Rails::Engine
-      require 'jquery-rails'
+      engine_name 'devise_automaticlogout'
 
       ActiveSupport.on_load :action_controller do
-        include Devise::AutomaticLogout::Controllers
+        include Devise::Automaticlogout::Controllers
       end
 
       ActiveSupport.on_load :action_view do
-        include Devise::AutomaticLogout::Helpers
+        include Devise::Automaticlogout::Helpers
       end
     end
   end

data/lib/devise/automaticlogout/helpers.rb

@@ -1,8 +1,8 @@
 module Devise
-  module AutomaticLogout
+  module Automaticlogout
     module Helpers
-      def regressive_timer(visible: false)
-        render 'automatic_logout/timer', visible: visible
+      def regressive_timer(visible: false, alert: false)
+        render 'automatic_logout/timer', visible: visible, alert: alert
       end
     end
   end

data/lib/devise/automaticlogout/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Automaticlogout
-    VERSION = '0.2.2'.freeze
+    VERSION = '1.0.0'.freeze
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: devise-automaticlogout
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Thadeu Esteves Jr
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-29 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   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'
 description: Provides automatic session timeout in a Rails Devise application.
@@ -76,6 +76,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/controllers/automaticlogout_controller.rb
 - app/views/automatic_logout/_timer.html.erb
 - config/routes.rb
 - lib/assets/javascripts/automatic_logout.js
@@ -88,11 +89,11 @@ files:
 - lib/devise/automaticlogout/engine.rb
 - lib/devise/automaticlogout/helpers.rb
 - lib/devise/automaticlogout/version.rb
-homepage: https://github.com/Thadeu/devise-automaticlogout
+homepage: https://github.com/thadeu/devise-automaticlogout
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,9 +108,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6
+signing_key:
 specification_version: 4
 summary: Provides automatic session timeout in a Rails Devise application.
 test_files: []