Only add namespace the first time a key is created

Otherwise the namespace is appended each time the session is updated

lib/redbird/plug/session/redis.ex

@@ -22,16 +22,15 @@ defmodule Plug.Session.REDIS do
   end
 
   def put(conn, nil, data, init_options) do
-    put(conn, generate_random_key(), data, init_options)
+    put(conn, add_namespace(generate_random_key()), data, init_options)
   end
-  def put(_conn, redis_key, data, init_options) do
-    key = add_namespace(redis_key)
+  def put(_conn, namespaced_key, data, init_options) do
     setex(%{
-      key: key,
+      key: namespaced_key,
       value: data,
       seconds: session_expiration(init_options)
     })
-    key
+    namespaced_key
   end
 
   def delete(_conn, redis_key, _kinit_options) do

test/mix/tasks/redbird/delete_all_sessions_test.exs

@@ -9,23 +9,24 @@ defmodule Mix.Tasks.Redbird.DeleteAllSessionsTest do
   end
 
   test "deletes all redbird session keys" do
-    key = "redis_session"
     conn = %{}
     options = []
-    REDIS.put(conn, key, %{foo: :bar}, options)
+    key = REDIS.put(conn, nil, %{foo: :bar}, options)
+
+    Mix.Tasks.Redbird.DeleteAllSessions.run([])
 
     assert {nil, %{}} = REDIS.get(conn, key, options)
   end
 
   test "deletes user defined namespaced session keys" do
     Application.put_env(:redbird, :key_namespace, "test_")
     conn = %{}
-    key = "redis_session"
     options = []
-    REDIS.put(conn, key, %{foo: :bar}, options)
+    key = REDIS.put(conn, nil, %{foo: :bar}, options)
 
     Mix.Tasks.Redbird.DeleteAllSessions.run([])
 
-    assert {nil, %{}} = REDIS.get(conn, "test_" <> key, options)
+    assert {nil, %{}} = REDIS.get(conn, key, options)
+    Application.delete_env(:redbird, :key_namespace)
   end
 end

test/redbird_test.exs

@@ -100,22 +100,21 @@ defmodule RedbirdTest do
 
   test "redbird_session is appended to key names by default" do
     conn = %{}
-    key = "redis_session"
     options = []
-    REDIS.put(conn, key, %{foo: :bar}, options)
+    key = REDIS.put(conn, nil, %{foo: :bar}, options)
 
-    assert {"redbird_session_redis_session", %{foo: :bar}} = REDIS.get(conn, "redbird_session_" <> key, options)
+    assert key =~ "redbird_session_"
   end
 
   test "user can set their own key namespace" do
     Application.put_env(:redbird, :key_namespace, "test_")
     Redbird.Redis.keys("test_*")
     |> Redbird.Redis.del
     conn = %{}
-    key = "redis_session"
     options = []
-    REDIS.put(conn, key, %{foo: :bar}, options)
+    key = REDIS.put(conn, nil, %{foo: :bar}, options)
 
-    assert {"test_redis_session", %{foo: :bar}} = REDIS.get(conn, "test_" <> key, options)
+    assert key =~ "test_"
+    Application.delete_env(:redbird, :key_namespace)
   end
 end