jwt-auth 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cd012fc046f4777af5d9ee5f6265f5ca2d62af9
-  data.tar.gz: 9170ff259b31aa1867b40da3572db62b4b1af852
+  metadata.gz: 0b11dc2531ed00ed8ead4181d0a3a50aa498039c
+  data.tar.gz: 1d2ee0029f04f2612f6ef857a0e853c38b12db13
 SHA512:
-  metadata.gz: cee44e1a66ed06d4ecb6298542b45b13c72a2806c271805c2e8772dcab5b755ad4f9cf9c862c8f507a511744fa52c28e600c458b48ef50b555ca6ae1e946afb1
-  data.tar.gz: b34a80b8d6bb0f0cf068b4505101edbc9030f96bcccf3bd5b5bcb5ffe55b7e7fd77726177dbb2ac68b3fe1981edf2c68ecdd5a04a54d7b2ff2d2ab9dbb4c8eda
+  metadata.gz: df54f9949ad17b040fffd7ee642a6e206c61587fcde549a78849ebc013e346d311be7a7da8801eae724acf452b6607c89785ac423a332726fb6d6512487dd3e6
+  data.tar.gz: 25e85ed1f67349905b5228182a0ba2d2fde4ca122cba7f86b367bbf19ddac5e4e06b242234ba8a32920306c852ea2ba56053b0cb245fb1d1dfc9694334514d70

data/lib/jwt/auth/token.rb

@@ -31,35 +31,42 @@ module JWT
       end
 
       def to_jwt
-        payload = {
-          :exp => expiration || JWT::Auth.token_lifetime.from_now.to_i,
-          :sub => subject.id,
-          :ver => token_version || subject.token_version
-        }
         JWT.encode payload, JWT::Auth.secret
       end
 
       def self.from_user(subject)
-        token = JWT::Auth::Token.new
+        token = self.new
         token.subject = subject
 
         token
       end
 
+      def payload
+        {
+          :exp => expiration || lifetime.from_now.to_i,
+          :sub => subject.id,
+          :ver => token_version || subject.token_version
+        }
+      end
+
+      def lifetime
+        JWT::Auth.token_lifetime
+      end
+
       def self.from_token(token)
         begin
-          payload = JWT.decode(token, JWT::Auth.secret).first
+          @decoded_payload = JWT.decode(token, JWT::Auth.secret).first
         rescue JWT::ExpiredSignature
-          payload = {}
+          @decoded_payload = {}
         end
 
-        token = JWT::Auth::Token.new
-        token.expiration = payload['exp']
-        token.token_version = payload['ver']
+        token = self.new
+        token.expiration = @decoded_payload['exp']
+        token.token_version = @decoded_payload['ver']
 
-        if payload['sub']
+        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 => payload['sub'], :token_version => payload['ver']
+          token.subject = JWT::Auth.model.send find_method, :id => @decoded_payload['sub'], :token_version => @decoded_payload['ver']
         end
 
         token

data/lib/jwt/auth/version.rb

@@ -2,6 +2,6 @@
 
 module JWT
   module Auth
-    VERSION = '3.0.1'
+    VERSION = '3.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jwt-auth
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Florian Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt