Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions lib/redis-session-store.rb
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,7 @@ def get_session(env, sid)
def load_session_with_fallback(sid)
return nil if private_session_id?(sid.public_id)

load_session_from_redis(
key_exists?(sid.private_id) ? sid.private_id : sid.public_id
)
load_session_from_redis(sid.private_id) || load_session_from_redis(sid.public_id)
end

def load_session_from_redis(sid)
Expand Down
9 changes: 5 additions & 4 deletions spec/redis_session_store_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -318,25 +318,26 @@

context 'when redis is up' do
let(:redis) { double('redis') }
let(:private_exists) { true }
let(:private_value) { Marshal.dump('foo') }

before do
allow(store).to receive(:redis).and_return(redis)
allow(redis).to receive(:exists)
allow(redis).to receive(:get)
.with("#{options[:key_prefix]}#{session_id.private_id}")
.and_return(private_exists)
.and_return(private_value)
end

context 'when session private id exists in redis' do
it 'retrieves the prefixed private id from redis' do
expect(redis).to receive(:get).with("#{options[:key_prefix]}#{session_id.private_id}")
expect(redis).not_to receive(:get).with("#{options[:key_prefix]}#{fake_key}")

store.send(:get_session, double('env'), session_id)
end
end

context 'when session private id not found in redis' do
let(:private_exists) { false }
let(:private_value) { nil }

it 'retrieves the prefixed public id from redis' do
expect(redis).to receive(:get).with("#{options[:key_prefix]}#{fake_key}")
Expand Down