jwt-auth 2.1.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8095c74014d970773a09234afe5a12fa932f9ecd
-  data.tar.gz: 521e99eba63ccb44626c5955fc3abdf5b1d5c5ee
+  metadata.gz: 4fc903bec961f43790b39851ed465e98ee4db262
+  data.tar.gz: 2c54dc88944789086ec0ef2cfb11f33b3ec63520
 SHA512:
-  metadata.gz: 6e046e9d8bfe47c4366e1302285a4d94a9b4774739b3097e607670a247563775b9a607950fe98bc037cd12652dc624e33b8fa0cbe96a8e83ae6d356334ff3c99
-  data.tar.gz: d8264bfd3fc7b48f1a9166e626c831df2dfece0790dd4aa288e4a943d80923079ae6f4502ce1df6f04e534c26059d5d72a0bdacf47e5fe82f80e1375b9caa764
+  metadata.gz: 6caaeac87553b3fb5fc3ab08e7c0806cb01ba40cac74e8b11bf739517383687289dd9f157a22b81b9571029c58ff04cc8f499abb6e0059a2f32016d5c05aa13d
+  data.tar.gz: 89da2604d876f84c21836acfb6cf11e47c3d542a01514ee2d2d6d4b653c5f081f60ce670e1dfb67a3f532f8d3f9ae803af65e9bd3f65b1a19105cee23b62f8e4

data/README.md

@@ -77,11 +77,15 @@ class ApplicationController < ActionController::API
 end
 ```
 
-Set `before_action` on routes:
+Set callbacks on routes:
 
 ```ruby
 class MyController < ApplicationController
+  # Authenticates user from request header
   before_action :authenticate_user
+  
+  # Renew token and set response header
+  after_action :renew_token
 end
 ```
 

data/jwt-auth.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'rspec-rails', '~> 3.5'
+  spec.add_development_dependency 'byebug'
 end

data/lib/jwt/auth/authentication.rb

@@ -20,15 +20,12 @@ module JWT
       #
       def authenticate_user
         raise JWT::Auth::UnauthorizedError unless jwt&.valid?
-
-        # Regenerate token (renews expiration date)
-        add_token_to_response
       end
 
       ##
       # Add JWT header to response
       #
-      def add_token_to_response
+      def renew_token
         return unless jwt&.valid?
         jwt.renew!
         response.headers['Authorization'] = "Bearer #{jwt.to_jwt}"

data/lib/jwt/auth/token.rb

@@ -10,21 +10,26 @@ module JWT
     # In-memory representation of JWT
     #
     class Token
-      attr_accessor :expiration, :subject
+      attr_accessor :expiration, :subject, :token_version
 
       def valid?
-        !subject.nil? && !expiration.nil? && Time.at(expiration).future?
+        return false if subject.nil? || expiration.nil? || token_version.nil?
+        return false if Time.at(expiration).past?
+        return false if token_version != subject.token_version
+
+        true
       end
 
       def renew!
         self.expiration = nil
+        self.token_version = nil
       end
 
       def to_jwt
         payload = {
           :exp => expiration || JWT::Auth.token_lifetime.from_now.to_i,
           :sub => subject.id,
-          :ver => subject.token_version
+          :ver => token_version || subject.token_version
         }
         JWT.encode payload, JWT::Auth.secret
       end
@@ -41,6 +46,7 @@ module JWT
 
         token = JWT::Auth::Token.new
         token.expiration = payload['exp']
+        token.token_version = payload['ver']
 
         find_method = JWT::Auth.model.respond_to?(:find_by_token) ? :find_by_token : :find_by
         token.subject = JWT::Auth.model.send find_method, :id => payload['sub'], :token_version => payload['ver']

data/lib/jwt/auth/version.rb

@@ -2,6 +2,6 @@
 
 module JWT
   module Auth
-    VERSION = '2.1.2'
+    VERSION = '3.0.0'
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 require 'jwt/auth'
-require 'rails'
+# require 'rails'
+
+require 'dummy/config/environment'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jwt-auth
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Florian Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Authentication middleware for Rails API that uses JWTs, without depending
   on Devise
 email: