devise_cas_authenticatable 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3e83040936b50b2bbbe2b5bd9c3f7cdbb4c82787
-  data.tar.gz: 8d6ff31d362248b2f2d9cecd6e6920cc4b520a58
+SHA256:
+  metadata.gz: 0e52720581da9cbfecdabb24df82f099b140b5c282885dd0aa3a1fbef559fcb1
+  data.tar.gz: bb55162fe23ae48432b59140811fadd15e24918f0aa2647bcbd51d2094a210e2
 SHA512:
-  metadata.gz: 66e05d22158f7602c6feec07934c7eaef67bc8486bbc53b639343b679c5b6c75157e4fd1e8938f01c42115478b862e3477e6294229bda6742528b01c86db94a1
-  data.tar.gz: 0ada1fc97accbfe7f0c922fcf9f3675e07d17dc495381771135bc0d2a543591e74a1c8dc079eef279d97646e0b17703d4bcb7a5808e8a04b8bd16bcef30b6f0f
+  metadata.gz: 8d3c2e442a37315c935dd021b5f05a6e38a8e3112b2b8f7e8d0e11c31db3622ae10785d377ec9942e43c4d12b8a94b7faea9e863759a53dc5543fb4d4e7e6584
+  data.tar.gz: 84dd388a716bc5f31f3f0fd263b550a85a39ba183e46b67492923871981b30c1ab77a96e326f9592383d416e6b4195a44e9cdd65819797ca6c37407cd487ded1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog for devise\_cas\_authenticatable
 
+## Version 1.10.4 - April 26, 2019
+
+* Fixes for single sign out on Redis session store using newer Redis gems (thanks @ledestin!)
+
 ## Version 1.10.3 - July 28, 2017
 
 * Rails 5.1 deprecation fix (thanks @jamgregory!)

data/devise_cas_authenticatable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_cas_authenticatable}
-  s.version = "1.10.3"
+  s.version = "1.10.4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nat Budin", "Jeremy Haile"]

data/lib/devise_cas_authenticatable/single_sign_out.rb

@@ -1,3 +1,5 @@
+require 'devise_cas_authenticatable/single_sign_out/with_conn'
+
 module DeviseCasAuthenticatable
   module SingleSignOut
 
@@ -7,6 +9,8 @@ module DeviseCasAuthenticatable
 
     # Supports destroying sessions by ID for ActiveRecord and Redis session stores
     module DestroySession
+      include ::DeviseCasAuthenticatable::SingleSignOut::WithConn
+
       def destroy_session_by_id(sid)
         logger.debug "Single Sign Out from session store: #{current_session_store.class}"
 
@@ -25,7 +29,7 @@ module DeviseCasAuthenticatable
           current_session_store.send(:destroy_session, env, sid, drop: true)
           true
         elsif session_store_class.name =~ /Redis/
-          current_session_store.instance_variable_get(:@pool).del(sid)
+          with_conn { |conn| conn.del(sid) }
           true
         elsif session_store_class.name =~ /CacheStore/
           if current_session_store.respond_to?(:delete_session)  # Rails 5 and up

data/lib/devise_cas_authenticatable/single_sign_out/strategies/redis_cache.rb

@@ -1,18 +1,23 @@
+require 'devise_cas_authenticatable/single_sign_out/with_conn'
+
 module DeviseCasAuthenticatable
   module SingleSignOut
     module Strategies
       class RedisCache < Base
         include ::DeviseCasAuthenticatable::SingleSignOut::DestroySession
+        include ::DeviseCasAuthenticatable::SingleSignOut::WithConn
 
         def store_session_id_for_index(session_index, session_id)
           logger.debug("Storing #{session_id} for index #{session_index}")
-          current_session_store.instance_variable_get(:@pool).set(
-            cache_key(session_index),
-            session_id
-          )
+          with_conn do |conn|
+            conn.set(
+              cache_key(session_index),
+              session_id
+            )
+          end
         end
         def find_session_id_by_index(session_index)
-          sid = current_session_store.instance_variable_get(:@pool).get(cache_key(session_index))
+          sid = with_conn { |conn| conn.get(cache_key(session_index)) }
           logger.debug("Found session id #{sid} for index #{session_index}") if sid
           sid
         end

data/lib/devise_cas_authenticatable/single_sign_out/with_conn.rb

@@ -0,0 +1,14 @@
+module DeviseCasAuthenticatable
+  module SingleSignOut
+    module WithConn
+      def with_conn(&block)
+        if old_style_conn = current_session_store.instance_variable_get(:@pool)
+          yield old_style_conn
+        else
+          current_session_store.instance_variable_get(:@conn)
+            .instance_variable_get(:@pool).with &block
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_cas_authenticatable
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.4
 platform: ruby
 authors:
 - Nat Budin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -250,6 +250,7 @@ files:
 - lib/devise_cas_authenticatable/single_sign_out/strategies/rails_cache.rb
 - lib/devise_cas_authenticatable/single_sign_out/strategies/redis_cache.rb
 - lib/devise_cas_authenticatable/single_sign_out/warden_failure_app.rb
+- lib/devise_cas_authenticatable/single_sign_out/with_conn.rb
 - lib/devise_cas_authenticatable/strategy.rb
 - rails/init.rb
 - spec/config_spec.rb
@@ -311,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: CAS authentication module for Devise