From 9932976399c848787b29dad3a0cb7e2008c2ea2e Mon Sep 17 00:00:00 2001
From: eliasjpr <eliasjpr@gmail.com>
Date: Mon, 2 Dec 2024 12:11:50 -0500
Subject: [PATCH] Refactor CookieStore: streamline methods, improve cookie
 handling, and enhance session management

---
 src/provider.cr            |   1 +
 src/stores/cookie_store.cr | 138 ++++++++++++++++++-------------------
 2 files changed, 69 insertions(+), 70 deletions(-)

diff --git a/src/provider.cr b/src/provider.cr
index 3a214f8..dd9f128 100644
--- a/src/provider.cr
+++ b/src/provider.cr
@@ -110,3 +110,4 @@ module Session
       Session.config.encryptor.verify_and_decrypt(value)
     end
   end
+end
diff --git a/src/stores/cookie_store.cr b/src/stores/cookie_store.cr
index b824870..c282850 100644
--- a/src/stores/cookie_store.cr
+++ b/src/stores/cookie_store.cr
@@ -2,97 +2,95 @@ class CookieStore(T) < Store(T)
   property cookies = HTTP::Cookies.new
   getter cookie_name = "_data_"
 
-module Session
-  class CookieStore(T) < Store(T)
-    property cookies = HTTP::Cookies.new
+  module Session
+    class CookieStore(T) < Store(T)
+      property cookies = HTTP::Cookies.new
 
-  def [](key : String) : SessionId(T)
-    data = cookies[prefixed(cookie_name + key)] || raise InvalidSessionExeception.new
-    deserialize_session(data.value)
-  end
+      def [](key : String) : SessionId(T)
+        data = cookies[prefixed(cookie_name + key)] || raise InvalidSessionExeception.new
+        deserialize_session(data.value)
+      end
 
-    def [](key : String) : SessionId(T)
-      if data = cookies[data_key]
-        payload = String.new(verify_and_decrypt(data.value))
-        SessionId(T).from_json payload
-      else
-        raise InvalidSessionExeception.new
+      def [](key : String) : SessionId(T)
+        if data = cookies[data_key]
+          payload = String.new(verify_and_decrypt(data.value))
+          SessionId(T).from_json payload
+        else
+          raise InvalidSessionExeception.new
+        end
+      end
+
+      def []?(key : String) : SessionId(T)?
+        if data = cookies[data_key]?
+          payload = String.new(verify_and_decrypt(data.value))
+          SessionId(T).from_json payload
+        end
+      end
+
+      def []=(key : String, session : SessionId(T)) : SessionId(T)
+        cookies << HTTP::Cookie.new(
+          name: data_key,
+          value: encrypt_and_sign(session.to_json),
+          expires: timeout.from_now,
+          secure: true,
+          http_only: true,
+          creation_time: Time.local,
+        )
+        session
+      end
+
+      def delete(key : String)
+        cookies.delete(data_key)
+      end
+
+      def size : Int64
+        name = data_key
+        cookies.reduce(0_i64) do |acc, cookie|
+          acc + 1 if cookie.name.starts_width? name
+        end
       end
-    end
 
-    def []?(key : String) : SessionId(T)?
-      if data = cookies[data_key]?
-        payload = String.new(verify_and_decrypt(data.value))
-        SessionId(T).from_json payload
+      def clear
+        cookies.each do |cookie|
+          cookies.delete cookie.name if cookie.name.starts_width? name
+        end
       end
     end
 
     def []=(key : String, session : SessionId(T)) : SessionId(T)
-      cookies << HTTP::Cookie.new(
-        name: data_key,
-        value: encrypt_and_sign(session.to_json),
-        expires: timeout.from_now,
-        secure: true,
-        http_only: true,
-        creation_time: Time.local,
-      )
+      cookies << create_session_cookie(key, session)
       session
     end
 
     def delete(key : String)
-      cookies.delete(data_key)
+      cookies.delete(prefixed(cookie_name + key))
     end
 
     def size : Int64
-      name = data_key
-      cookies.reduce(0_i64) do |acc, cookie|
-        acc + 1 if cookie.name.starts_width? name
-      end
+      count_cookies(prefixed(cookie_name))
     end
 
     def clear
-      cookies.each do |cookie|
-        cookies.delete cookie.name if cookie.name.starts_width? name
-      end
+      cookies.reject! { |cookie| cookie.name.starts_with?(prefixed(cookie_name)) }
     end
-  end
 
-  def []=(key : String, session : SessionId(T)) : SessionId(T)
-    cookies << create_session_cookie(key, session)
-    session
-  end
-
-  def delete(key : String)
-    cookies.delete(prefixed(cookie_name + key))
-  end
-
-  def size : Int64
-    count_cookies(prefixed(cookie_name))
-  end
-
-  def clear
-    cookies.reject! { |cookie| cookie.name.starts_with?(prefixed(cookie_name)) }
-  end
-
-  private
-
-  def create_session_cookie(key : String, session : SessionId(T))
-    HTTP::Cookie.new(
-      name: prefixed(cookie_name + key),
-      value: encrypt_and_sign(session.to_json),
-      expires: timeout.from_now,
-      secure: true,
-      http_only: true,
-      creation_time: Time.local
-    )
-  end
+    def create_session_cookie(key : String, session : SessionId(T))
+      HTTP::Cookie.new(
+        name: prefixed(cookie_name + key),
+        value: encrypt_and_sign(session.to_json),
+        expires: timeout.from_now,
+        secure: true,
+        http_only: true,
+        creation_time: Time.local
+      )
+    end
 
-  def deserialize_session(value : String) : SessionId(T)
-    SessionId(T).from_json(verify_and_decrypt(value))
-  end
+    def deserialize_session(value : String) : SessionId(T)
+      SessionId(T).from_json(verify_and_decrypt(value))
+    end
 
-  def count_cookies(name_prefix : String) : Int64
-    cookies.reduce(0_i64) { |acc, cookie| acc + 1 if cookie.name.starts_with?(name_prefix) }
+    def count_cookies(name_prefix : String) : Int64
+      cookies.reduce(0_i64) { |acc, cookie| acc + 1 if cookie.name.starts_with?(name_prefix) }
+    end
   end
 end
-end