Updates namespace and adds class for unavailable Redis

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] = ::SessionManager.get(@user.uid)
+      session[:user_cache_key] = Kracken::SessionManager.get(@user.uid)
       session[:token_expires_at] = Time.zone.at(auth_hash[:credentials][:expires_at])
 
       redirect_to return_to_path
@@ -46,9 +46,5 @@ def signout_redirect_query
       current_root.path = ''
       "?redirect_to=#{CGI.escape(current_root.to_s)}"
     end
-
-    def user_session_key(id)
-      "rnsession:#{id}"
-    end
   end
 end

lib/kracken/controllers/authenticatable.rb

@@ -71,7 +71,7 @@ def check_token_expiry!
       #    delete the cookie
       #
       def handle_user_cache_cookie!
-        return redirect_to_sign_in unless session_present?
+        return unless session_present?
         return if session_and_redis_match?
 
         delete_session_data
@@ -113,29 +113,22 @@ def user_signed_in?
       private
 
       def session_present?
-        session[:user_id] && session[:user_cache_key]
+        session[:user_uid] && session[:user_cache_key]
       end
 
       def session_and_redis_match?
-        ::SessionManager.get(session[:user_uid]) == session[:user_cache_key]
+        Kracken::SessionManager.get(session[:user_uid]) == session[:user_cache_key]
       end
 
       def delete_session_data
         # Sign out current user
         session.delete :user_id
 
-        # Clear that user's cache key
+        # Clear that user's cache data
+        session.delete :user_uid
         session.delete :user_cache_key
       end
 
-      def clear_cache_cookie_and_sign_out
-        # Delete the cookie to prevent redirect loops
-        cookies.delete :_radius_user_cache_key
-
-        # Redirect to the account app
-        redirect_to_sign_in
-      end
-
       def user_class
         Kracken.config.user_class
       end

lib/kracken/session_manager.rb

@@ -1,31 +1,41 @@
-class SessionManager
-  def self.conn
-    Redis.new(url: ENV["REDIS_SESSION_URL"])
-  end
+# frozen_string_literal: true
 
-  def self.active?
-    ENV["REDIS_SESSION_URL"].present?
-  end
+module Kracken
+  module SessionManager
+    def self.conn
+      @conn ||= if ENV["REDIS_SESSION_URL"].present?
+                  Redis.new(url: ENV["REDIS_SESSION_URL"])
+                else
+                  NullRedis.new
+                end
+    end
 
-  def self.get(user_id)
-    return unless active?
+    def self.get(user_id)
+      conn.get(user_session_key(user_id))
+    end
 
-    conn.get(user_session_key(user_id))
-  end
+    def self.del(user_id)
+      conn.del(user_session_key(user_id))
+    end
 
-  def self.del(user_id)
-    return unless active?
+    def self.update(user_id, value)
+      conn.set(user_session_key(user_id), value)
+    end
 
-    conn.del(user_session_key(user_id))
-  end
+    def self.user_session_key(user_id)
+      "rnsession:#{user_id}"
+    end
 
-  def self.update(user_id, value)
-    return unless active?
+    class NullRedis
+      # rubocop:disable Style/EmptyMethod
+      def initialize(*); end
 
-    conn.set(user_session_key(user_id), value)
-  end
+      def del(*); end
+
+      def get(*); end
 
-  def self.user_session_key(user_id)
-    "rnsession:#{user_id}"
+      def set(*); end
+      # rubocop:enable Style/EmptyMethod
+    end
   end
 end