jwt_sessions 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 603df513aaba9a73e5360895ea7fffddf52dd02e
-  data.tar.gz: f70b523406ae364b05d16b45423d3b98971f4c75
+  metadata.gz: dfe0f1d0591603e0e98e783a50887e647460b880
+  data.tar.gz: 6ddf78aa6c589ec6f51a775d81d033dbd8d69d59
 SHA512:
-  metadata.gz: f937d9d3362f0ec7c63dc4af813038a3a0b49647a29e6f0338583ae106094cc9677bc83790ae330df3ef46d1159d441cab595cb62f274294a1fdc7af23ecb2cb
-  data.tar.gz: fd37c7ec5f318893567dfce15ba8562c35a25b0ec8c53c12707947ba0f81e9d973144c0f153364ff1e3a92d17eab58c8a91ec1f4f67f0f84457334c83da38f8e
+  metadata.gz: 8bfeb3ae48e6d3689bfc34cf02ac92e4d16be9f1a0c56562f4a598432600e7e6ffd9281e8ba6a20053bb6737ca26017e2b9ad8b6b1250b0268850a310bdfe2eb
+  data.tar.gz: 1977d53805eba13b7da95dc1b8ff767ef8764c130be49d1a476e791ac95fa56a7de1dfa77eafd9646674835c995b593aaaa62a74d1e7e3f0143e4e81b8c21300

data/lib/jwt_sessions/session.rb

@@ -37,7 +37,7 @@ module JWTSessions
     end
 
     def session_exists?(token, token_type = :access)
-      send(:"#{token_type}_token_data", token)
+      send(:"#{token_type}_token_data", token, true)
       true
     rescue Errors::Unauthorized
       false
@@ -142,20 +142,20 @@ module JWTSessions
     end
 
     def refresh_csrf(refresh_token)
-      refresh_token_instance = refresh_token_data(refresh_token)
+      refresh_token_instance = refresh_token_data(refresh_token, true)
       CSRFToken.new(refresh_token_instance.csrf)
     end
 
-    def access_token_data(token)
+    def access_token_data(token, _first_match = false)
       uid = token_uid(token, :access, @access_claims)
       data = store.fetch_access(uid)
       raise Errors::Unauthorized, "Access token not found" if data.empty?
       data
     end
 
-    def refresh_token_data(token)
+    def refresh_token_data(token, first_match = false)
       uid = token_uid(token, :refresh, @refresh_claims)
-      retrieve_refresh_token(uid)
+      retrieve_refresh_token(uid, first_match: first_match)
     end
 
     def token_uid(token, type, claims)
@@ -177,8 +177,8 @@ module JWTSessions
       val
     end
 
-    def retrieve_refresh_token(uid)
-      @_refresh = RefreshToken.find(uid, store, namespace)
+    def retrieve_refresh_token(uid, first_match: false)
+      @_refresh = RefreshToken.find(uid, store, namespace, first_match: first_match)
     end
 
     def tokens_hash

data/lib/jwt_sessions/store_adapters/abstract_store_adapter.rb

@@ -11,7 +11,8 @@ module JWTSessions
         raise NotImplementedError
       end
 
-      def fetch_refresh(_uid, _namespace)
+      # Set first_match to true to look up through all namespaces
+      def fetch_refresh(_uid, _namespace, _first_match)
         raise NotImplementedError
       end
 

data/lib/jwt_sessions/store_adapters/memory_store_adapter.rb

@@ -22,8 +22,16 @@ module JWTSessions
         storage[""]["access"].store(uid, access_token)
       end
 
-      def fetch_refresh(uid, namespace, _first_match = false)
-        value_if_not_expired(uid, "refresh", namespace.to_s)
+      def fetch_refresh(uid, namespace, first_match = false)
+        if first_match
+          storage.keys.each do |namespace_key|
+            val = value_if_not_expired(uid, "refresh", namespace_key)
+            return val unless val.empty?
+          end
+          {}
+        else
+          value_if_not_expired(uid, "refresh", namespace.to_s)
+        end
       end
 
       def persist_refresh(uid:, access_expiration:, access_uid:, csrf:, expiration:, namespace: "")

data/lib/jwt_sessions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JWTSessions
-  VERSION = "2.4.2"
+  VERSION = "2.4.3"
 end

data/test/units/jwt_sessions/test_session.rb

@@ -69,6 +69,18 @@ class TestSession < Minitest::Test
     end
   end
 
+  def test_refresh_with_namespace
+    @new_session = JWTSessions::Session.new(
+      payload: payload,
+      namespace: "custom-namespace"
+    )
+    new_tokens = @new_session.login
+    refreshed_tokens = @new_session.refresh(new_tokens[:refresh])
+    decoded_access = JWTSessions::Token.decode(refreshed_tokens[:access]).first
+    assert_equal REFRESH_KEYS, refreshed_tokens.keys.sort
+    assert_equal payload[:test], decoded_access["test"]
+  end
+
   def test_refresh_by_access_payload
     session = JWTSessions::Session.new(payload: payload, refresh_by_access_allowed: true)
     session.login

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jwt_sessions
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Yulia Oletskaya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt