jwt-auth 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 350e77e8646205ed02b1db78d49c026fb117559d0a9a6678ab32d72ec2149b7c
-  data.tar.gz: 1b2083fc8e144347d541a5255422e1e3322784d3b57292f6fe2d9c064d91da62
+  metadata.gz: f4ee309e4680b104875e55bdf95fa0f54e104be4596d5a2f8249cc37e8257c95
+  data.tar.gz: a8816bfbfe5b1211e4ad6d81a1f902387043c3b4ea38c856811e79012e44454c
 SHA512:
-  metadata.gz: 9e3fbe6dffa6da9dbb3df74b23a2375606313ad9c6e572e8cd1a21f74f9999098e0db2a66d7b6d56984359d317dbdc6c644ff3ac3e32a8534368acb0b1f4b50b
-  data.tar.gz: 5ae2ac9c28f0a43fb3f4d14d2711a0e95821197b9397c92079e7ac6c62ce6d01600fb538b247e7f1824a38e5cee4ccfed5edf80626403779a19665495aaa157f
+  metadata.gz: 02da9f0ef071a5844531310379c1a5778ddda6f0ea7f450052449e2b6cdf46b05c2bdc667c6e14f5cc6eff97dbcd97e5038f03719e9e0f87f1736fd3210825eb
+  data.tar.gz: '09978d0bb5d5430f73adafc7dc2f2e6c0c0d934b952e8fc93c5a8a9f6e8116677c120d8e91820af83aa25c5ddd380d08de8f63ab8adfa0a17941b3ecb8127184'

data/README.md

@@ -34,6 +34,8 @@ JWT::Auth.configure do |config|
 end
 ```
 
+Do not try to set the `model` configuration property in the initializer, as this property is already set by including the `Authenticatable` concern in your model.
+
 Include model methods in your user model:
 
 ```ruby

data/lib/jwt/auth/authenticatable.rb

@@ -12,7 +12,7 @@ module JWT
 
       included do
         JWT::Auth.configure do |config|
-          config.model = const_get name
+          config.model = name
         end
       end
     end

data/lib/jwt/auth/token.rb

@@ -54,23 +54,31 @@ module JWT
         JWT::Auth.token_lifetime
       end
 
-      def self.from_token(token)
-        begin
-          @decoded_payload = JWT.decode(token, JWT::Auth.secret).first
-        rescue JWT::DecodeError
-          @decoded_payload = {}
+      class << self
+        def from_token(token)
+          begin
+            @decoded_payload = JWT.decode(token, JWT::Auth.secret).first
+          rescue JWT::DecodeError
+            @decoded_payload = {}
+          end
+
+          token = self.new
+          token.issued_at = @decoded_payload['iat']
+          token.token_version = @decoded_payload['ver']
+
+          if @decoded_payload['sub']
+            find_method = model.respond_to?(:find_by_token) ? :find_by_token : :find_by
+            token.subject = model.send find_method, :id => @decoded_payload['sub'], :token_version => @decoded_payload['ver']
+          end
+
+          token
         end
 
-        token = self.new
-        token.issued_at = @decoded_payload['iat']
-        token.token_version = @decoded_payload['ver']
+        private
 
-        if @decoded_payload['sub']
-          find_method = JWT::Auth.model.respond_to?(:find_by_token) ? :find_by_token : :find_by
-          token.subject = JWT::Auth.model.send find_method, :id => @decoded_payload['sub'], :token_version => @decoded_payload['ver']
+        def model
+          const_get JWT::Auth.model
         end
-
-        token
       end
     end
   end

data/lib/jwt/auth/version.rb

@@ -2,6 +2,6 @@
 
 module JWT
   module Auth
-    VERSION = '4.0.1'
+    VERSION = '4.0.2'
   end
 end

data/spec/configuration_spec.rb

@@ -13,6 +13,6 @@ RSpec.describe JWT::Auth do
 
     expect(subject.token_lifetime).to eq 24.hours
     expect(subject.secret).to eq 'mysecret'
-    expect(subject.model).to eq User
+    expect(subject.model).to eq 'User'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jwt-auth
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Florian Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2019-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -278,8 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: JWT-based authentication for Rails API