Moves session Redis to its own class

Author: lankyfrenchman

app/controllers/kracken/sessions_controller.rb

@@ -8,7 +8,7 @@ def create
       @user = user_class.find_or_create_from_auth_hash(auth_hash)
       session[:user_id] = @user.id
       session[:user_uid] = @user.uid
-      session[:user_cache_key] = SESSION_REDIS.get(user_session_key(@user.uid))
+      session[:user_cache_key] = SessionManager.get(@user.uid)
       session[:token_expires_at] = Time.zone.at(auth_hash[:credentials][:expires_at])
 
       redirect_to return_to_path

lib/kracken/controllers/authenticatable.rb

@@ -71,15 +71,11 @@ def check_token_expiry!
       #    delete the cookie
       #
       def handle_user_cache_cookie!
-        if SESSION_REDIS
-          handle_user_cache_cookie_with_redis
-        elsif cookies[:_radius_user_cache_key]
-          if cookies[:_radius_user_cache_key] == "none"
-            delete_session_data
-          elsif session[:user_cache_key] != cookies[:_radius_user_cache_key]
-            clear_cache_cookie_and_sign_out
-          end
-        end
+        return redirect_to_sign_in unless session_present?
+        return if session_and_redis_match?
+
+        delete_session_data
+        redirect_to_sign_in
       end
 
       def current_user=(u)
@@ -116,24 +112,12 @@ def user_signed_in?
 
       private
 
-      def handle_user_cache_cookie_with_redis
-        return redirect_to_sign_in unless session_present?
-        return if session_and_redis_match?
-
-        delete_session_data
-        redirect_to_sign_in
-      end
-
       def session_present?
         session[:user_id] && session[:user_cache_key]
       end
 
       def session_and_redis_match?
-        SESSION_REDIS.get(user_session_key(session[:user_uid])) == session[:user_cache_key]
-      end
-
-      def user_session_key(id)
-        "rnsession:#{id}"
+        SessionManager.update(session[:user_uid]) == session[:user_cache_key]
       end
 
       def delete_session_data

lib/kracken/session_manager.rb

@@ -0,0 +1,31 @@
+class SessionManager
+  def self.conn
+    Redis.new(url: ENV["REDIS_SESSION_URL"])
+  end
+
+  def self.active?
+    ENV["REDIS_SESSION_URL"].present?
+  end
+
+  def self.get(user_id)
+    return unless active?
+
+    conn.get(user_session_key(user_id))
+  end
+
+  def self.clear(user_id)
+    return unless active?
+
+    conn.del(user_session_key(user_id))
+  end
+
+  def self.update(user_id, value)
+    return unless active?
+
+    conn.set(user_session_key(user_id), value)
+  end
+
+  def self.user_session_key(user_id)
+    "rnsession:#{user_id}"
+  end
+end