jwt_sessions 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7981af52568346a34f4c308e76b19b88ddc264ea
-  data.tar.gz: 48fe0cb349266922f0124a918c14e4c79c10d28b
+  metadata.gz: d92af5c82b767203a340f54627281a85eb5576ed
+  data.tar.gz: dce1a37bba83687b2815e757475d00e3f0a21fef
 SHA512:
-  metadata.gz: 8c275a6504519c3447c36b9557223ba5403d87d590ba9d4d7215fc4f6580021a00a296b6daa71ef2e7f15c1fa61dd7fe0d1f9b62813ae63e93381e342a3e2640
-  data.tar.gz: cafceae22f54838b7745f4e26deaf5eba969212f235552e1d2fde547608f6219e76a4482135a02e5b4cc94818dc5d1ec5c256c79b67907b6531e06df980dc6ff
+  metadata.gz: cc9b3e0a4bea5bab7560c38d8cb24b15b94f289c82acc9581206af29eed9890f0aa4987c126a59540ed6b1f02d126159714212e4fb08f6d470232d8f08b3eeb8
+  data.tar.gz: f689a7cc6c5de3bf0d8ffec6bc3d20d0abc86b1a71ab85b33a782c5a1fad491baaaedf449032e62547bd2b8fdc7a833d7f5ecb569d476077abec70dc3a3c354b

data/README.md

@@ -294,6 +294,14 @@ JWTSessions.redis_db_name = '0'
 JWTSessions.token_prefix  = 'jwt_' # used for redis db keys
 ```
 
+You can also provide a Redis URL instead:
+
+```ruby
+JWTSessions.redis_url = 'redis://localhost:6397'
+```
+
+**NOTE:** if `REDIS_URL` environment variable is set it is used automatically.
+
 ##### JWT signature
 
 ```ruby
@@ -479,7 +487,14 @@ and selectively flush sessions by namespace
 
 ```ruby
 session = JWTSessions::Session.new(namespace: 'ie-sessions')
-session.flush_namespaced # will flush all sessions that belong to the same namespace
+session.flush_namespaced # will flush all sessions which belong to the same namespace
+```
+
+it's posible to flush access tokens only
+
+```ruby
+session = JWTSessions::Session.new(namespace: 'ie-sessions')
+session.flush_namespaced_access_tokens # will flush all access tokens which belong to the same namespace, but will keep refresh tokens
 ```
 
 To force flush of all app sessions
@@ -502,8 +517,15 @@ To logout with an access token `refresh_by_access_allowed` setting should be set
 
 ## Contributing
 
-Fork & Pull Request \
-RbNaCl and sodium cryptographic library are required for tests
+Fork & Pull Request. \
+RbNaCl and sodium cryptographic library are required for tests.
+
+For MacOS see [these instructions](http://macappstore.org/libsodium/). \
+For example, with Homebrew:
+
+```
+brew install libsodium
+```
 
 ## License
 

data/lib/jwt_sessions/rails_authorization.rb

@@ -2,8 +2,14 @@ module JWTSessions
   module RailsAuthorization
     include Authorization
 
-    def request_headers
-      ActionDispatch::Http::Headers.from_hash(request.headers)
+    if Rails::VERSION::MAJOR < 5
+      def request_headers
+        request.headers
+      end
+    else
+      def request_headers
+        ActionDispatch::Http::Headers.from_hash(request.headers)
+      end
     end
 
     def request_cookies

data/lib/jwt_sessions/redis_token_store.rb

@@ -5,8 +5,8 @@ require 'redis'
 module JWTSessions
   class RedisTokenStore
     class << self
-      def instance(redis_host, redis_port, redis_db_name, prefix)
-        @_tokens_store ||= Redis.new(url: "redis://#{redis_host}:#{redis_port}/#{redis_db_name}")
+      def instance(redis_url, prefix)
+        @_tokens_store ||= Redis.new(url: redis_url)
         @_token_prefix ||= prefix
 
         new(@_tokens_store, @_token_prefix)

data/lib/jwt_sessions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JWTSessions
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/lib/jwt_sessions.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'securerandom'
+require 'uri'
 
 require 'jwt_sessions/errors'
 require 'jwt_sessions/token'
@@ -10,7 +11,7 @@ require 'jwt_sessions/csrf_token'
 require 'jwt_sessions/access_token'
 require 'jwt_sessions/session'
 require 'jwt_sessions/authorization'
-require 'jwt_sessions/rails_authorization'
+require 'jwt_sessions/rails_authorization' if defined?(::Rails)
 require 'jwt_sessions/version'
 
 module JWTSessions
@@ -64,6 +65,17 @@ module JWTSessions
     end
   end
 
+  def redis_url
+    @redis_url ||= begin
+      redis_base_url = ENV['REDIS_URL'] || "redis://#{redis_host}:#{redis_port}"
+      URI.join(redis_base_url, redis_db_name).to_s
+    end
+  end
+
+  def redis_url=(url)
+    @redis_url = URI.join(url, redis_db_name).to_s
+  end
+
   def jwt_options
     @jwt_options ||= JWTOptions.new(*JWT::DefaultOptions::DEFAULT_OPTIONS.values)
   end
@@ -78,7 +90,7 @@ module JWTSessions
   end
 
   def token_store
-    RedisTokenStore.instance(redis_host, redis_port, redis_db_name, token_prefix)
+    RedisTokenStore.instance(redis_url, token_prefix)
   end
 
   def validate?

data/test/units/test_jwt_sessions.rb

@@ -35,4 +35,17 @@ class TestJWTSessions < Minitest::Test
     assert_equal JWTSessions.access_cookie, JWTSessions.cookie_by('access')
     assert_equal JWTSessions.refresh_cookie, JWTSessions.cookie_by('refresh')
   end
+
+  def test_redis_url
+    assert_equal 'redis://127.0.0.1:6379/0', JWTSessions.redis_url
+  end
+
+  def test_redis_url_with_env_var
+    JWTSessions.instance_variable_set(:@redis_url, nil)
+    ENV['REDIS_URL'] = 'rediska://locallol:2018/'
+    assert_equal 'rediska://locallol:2018/0', JWTSessions.redis_url
+    ENV.delete('REDIS_URL')
+    JWTSessions.instance_variable_set(:@redis_url, nil)
+    assert_equal 'redis://127.0.0.1:6379/0', JWTSessions.redis_url
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jwt_sessions
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Yulia Oletskaya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt